Merge remote branch 'origin/master' into fruitiex/freezetag_mapinfo
authorFruitieX <fruitiex@gmail.com>
Fri, 26 Nov 2010 12:04:07 +0000 (14:04 +0200)
committerFruitieX <fruitiex@gmail.com>
Fri, 26 Nov 2010 12:04:07 +0000 (14:04 +0200)
Conflicts:
maps/g-23.mapinfo

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

index 594d03656f62f735364108a1242ebe4af7abb107..72ba59afe01ff81ca76521a2666ac2263638d609 100644 (file)
@@ -6,4 +6,5 @@ gametype dm
 gametype lms
 gametype arena
 gametype rune
+gametype freezetag
 cdtrack 2
index 73100a20aeafdd69a361fe8e30c16a0d69753ec9..18a4661403f2eb13452bd410dea752fefb4943a7 100644 (file)
@@ -11,6 +11,7 @@ gametype lms
 gametype arena
 gametype ca
 gametype kh
+gametype freezetag
 // 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 6fd9740f37d700ed83732ac66a6eeee24f523dbc..74b9ede65a36f65407b081cde1d7c2ea740e45b9 100644 (file)
@@ -11,3 +11,4 @@ gametype arena
 gametype ca
 gametype dom
 gametype kh
+gametype freezetag
index 70a18670dd9f5522e03438ab9d166db94d29585f..f684629f52d9c1ffcbceeee96e18d8d82d285083 100644 (file)
@@ -11,6 +11,7 @@ gametype arena
 gametype rc
 gametype kh
 gametype ca
+gametype freezetag
 cdtrack 5
 // optional: fog density red green blue alpha mindist maxdist
 // optional: settemp_for_type (all|gametypename) cvarname value