Merge remote-tracking branch 'origin/master' into samual/runningman_separate
authorSamual Lenks <samual@xonotic.org>
Tue, 28 Aug 2012 18:19:24 +0000 (14:19 -0400)
committerSamual Lenks <samual@xonotic.org>
Tue, 28 Aug 2012 18:19:24 +0000 (14:19 -0400)
Conflicts:
maps/runningman.mapinfo

1  2 
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