From: Rudolf Polzer <divverent@alientrap.org>
Date: Sun, 25 Dec 2011 17:51:21 +0000 (+0100)
Subject: Merge branch 'master' into divVerent/g-23-srgbcolor
X-Git-Tag: xonotic-v0.6.0~43
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=911a18ac90f2ea1795beef0c63885fa8cef841b2;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into divVerent/g-23-srgbcolor
---

911a18ac90f2ea1795beef0c63885fa8cef841b2
diff --cc maps/g-23.map.options
index 26061c86,e91a95df..e2a8f13b
--- a/maps/g-23.map.options
+++ b/maps/g-23.map.options
@@@ -1,5 -1,5 +1,5 @@@
 --bsp + -sRGBtex -samplesize 4
 --light + -sRGBtex -sRGBlight -bounce 8 -dirtscale 2 -sphericalscale 0.5 -spotscale 1.5 -areascale 0.5 -skyscale 1.5
 +-bsp + -sRGBtex -sRGBcolor -samplesize 4
 +-light + -sRGBtex -sRGBcolor -sRGBlight -bounce 8 -dirtscale 2 -sphericalscale 0.5 -spotscale 1.5 -areascale 0.5 -skyscale 1.5
  -vis +
  -minimap +
- Version: 5
+ Version: 6