From faf4e96929ef2a8495ceb0926b861c1a668d8d09 Mon Sep 17 00:00:00 2001
From: Rudolf Polzer <divverent@alientrap.org>
Date: Wed, 21 Jul 2010 10:54:11 +0200
Subject: [PATCH] CRLF fixes, .gitattributes file updated

---
 .gitattributes         |  20 ++++++--
 scripts/turrets.shader | 114 ++++++++++++++++++++---------------------
 2 files changed, 74 insertions(+), 60 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 695d07e57..a2b2bfc3a 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
@@ -76,9 +84,10 @@ GPL crlf=input
 *.icns -crlf -diff
 *.ico -crlf -diff
 *.idsoftware crlf=input
-*.iqm -crlf -diff
 *.inc crlf=input
+*.in crlf=input
 *.instantaction crlf=input
+*.iqm -crlf -diff
 *.java crlf=input
 *.jhm crlf=input
 *.jnlp crlf=input
@@ -104,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
@@ -119,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
@@ -166,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
diff --git a/scripts/turrets.shader b/scripts/turrets.shader
index c0d223c56..9e4f68e3f 100644
--- a/scripts/turrets.shader
+++ b/scripts/turrets.shader
@@ -1,57 +1,57 @@
-models/turrets/tesla_chrome
-{
-
-	qer_editorimage models/turrets/chrome.tga
-
-	//dp_reflect 0 0.75 0.75 1 0.5	
-	{
-		map models/turrets/chrome.tga	
-		rgbGen vertex
-		tcGen environment 
-		tcMod scale 2 2
-		
-	}
-}
-
-models/turrets/phaser_beam
-{
-	surfaceparm trans
-	cull none
-	nopicmip
-
-	qer_editorimage models/turrets/phaser_beam
-	{		
-		map models/turrets/phaser_beam
-		blendFunc add
-	}
-
-}
-
-models/turrets/reactor_beams
-{
-	surfaceparm trans
-	cull none
-
-	qer_editorimage models/turrets/reactor
-	{		
-		map models/turrets/reactor
-		blendFunc add
-	}
-}
-
-models/turrets/r_fx1
-{
-	surfaceparm nomarks
-	surfaceparm trans
-	surfaceparm pointlight
-	surfaceparm nolightmap	
-	nopicmip
-	qer_editorimage models/turrets/r_fx1_1
-
-	{
-		animmap 10 models/turrets/r_fx1_3 models/turrets/r_fx1_4 models/turrets/r_fx1_5 models/turrets/r_fx1_4 models/turrets/r_fx1_3 models/turrets/r_fx1_2  models/turrets/r_fx1_1 models/turrets/r_fx1_2 
-	}
-
-}
-
-
+models/turrets/tesla_chrome
+{
+
+	qer_editorimage models/turrets/chrome.tga
+
+	//dp_reflect 0 0.75 0.75 1 0.5	
+	{
+		map models/turrets/chrome.tga	
+		rgbGen vertex
+		tcGen environment 
+		tcMod scale 2 2
+		
+	}
+}
+
+models/turrets/phaser_beam
+{
+	surfaceparm trans
+	cull none
+	nopicmip
+
+	qer_editorimage models/turrets/phaser_beam
+	{		
+		map models/turrets/phaser_beam
+		blendFunc add
+	}
+
+}
+
+models/turrets/reactor_beams
+{
+	surfaceparm trans
+	cull none
+
+	qer_editorimage models/turrets/reactor
+	{		
+		map models/turrets/reactor
+		blendFunc add
+	}
+}
+
+models/turrets/r_fx1
+{
+	surfaceparm nomarks
+	surfaceparm trans
+	surfaceparm pointlight
+	surfaceparm nolightmap	
+	nopicmip
+	qer_editorimage models/turrets/r_fx1_1
+
+	{
+		animmap 10 models/turrets/r_fx1_3 models/turrets/r_fx1_4 models/turrets/r_fx1_5 models/turrets/r_fx1_4 models/turrets/r_fx1_3 models/turrets/r_fx1_2  models/turrets/r_fx1_1 models/turrets/r_fx1_2 
+	}
+
+}
+
+
-- 
2.39.2