]> de.git.xonotic.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 21:00:02 +0000 (16:00 -0500)
committerSamual <samual@xonotic.org>
Mon, 16 Jan 2012 21:00:02 +0000 (16:00 -0500)
commit709e56b1552c26b8d1e3343e61bdfdee232a6f8d
tree7da77d383081db6245a2af19f70ce1329d631b6a
parent488dfaac3813ab7214fa84cc24a211669812ed24
parente7bcc892ab033c0f7de13397dd949ce9c7fec1ec
Merge remote branch 'origin/master' into samual/menu_updates
defaultXonotic.cfg