From: Samual Lenks <samual@xonotic.org>
Date: Tue, 4 Jun 2013 16:23:43 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/Mirio/afterslime'
X-Git-Tag: xonotic-v0.7.0~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5f5b63ec0f760cac57a2f84709c624396cb94b7f;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote-tracking branch 'origin/Mirio/afterslime'

Conflicts:
	maps/afterslime.map.options
---

5f5b63ec0f760cac57a2f84709c624396cb94b7f
diff --cc maps/afterslime.map.options
index c5eaa14b,0b5d7392..9d2c5e5f
--- a/maps/afterslime.map.options
+++ b/maps/afterslime.map.options
@@@ -3,4 -3,4 +3,4 @@@
  -vis +
  -minimap +
  -nosRGB
- Version: 11
 -Version: 13
++Version: 12