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)
commitbc20da5a3271b337049a25f68ddecad472b8db98
tree88cc6d3abe580e16dcfc44a7ec5c64f1d9b92d30
parent56e378ae75002cadb9e8908a6562817b682220d4
parentd26febb6c10869f015b615f0736687b242a1fccb
Merge remote-tracking branch 'origin/master' into samual/serverlist
defaultXonotic.cfg
qcsrc/common/util.qh