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)
commit96c2b3614e2abc61f7e59edb76f31736fd889d1a
tree2f605fbd0e50c3617185536ac771813c1d27ddb6
parenta34e4566df6923ac2c27abe0cec5f021ec2e6dd1
parent2e95a0c5478637048b9c0b172eb51ac5c807b0e1
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
maps/g-23.mapinfo
maps/glowplant.mapinfo
maps/red-planet.mapinfo
maps/stormkeep.mapinfo