]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/menu_updates
authorSamual <samual@xonotic.org>
Tue, 16 Aug 2011 05:36:56 +0000 (01:36 -0400)
committerSamual <samual@xonotic.org>
Tue, 16 Aug 2011 05:36:56 +0000 (01:36 -0400)
commit9c5ff7fce483864bb75c048be1c980d09b8e78ef
tree040d9629863720053fac689291f7abebb2c79a1f
parentb434cec61c0dd11bef2cee4a7567ea2c5424c2bb
parentff029da4a92ae6c3520341a427dc904d20fe6cce
Merge remote branch 'origin/master' into samual/menu_updates
defaultXonotic.cfg