Merge branch 'master' into samual/keepaway
authorSamual <samual@xonotic.org>
Mon, 10 Jan 2011 03:10:47 +0000 (22:10 -0500)
committerSamual <samual@xonotic.org>
Mon, 10 Jan 2011 03:10:47 +0000 (22:10 -0500)
1  2 
defaultXonotic.cfg

Simple merge