]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 494e2b6 a6bc800)
fix merge conflicts
authorMirio <opivy@hotmail.de>
Fri, 11 Sep 2015 18:09:21 +0000 (20:09 +0200)
committerMirio <opivy@hotmail.de>
Fri, 11 Sep 2015 18:09:21 +0000 (20:09 +0200)
1  2 
maps/catharsis.map.options patch | diff1 | diff2 | blob | history

diff --cc maps/catharsis.map.options
index 6b876be5b89f3749303447093de28f298f9c3f31,b01354524c28bd8224a4bcd81127b860c932a582..7bca43e272e85f8053c40d82931700aa2398880b
--- 1/maps/catharsis.map.options
--- 2/maps/catharsis.map.options
+++ b/maps/catharsis.map.options
@@@ -3,4 -3,4 +3,4 @@@
  -vis +
  -minimap -scale 0.9 +
  -sRGB
- Version: 2b
 -Version: 2c
++Version: 2c