From: Rudolf Polzer <divverent@alientrap.org>
Date: Wed, 21 Jul 2010 11:10:57 +0000 (+0200)
Subject: Merge branch 'master' into fruitiex/warpzone
X-Git-Tag: xonotic-v0.1.0preview~151^2~32^2
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=b029bb2d01aaac313eebdf652258ef09cbd494e8;hp=6ae2ac1af2cb9c2f22e45381f81ee8982a315a50

Merge branch 'master' into fruitiex/warpzone
---

diff --git a/.gitattributes b/.gitattributes
index fb9e9b14..a2b2bfc3 100644
--- 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
@@ -77,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
@@ -103,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
@@ -118,6 +127,8 @@ 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
@@ -165,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