]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Tue, 1 Oct 2013 13:41:42 +0000 (06:41 -0700)
committerMario <mario.mario@y7mail.com>
Tue, 1 Oct 2013 13:41:42 +0000 (06:41 -0700)
commit9cac2e30b0456afcfd02b4cfb5de949193f4cca7
treeff0d8cd49519ae54f3f3155edba2e560311e5790
parentdedcbd0469a59b131fa80f2a6ba5561e4c28279c
parentc9817f1dec9a45efdc4b617c42cc5ca907162b47
Merge branch 'master' into Mario/monsters
defaultXonotic.cfg