]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Wed, 9 Feb 2011 20:25:51 +0000 (21:25 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 9 Feb 2011 20:25:51 +0000 (21:25 +0100)
commit2a8f3090c420e0defca7e6a0e5a0b16d3992cc61
tree5395d975e75c0736d4358ea759d6eaae6936b70c
parenta27e71a8dd871e36fc3990525e70affc98d9a8c4
parent71cbd76e43f615763aea99e07137f659eab6c895
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
defaultXonotic.cfg