Additional merges

2015-12-12 16:30:05 -07:00 · 2015-12-12 16:30:05 -07:00 · a058a8f546
parent 581b54cb37 aed0659b63
commit a058a8f546
1 changed files with 4 additions and 0 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -1,4 +1,8 @@
 *.asc	eol=crlf
+*.ASC	eol=crlf
 *.ans	eol=crlf
+*.ANS	eol=crlf
 *.txt	eol=crlf
+*.TXT	eol=crlf
 *.diz	eol=crlf
+*.DIZ	eol=crlf