From: Matthias Krüger <matthias.krueger@famsik.de>
Date: Wed, 28 Aug 2013 12:04:54 +0000 (+0200)
Subject: Merge branch 'Mirio/toxic' into matthiaskrgr/toxic
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=904b4012a8ccacfccc0983b191dd7393b4e1d6f0;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'Mirio/toxic' into matthiaskrgr/toxic

Conflicts:
	maps/toxic.map.options
---

904b4012a8ccacfccc0983b191dd7393b4e1d6f0
diff --cc maps/drain.map.options
index b502f755,b502f755..79482283
--- a/maps/drain.map.options
+++ b/maps/drain.map.options
@@@ -1,5 -1,5 +1,5 @@@
  -scale 1:1.3
---bsp + -samplesize 6
++-bsp + -samplesize 1
  -light + -dirtscale 2 -bounce 8 -bouncescale 1.2 -exposure 170 -areascale 1.25 -pointscale 1.3 -randomsamples -samples 128
  -vis +
  -minimap +
diff --cc maps/toxic.map.options
index a02c8736,9e495e52..04dd6297
--- a/maps/toxic.map.options
+++ b/maps/toxic.map.options
@@@ -3,4 -3,4 +3,4 @@@
  -vis +
  -minimap +
  -nosRGB
- Version: 6
 -Version: 7
++Version: 7