2 Commits (96ab1fa283bdc74c1c55ddd86d9462c4aa1a25dd)

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)	9 years ago
René Kijewski	2f66319a3a	make: OSX: don't fail for empty .a archives ... Fixes issue #1333.	9 years ago