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: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=5f5b63ec0f760cac57a2f84709c624396cb94b7f;hp=59bd30b72a6a5b1eb0e0154c508a318782d16e11

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

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

diff --git a/maps/afterslime.map b/maps/afterslime.map
index 439e188b..81e60010 100644
--- a/maps/afterslime.map
+++ b/maps/afterslime.map
@@ -52932,18 +52932,18 @@ exx/trim-metalsupp01
 "classname" "dom_controlpoint"
 "origin" "1152.000000 -352.000000 512.000000"
 "angle" "-180.000000"
-"message" " has captured the Strength control point"
+"message" " has captured the ^2Strength ^3control point"
 }
 {
 "classname" "dom_controlpoint"
 "origin" "-1312.000000 -576.000000 16.000000"
-"message" " has captured the Mortar control point"
+"message" " has captured the ^2Mortar ^3control point"
 }
 {
 "classname" "dom_controlpoint"
 "origin" "160.000000 -2048.000000 12.000000"
 "angle" "90.000000"
-"message" " has captured the Crylink control point"
+"message" " has captured the ^2Crylink ^3control point"
 }
 {
 "classname" "trigger_teleport"
diff --git a/maps/afterslime.map.options b/maps/afterslime.map.options
index c5eaa14b..9d2c5e5f 100644
--- a/maps/afterslime.map.options
+++ b/maps/afterslime.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -nosRGB
-Version: 11
+Version: 12