]> 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@xonotic.org>
Mon, 15 Aug 2011 18:10:44 +0000 (20:10 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 15 Aug 2011 18:10:44 +0000 (20:10 +0200)
commite3ca1d7136089e958df12050a14c11629af17f83
tree7c6f78079d38f6b9b810028df3d687c4e87e24bf
parent62baf2e9aae79a6d6d3364f108ebce69e7271b8f
parent2d72a533e3564facb0b617b026bddc9761960db8
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
defaultXonotic.cfg