Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Mon, 26 Dec 2011 15:52:14 +0000 (16:52 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 26 Dec 2011 15:52:14 +0000 (16:52 +0100)
commit32e16889b1b89f22435e082e4fb570ff68e9121f
tree3a9e74cbdad20e6af41ef05f981cafb1ab512afd
parent9c066c64fae3409ceb6f23c804ec583b4d9b2bd5
parentbe5723241839f83162cb99406dc3d052fa640ed9
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir