From 7f9a65c328ae46a79dd4566ce2574ef8612690e1 Mon Sep 17 00:00:00 2001
From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 17 Apr 2010 21:01:59 +0200
Subject: [PATCH] fix lots of CRLFs

---
 .gitattributes                  |  6 +++---
 env/hip_inter/README.TXT        | 28 ++++++++++++++--------------
 scripts/newsky_nebulae.txt      |  8 ++++----
 scripts/nexcompat-rocket.shader | 20 ++++++++++----------
 4 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index edd30fd..67420ef 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -95,8 +95,8 @@ makespr32 crlf=input
 *.mapinfo crlf=input
 *.m crlf=input
 *.md3 -crlf -diff
-*.md5anim crlf=input
-*.md5mesh crlf=input
+*.md5anim -crlf
+*.md5mesh -crlf
 *.mdl -crlf -diff
 *.med crlf=input
 *.mf crlf=input
@@ -124,7 +124,7 @@ PkgInfo crlf=input
 *.pm crlf=input
 *.png -crlf -diff
 POSITIONS -crlf -diff
-*.proj crlf=input
+*.proj -crlf
 *.properties crlf=input
 *.psd -crlf -diff
 *.py crlf=input
diff --git a/env/hip_inter/README.TXT b/env/hip_inter/README.TXT
index 4fd1677..9bf1733 100644
--- a/env/hip_inter/README.TXT
+++ b/env/hip_inter/README.TXT
@@ -1,14 +1,14 @@
-UPDATED THE 28TH, REMOVED A FUNKY PLANET
-
-INTERSTELLAR
-high res 1024^2 environment map
-ships as TGA.
-
-
-By Jockum Skoglund aka hipshot
-hipshot@zfight.com
-www.zfight.com
-Stockholm, 2005 08 25
-
-
-Modify however you like, just cred me for my work, maybe link to my page.
+UPDATED THE 28TH, REMOVED A FUNKY PLANET
+
+INTERSTELLAR
+high res 1024^2 environment map
+ships as TGA.
+
+
+By Jockum Skoglund aka hipshot
+hipshot@zfight.com
+www.zfight.com
+Stockholm, 2005 08 25
+
+
+Modify however you like, just cred me for my work, maybe link to my page.
diff --git a/scripts/newsky_nebulae.txt b/scripts/newsky_nebulae.txt
index 24aeea3..883ba04 100644
--- a/scripts/newsky_nebulae.txt
+++ b/scripts/newsky_nebulae.txt
@@ -12,9 +12,9 @@ Created for Xonotic and first released at <http://www.alientrap.org/forum/>
 Blender and Gimp
 ================================================================================
 
-To create the skybox images, I used the method explained here:
-<http://en.wikibooks.org/wiki/Blender_3D:_Noob_to_Pro/Build_a_skybox>
-
+To create the skybox images, I used the method explained here:
+<http://en.wikibooks.org/wiki/Blender_3D:_Noob_to_Pro/Build_a_skybox>
+
 In short, the environment is projected onto a cube with an EnvMap material,
 and after the rendering, the projection can be extracted with "Save EnvMap",
 found in the Texture Panel.
@@ -32,7 +32,7 @@ GNU General Public License
 I release all the files that are part of this project under the terms of the
 GNU General Public License as published by the Free Software Foundation, either
 version 2 of the License, or any later version. <http://www.gnu.org/licenses/>
-
+
 All the files that are part of this project are distributed in the hope
 that they will be useful, but WITHOUT ANY WARRANTY; without even the
 implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/scripts/nexcompat-rocket.shader b/scripts/nexcompat-rocket.shader
index dce91f7..b3041f2 100644
--- a/scripts/nexcompat-rocket.shader
+++ b/scripts/nexcompat-rocket.shader
@@ -1,10 +1,10 @@
-rocketThrust
-{
-	surfaceparm trans
-	cull disable
-	{
-		clampmap textures/thrustc1.tga
-		blendfunc add
-		tcMod rotate 720
-	}
-}
+rocketThrust
+{
+	surfaceparm trans
+	cull disable
+	{
+		clampmap textures/thrustc1.tga
+		blendfunc add
+		tcMod rotate 720
+	}
+}
-- 
2.39.2