]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/menu_updates
authorSamual <samual@xonotic.org>
Mon, 16 Jan 2012 17:31:30 +0000 (12:31 -0500)
committerSamual <samual@xonotic.org>
Mon, 16 Jan 2012 17:31:30 +0000 (12:31 -0500)
commit921b827d6b642f26b76b52d6f370ffe63ecd6723
tree00e77d6fcf8ba8d7ed676830e90a1d68cd010bef
parent43248ad85d3ac395f6aa5ae8c383495733eb461a
parent1ee23a8eac45dd2ce91a2a39cfd24dc49cf3f993
Merge remote branch 'origin/master' into samual/menu_updates
defaultXonotic.cfg