3 Commits

Author	SHA1	Message	Date
Zachary Ware	5fe8ac69f9	[2.7] bpo-27425: Be more explicit in .gitattributes (GH-840) (GH-2086) ... Also updates checked-in line endings in several files.	2017-06-11 14:19:39 -05:00
Mariatta	d7564e538c	remove merge=union attribute for Misc/NEWS (GH-460) (GH-989) ... (cherry picked from commit 060d2d776a)	2017-04-04 14:49:31 +02:00
Benjamin Peterson	6e9e6496ef	mark various test data binary (#233) (#303)	2017-02-25 23:25:28 -08:00