Update logos for OSX with higher resolution icns and fix the buildfiles

[xonotic/xonotic.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 67420ef0ad13d8f98bbe86dd7002e157eddef660..a2b2bfc3a215233e9be344f4b887e7ca6535ef18 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,7 +1,12 @@
+* -crlf
+
 *.7z -crlf -diff
+*.ac crlf=input
+*.afm crlf=input
 *.aft crlf=input
 *.aliases crlf=input
 all crlf=input
+*.am crlf=input
 *.animinfo crlf=input
 *.aps -crlf -diff
 *.ase -crlf
@@ -22,14 +27,17 @@ bsp2ent crlf=input
 ChangeLog crlf=input
 CHANGES crlf=input
 COMPILING crlf=input
+compress-texture crlf=input
 *.conf crlf=input
 CONTRIBUTORS crlf=input
 COPYING crlf=input
 *.cpp crlf=input
+create crlf=input
 *.css crlf=input
 Current -crlf -diff
 *.cvsignore crlf=input
 *.cvswrappers crlf=input
+*.dat -crlf -diff
 *.db -crlf -diff
 *.default crlf=input
 *.def crlf=input
@@ -42,7 +50,7 @@ DoxyConfig crlf=input
 Doxyfile crlf=input
 *.doxygen crlf=input
 *.dpm -crlf -diff
-*.dsp crlf=input
+*.dsp -crlf
 *.dsw -crlf
 *.dtd crlf=input
 *.dylib -crlf -diff
@@ -55,6 +63,7 @@ gendox crlf=input
 gendoxfunctions crlf=input
 genDoxyfile crlf=input
 *.gif -crlf -diff
+*.gitattributes crlf=input
 git-branch-manager crlf=input
 git-filter-index crlf=input
 git-filter-repository crlf=input
@@ -76,7 +85,9 @@ GPL crlf=input
 *.ico -crlf -diff
 *.idsoftware crlf=input
 *.inc crlf=input
+*.in crlf=input
 *.instantaction crlf=input
+*.iqm -crlf -diff
 *.java crlf=input
 *.jhm crlf=input
 *.jnlp crlf=input
@@ -102,12 +113,11 @@ makespr32 crlf=input
 *.mf crlf=input
 *.mid -crlf -diff
 *.mk crlf=input
+*.mkdir -crlf -diff
 *.mmpz -crlf -diff
 *.modinfo crlf=input
 *.modules crlf=input
 nexuiz-map-compiler crlf=input
-nexuiz-osx-agl crlf=input
-nexuiz-osx-sdl crlf=input
 *.nib -crlf
 *.obj -crlf
 OFFSETS -crlf -diff
@@ -117,10 +127,12 @@ pangorc crlf=input
 *.patch crlf=input
 *.patchsets crlf=input
 *.pcx -crlf -diff
+*.pfb -crlf -diff
+*.pfm -crlf -diff
 *.pk3 -crlf -diff
 PkgInfo crlf=input
 *.pl crlf=input
-*.plist -crlf
+*.plist crlf=input
 *.pm crlf=input
 *.png -crlf -diff
 POSITIONS -crlf -diff
@@ -134,7 +146,7 @@ POSITIONS -crlf -diff
 *.qh crlf=input
 *.rb crlf=input
 *.rc2 crlf=input
-*.rc crlf=input
+*.rc -crlf
 *.readme crlf=input
 README crlf=input
 *.rtlights -crlf -diff
@@ -164,14 +176,18 @@ TODO crlf=input
 *.TTF -crlf -diff
 *.txt crlf=input
 *.TXT crlf=input
+update-shaderlists crlf=input
 *.vcproj -crlf
 *.wav -crlf -diff
 *.waypoints -crlf -diff
+w crlf=input
 *.width crlf=input
 *.workspace -crlf
 *.xcf -crlf -diff
 *.xlink crlf=input
 *.xml crlf=input
+xonotic-map-compiler-autobuild crlf=input
+xonotic-map-compiler crlf=input
 *.xpm crlf=input
 *.zip -crlf -diff
 zipdiff crlf=input