]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
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)
1  2 
defaultXonotic.cfg

Simple merge