Merge branch 'master' into divVerent/crypto2

[xonotic/xonotic.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 04e299b..a2b2bfc 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,5 @@
+* -crlf
+
 *.7z -crlf -diff
 *.ac crlf=input
 *.afm crlf=input
@@ -31,7 +33,6 @@ CONTRIBUTORS crlf=input
 COPYING crlf=input
 *.cpp crlf=input
 create crlf=input
-* -crlf
 *.css crlf=input
 Current -crlf -diff
 *.cvsignore crlf=input