Merge remote-tracking branch 'origin/master' into samual/combined_updates
authorSamual Lenks <samual@xonotic.org>
Sat, 25 Jan 2014 22:33:59 +0000 (17:33 -0500)
committerSamual Lenks <samual@xonotic.org>
Sat, 25 Jan 2014 22:33:59 +0000 (17:33 -0500)
1  2 
defaultXonotic.cfg
qcsrc/common/util.qc
qcsrc/common/util.qh

Simple merge
Simple merge
Simple merge