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

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

@@@ -6,5 -6,4 +6,5 @@@ gametype d
  gametype lms
  gametype arena
  gametype rune
- cdtrack 6
 +gametype freezetag
+ cdtrack 2
Simple merge