From: FruitieX <fruitiex@gmail.com>
Date: Tue, 30 Nov 2010 15:00:15 +0000 (+0200)
Subject: Merge branch 'samual/keepaway_mapinfos' into fruitiex/freezetag_vs_keepaway
X-Git-Tag: xonotic-v0.1.0preview~22^2^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=96c2b3614e2abc61f7e59edb76f31736fd889d1a;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'samual/keepaway_mapinfos' into fruitiex/freezetag_vs_keepaway

Conflicts:
	maps/g-23.mapinfo
	maps/glowplant.mapinfo
	maps/red-planet.mapinfo
	maps/stormkeep.mapinfo
---

96c2b3614e2abc61f7e59edb76f31736fd889d1a
diff --cc maps/g-23.mapinfo
index 72ba59af,9e5a4cac..b89a1f07
--- a/maps/g-23.mapinfo
+++ b/maps/g-23.mapinfo
@@@ -6,5 -6,5 +6,6 @@@ gametype d
  gametype lms
  gametype arena
  gametype rune
 +gametype freezetag
+ gametype keepaway
  cdtrack 2
diff --cc maps/glowplant.mapinfo
index 18a46614,e20f76b3..a6457013
--- a/maps/glowplant.mapinfo
+++ b/maps/glowplant.mapinfo
@@@ -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
diff --cc maps/red-planet.mapinfo
index 74b9ede6,53c3e43f..b947d4d7
--- a/maps/red-planet.mapinfo
+++ b/maps/red-planet.mapinfo
@@@ -11,4 -11,4 +11,5 @@@ gametype aren
  gametype ca
  gametype dom
  gametype kh
 +gametype freezetag
+ gametype keepaway
diff --cc maps/stormkeep.mapinfo
index f684629f,8b628e3d..8800827c
--- a/maps/stormkeep.mapinfo
+++ b/maps/stormkeep.mapinfo
@@@ -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