Merge branch 'fruitiex/runningmanctf' of ssh://git.xonotic.org/xonotic-maps.pk3dir...
authorFruitieX <rasse@rasse-laptop.(none)>
Sat, 2 Oct 2010 21:05:22 +0000 (00:05 +0300)
committerFruitieX <rasse@rasse-laptop.(none)>
Sat, 2 Oct 2010 21:05:22 +0000 (00:05 +0300)
commit1b6f676bab578eb0c2a36e1911a8bcc880b040b4
treee0575690ae4678cf3ab02a5074c40f2b21b7ee1f
parentd8ea4b0cc2d40db3570557c1b0ffb40f0138b289
parentaaa1908fb557cc4e07ca1c91445228194c669611
Merge branch 'fruitiex/runningmanctf' of ssh://git.xonotic.org/xonotic-maps.pk3dir into fruitiex/runningmanctf

Conflicts:
maps/runningmanctf.map