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

maps/afterslime.map
maps/afterslime.map.options

index 439e188..81e6001 100644 (file)
@@ -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"
index c5eaa14..9d2c5e5 100644 (file)
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -nosRGB
-Version: 11
+Version: 12