From: Samual Lenks <samual@xonotic.org>
Date: Tue, 28 Aug 2012 18:19:24 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/master' into samual/runningman_separate
X-Git-Tag: xonotic-v0.7.0~25^2~18
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bbb903f9c0030935defe93d9d14bb16e17ae22be;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote-tracking branch 'origin/master' into samual/runningman_separate

Conflicts:
	maps/runningman.mapinfo
---

bbb903f9c0030935defe93d9d14bb16e17ae22be
diff --cc maps/runningman.mapinfo
index cbc37681,e415cd72..df8b6355
--- a/maps/runningman.mapinfo
+++ b/maps/runningman.mapinfo
@@@ -5,6 -5,13 +5,7 @@@ cdtrack 
  has weapons
  gametype dm
  gametype lms
 -gametype rune
 -gametype ctf
 -gametype ca
 -gametype kh
 -gametype ons
 -gametype dom
  gametype arena
- gametype keepaway
+ gametype ft
+ gametype ka
  clientsettemp_for_type all r_water 1