]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/hud_updates
authorSamual <samual@xonotic.org>
Tue, 4 Oct 2011 22:49:22 +0000 (18:49 -0400)
committerSamual <samual@xonotic.org>
Tue, 4 Oct 2011 22:49:22 +0000 (18:49 -0400)
commit4fac5ff674af4140474f6436ce63b8bd656c7577
tree23013af31550babd4db86425988b87e9657636d0
parent319d100049736c6233f59cee73f8fa4e69f4c1c0
parent0c4f032df91d03d8c6af8265099e7385cbf64222
Merge remote branch 'origin/master' into samual/hud_updates
defaultXonotic.cfg