fix lots of CRLFs

diff --git a/.gitattributes b/.gitattributes
index edd30fd6d3a6a26ff33e82b9aefc4add51322d70..67420ef0ad13d8f98bbe86dd7002e157eddef660 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -95,8 +95,8 @@ makespr32 crlf=input
 *.mapinfo crlf=input
 *.m crlf=input
 *.md3 -crlf -diff
 *.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
 *.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
 *.pm crlf=input
 *.png -crlf -diff
 POSITIONS -crlf -diff

-*.proj crlf=input
+*.proj -crlf

 *.properties crlf=input
 *.psd -crlf -diff
 *.py crlf=input
 *.properties crlf=input
 *.psd -crlf -diff
 *.py crlf=input

diff --git a/env/hip_inter/README.TXT b/env/hip_inter/README.TXT
index 4fd16771e31e61315be662c8763e3608e74f7504..9bf17339c7b5fa80a6ae97921d72d111de443871 100644 (file)
--- a/env/hip_inter/README.TXT
+++ b/env/hip_inter/README.TXT
@@ -1,14 +1,14 @@
-UPDATED THE 28TH, REMOVED A FUNKY PLANET\r
-\r
-INTERSTELLAR\r
-high res 1024^2 environment map\r
-ships as TGA.\r
-\r
-\r
-By Jockum Skoglund aka hipshot\r
-hipshot@zfight.com\r
-www.zfight.com\r
-Stockholm, 2005 08 25\r
-\r
-\r
-Modify however you like, just cred me for my work, maybe link to my page.\r
+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 24aeea3e29e1aff07efd3a4265cbb77302e0da2b..883ba04ad39b1dc5f6e9d86c5ca4c3d17298bd51 100644 (file)
--- 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
 ================================================================================
 
 Blender and Gimp
 ================================================================================
 

-To create the skybox images, I used the method explained here:\r
-<http://en.wikibooks.org/wiki/Blender_3D:_Noob_to_Pro/Build_a_skybox>\r
-\r
+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.
 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/>
 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/>

-\r
+

 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.
 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 dce91f72eb0d17e9cf240dacf4d4ad859b1375f8..b3041f215c6dc06496ec1c362c5f68aacaa2e9c7 100644 (file)
--- a/scripts/nexcompat-rocket.shader
+++ b/scripts/nexcompat-rocket.shader
@@ -1,10 +1,10 @@
-rocketThrust\r
-{\r
-       surfaceparm trans\r
-       cull disable\r
-       {\r
-               clampmap textures/thrustc1.tga\r
-               blendfunc add\r
-               tcMod rotate 720\r
-       }\r
-}\r
+rocketThrust
+{
+       surfaceparm trans
+       cull disable
+       {
+               clampmap textures/thrustc1.tga
+               blendfunc add
+               tcMod rotate 720
+       }
+}