From: Rudolf Polzer Date: Sat, 17 Apr 2010 19:00:44 +0000 (+0200) Subject: fix lots of CRLFs X-Git-Tag: xonotic-v0.1.0preview~175^2~11 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3802240be1f61edc56c94244abfec8ceb15e981a;p=xonotic%2Fxonotic-maps.pk3dir.git fix lots of CRLFs --- diff --git a/.gitattributes b/.gitattributes index edd30fd6..67420ef0 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/scripts/exosystem.shader b/scripts/exosystem.shader index d6e7762f..782d1632 100644 --- a/scripts/exosystem.shader +++ b/scripts/exosystem.shader @@ -1,29 +1,29 @@ -textures/skies/exosystem -{ - qer_editorimage env/exosystem/exosystem_preview.tga - - surfaceparm noimpact - surfaceparm nolightmap - surfaceparm nomarks - surfaceparm sky - - //q3map_sun - q3map_sun 1 1 1 350 60 41.743 - q3map_surfacelight 550 - skyparms env/exosystem/exosystem - - -} - -textures/skies/exosystem2 -{ - qer_editorimage env/exosystem/exosystem2_preview.tga - - surfaceparm noimpact - surfaceparm nolightmap - surfaceparm nomarks - surfaceparm sky - - //q3map_sun - q3map_sun 1 .40625 .17578125 150 -55.452 17.379 - q3map_surfacelight 300 - skyparms env/exosystem/exosystem2 - - +textures/skies/exosystem +{ + qer_editorimage env/exosystem/exosystem_preview.tga + + surfaceparm noimpact + surfaceparm nolightmap + surfaceparm nomarks + surfaceparm sky + + //q3map_sun + q3map_sun 1 1 1 350 60 41.743 + q3map_surfacelight 550 + skyparms env/exosystem/exosystem - - +} + +textures/skies/exosystem2 +{ + qer_editorimage env/exosystem/exosystem2_preview.tga + + surfaceparm noimpact + surfaceparm nolightmap + surfaceparm nomarks + surfaceparm sky + + //q3map_sun + q3map_sun 1 .40625 .17578125 150 -55.452 17.379 + q3map_surfacelight 300 + skyparms env/exosystem/exosystem2 - - } \ No newline at end of file