]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3fb0eec bd7dc2b)
Fix conflict 94/head
authorMirio <opivy@hotmail.de>
Tue, 21 Mar 2017 14:01:55 +0000 (15:01 +0100)
committerMirio <opivy@hotmail.de>
Tue, 21 Mar 2017 14:01:55 +0000 (15:01 +0100)
1  2 
maps/dance.map.options patch | diff1 | diff2 | blob | history

diff --cc maps/dance.map.options
index a656da270c6b895cf16d516c50ec313669456d58,8e81a0adda4d91b9e0eee544283d4a6a9d5131e3..b4933267fec1c72a9722af812959098ca7395d80
--- 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: 8
 -Version: 7c
++Version: 8