Merge remote branch 'origin/master' into samual/keepaway
authorunknown <samual@xonotic.org>
Sat, 20 Nov 2010 06:27:27 +0000 (01:27 -0500)
committerunknown <samual@xonotic.org>
Sat, 20 Nov 2010 06:27:27 +0000 (01:27 -0500)
1  2 
defaultXonotic.cfg

Simple merge