Merge branch 'fruitiex/runningmanctf' of ssh://git.xonotic.org/xonotic-maps.pk3dir...
authorFruitieX <rasse@rasse-lappy.localdomain>
Sat, 24 Jul 2010 19:32:59 +0000 (22:32 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Sat, 24 Jul 2010 19:32:59 +0000 (22:32 +0300)
commit6dc45502087cc70043979d9e22aeb610caeb4e07
tree8079a4d78c9c7fa389642a71546e301830eb18b0
parentaab4ffbae241f0db34bae47afd7cd6009961e729
parent0defff18175d5e01c0e4d9d7f27d169a2d262a81
Merge branch 'fruitiex/runningmanctf' of ssh://git.xonotic.org/xonotic-maps.pk3dir into fruitiex/runningmanctf