Merge remote branch 'origin/master' into samual/keepaway
authorunknown <samual@xonotic.org>
Wed, 17 Nov 2010 22:05:12 +0000 (17:05 -0500)
committerunknown <samual@xonotic.org>
Wed, 17 Nov 2010 22:05:12 +0000 (17:05 -0500)
1  2 
defaultXonotic.cfg

Simple merge