3 Commits

Author	SHA1	Message	Date
Zachary Ware	964c261dc9	[3.6] bpo-27425: Be more explicit in .gitattributes (GH-840) (GH-2083) ... Also updates checked-in line endings on some files	2017-06-10 15:39:29 -05:00
Mariatta	ce92be1825	remove merge=union attribute for Misc/NEWS (GH-460) (GH-988) ... (cherry picked from commit 060d2d776a)	2017-04-04 11:49:14 +02:00
Benjamin Peterson	91c499f8f9	mark various test data binary (#233) (#304)	2017-02-26 00:00:09 -08:00