From: Rudolf Polzer <divverent@xonotic.org>
Date: Tue, 27 Dec 2011 14:27:39 +0000 (+0100)
Subject: Merge branch 'master' into divVerent/stormkeep-sRGB
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=45a7899845fd9c58605461411a51510857f21eb8;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into divVerent/stormkeep-sRGB
---

45a7899845fd9c58605461411a51510857f21eb8
diff --cc maps/stormkeep.map.options
index f5b739fd,7d032058..05f42d62
--- a/maps/stormkeep.map.options
+++ b/maps/stormkeep.map.options
@@@ -1,5 -1,6 +1,6 @@@
 --bsp +
 --light + -bounce 8 -dirtscale 2
 +-bsp + -sRGBcolor -sRGBtex
 +-light + -sRGBcolor -sRGBtex -sRGBlight -bounce 8 -dirtscale 2 -sphericalscale 0.5
  -vis +
  -minimap +
+ -nosRGB
  Version: 6