]> 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 | compact (merge: 59bd30b 754a750)
Merge remote-tracking branch 'origin/Mirio/afterslime'
authorSamual Lenks <samual@xonotic.org>
Tue, 4 Jun 2013 16:23:43 +0000 (12:23 -0400)
committerSamual Lenks <samual@xonotic.org>
Tue, 4 Jun 2013 16:23:43 +0000 (12:23 -0400)
Conflicts:
maps/afterslime.map.options

1  2 
maps/afterslime.map.options patch | diff1 | diff2 | blob | history

diff --combined maps/afterslime.map.options
index c5eaa14bead07e22cc1fbd96391999a2b7c0f5d5,0b5d73927e8628da6e2d31e059ca2a1bf5caa999..9d2c5e5f42aa251a52e48d2eef684fbe8bf73f12
--- 1/maps/afterslime.map.options
--- 2/maps/afterslime.map.options
+++ b/maps/afterslime.map.options
@@@ -3,4 -3,4 +3,4 @@@
  -vis +
  -minimap +
  -nosRGB
- Version: 11
 -Version: 13
++Version: 12