2 Commits

Author	SHA1	Message	Date
Joakim Gebart	d3b30417cc	.gitattributes: add markdown special case. ... Increase conflict marker size to avoid false positives with git diff --check (The conflict marker is a line of equals signs `=` which is inserted whenever there is a merge conflict)	2015-05-09 11:23:09 +02:00
René Kijewski	2f66319a3a	make: OSX: don't fail for empty .a archives ... Fixes issue #1333.	2014-06-24 20:29:32 +02:00