]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b6dccf2 e4ae40e)
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 patch | diff1 | diff2 | blob | history

diff --cc maps/runningman.mapinfo
index cbc3768187be94c470949824a7ae30b73d718490,e415cd72c4a779295f0317c302dcb680c091b72c..df8b6355f48639cb3746f74a72852bcf942c439f
--- 1/maps/runningman.mapinfo
--- 2/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