From: Matthias Krüger <matthias.krueger@famsik.de>
Date: Mon, 31 Aug 2015 18:30:19 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into matthiaskrgr/srgb
X-Git-Tag: xonotic-v0.8.2~181^2^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c2eec4f57a1f98b7943631422972b727cb6ab347;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote-tracking branch 'origin/master' into matthiaskrgr/srgb
---

c2eec4f57a1f98b7943631422972b727cb6ab347
diff --cc maps/finalrage.map.options
index 55a5917f,36c47729..6d4bed18
--- a/maps/finalrage.map.options
+++ b/maps/finalrage.map.options
@@@ -2,5 -2,4 +2,5 @@@
  -light + -bounce 8 -dirtscale 2
  -vis +
  -minimap +
 -Version: 1c
 +-sRGB
- Version: 1b
++Version: 1c