Merge branch 'samual/runningman_separate' of git://de.git.xonotic.org/xonotic/xonotic...
authorFruitieX <fruitiex@gmail.com>
Thu, 14 Feb 2013 22:10:14 +0000 (00:10 +0200)
committerFruitieX <fruitiex@gmail.com>
Thu, 14 Feb 2013 22:10:14 +0000 (00:10 +0200)
commit6f4dedf2218074917fc4b13ab779d4eded497a2b
tree37bab9b7cc77e9e7ca79f524295efd3578af552f
parent6f3fb989383fc501ae2334cd5d43427079a513f2
parent11e1d974752966ddc1a30da16008989c9c094e46
Merge branch 'samual/runningman_separate' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir into samual/runningman_separate