From: ssinghal <dib.diabolik@gmail.com>
Date: Sun, 6 Mar 2011 21:00:58 +0000 (-0500)
Subject: Merge branch 'diabolik/afterslime' of ssh://git.xonotic.org/xonotic-maps.pk3dir into... 
X-Git-Tag: xonotic-v0.5.0~98^2~18^2^2~5
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=b618d0ed6d30475c6a330da952f2c0df19cbe1d1;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'diabolik/afterslime' of ssh://git.xonotic.org/xonotic-maps.pk3dir into diabolik/afterslime

Conflicts:
	maps/afterslime.mapinfo
	maps/afterslime.waypoints
---

b618d0ed6d30475c6a330da952f2c0df19cbe1d1
diff --cc maps/afterslime.mapinfo
index 42739915,0783b523..2905d8ea
--- a/maps/afterslime.mapinfo
+++ b/maps/afterslime.mapinfo
@@@ -1,14 -1,13 +1,18 @@@
  title Afterslime
 -description Medium sized indoor deathmatch map.
 +description Medium sized indoor deathmatch map
  author kuniu the frogg
++<<<<<<< HEAD
 +cdtrack 3
++=======
+ cdtrack 8
++>>>>>>> c5a920af43cfefb3bf459078dce4da8285724de0
  has weapons
 -type dm 30 20
 -type tdm 50 20 2
 -type lms 9 20
 -type ca 200 20
 -type arena 10 20
 -type rune 200 20
 -type freezetag 200 20 2
 -type kh 200 20 2
 +gametype dm
 +gametype tdm
 +gametype lms
 +gametype ca
 +gametype arena
 +gametype rune
 +gametype freezetag
 +gametype kh
 +gametype dom