]> 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: 5a253ba a057cef)
Fix conflict
authorMirio <opivy@hotmail.de>
Tue, 21 Mar 2017 18:26:28 +0000 (19:26 +0100)
committerMirio <opivy@hotmail.de>
Tue, 21 Mar 2017 18:26:28 +0000 (19:26 +0100)
1  2 
maps/dance.map.options patch | diff1 | diff2 | blob | history

diff --cc maps/dance.map.options
index f88cb69e056e12fd017126e5c4bd2a6a1cc7ba23,b4933267fec1c72a9722af812959098ca7395d80..88c416b8c11bdcecfdb889af2a2b97b4c0e2b8de
--- 1/maps/dance.map.options
--- 2/maps/dance.map.options
+++ b/maps/dance.map.options
@@@ -3,4 -3,4 +3,4 @@@
  -light + -bounce 8 -dirtscale 2 -gamma 0.7
  -minimap +
  -sRGB
- Version: 7c
 -Version: 8
++Version: 8a