Merge remote-tracking branch 'origin/master' into samual/serverlist
authorSamual Lenks <samual@xonotic.org>
Thu, 24 Oct 2013 18:11:06 +0000 (14:11 -0400)
committerSamual Lenks <samual@xonotic.org>
Thu, 24 Oct 2013 18:11:06 +0000 (14:11 -0400)
1  2 
defaultXonotic.cfg
qcsrc/common/util.qh

Simple merge
Simple merge