Merge branch 'samual/keepaway_mapinfos' into fruitiex/freezetag_vs_keepaway
authorFruitieX <fruitiex@gmail.com>
Tue, 30 Nov 2010 15:00:15 +0000 (17:00 +0200)
committerFruitieX <fruitiex@gmail.com>
Tue, 30 Nov 2010 15:00:15 +0000 (17:00 +0200)
Conflicts:
maps/g-23.mapinfo
maps/glowplant.mapinfo
maps/red-planet.mapinfo
maps/stormkeep.mapinfo

1  2 
maps/g-23.mapinfo
maps/glowplant.mapinfo
maps/red-planet.mapinfo
maps/stormkeep.mapinfo

index 72ba59afe01ff81ca76521a2666ac2263638d609,9e5a4cac9cce42b81da57ecb092237092071fde6..b89a1f0775b929136496be37a83bf65e1f87c1c2
@@@ -6,5 -6,5 +6,6 @@@ gametype d
  gametype lms
  gametype arena
  gametype rune
 +gametype freezetag
+ gametype keepaway
  cdtrack 2
index 18a4661403f2eb13452bd410dea752fefb4943a7,e20f76b38029adbaa7c22981fea0b156247f7840..a64570135401e043fea642bebd9f02272b8f347a
@@@ -11,7 -11,7 +11,8 @@@ gametype lm
  gametype arena
  gametype ca
  gametype kh
 +gametype freezetag
+ gametype keepaway
  // optional: fog density red green blue alpha mindist maxdist
  // optional: settemp_for_type (all|gametypename) cvarname value
  // optional: clientsettemp_for_type (all|gametypename) cvarname value
index 74b9ede65a36f65407b081cde1d7c2ea740e45b9,53c3e43f5b27d0b4f8d6693e64bcdfac083c8e8e..b947d4d7e9e332c867a898201078f213a840845a
@@@ -11,4 -11,4 +11,5 @@@ gametype aren
  gametype ca
  gametype dom
  gametype kh
 +gametype freezetag
+ gametype keepaway
index f684629f52d9c1ffcbceeee96e18d8d82d285083,8b628e3de7bb180eb1398770a1e6e65d4e1038cb..8800827c7cdcd2231bcbcdb70c1e9f73831ad0aa
@@@ -11,7 -11,7 +11,8 @@@ gametype aren
  gametype rc
  gametype kh
  gametype ca
 +gametype freezetag
+ gametype keepaway
  cdtrack 5
  // optional: fog density red green blue alpha mindist maxdist
  // optional: settemp_for_type (all|gametypename) cvarname value