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)
commit3963522332921529abee38a3d676c4878e6a5529
tree4e001df5b937c4d2094d1e4000ac9657dd3d32f6
parentbed0faf9537a0cddd6aadf29625458da94bbf5f1
parent8c76eca6b11a16b366b59eb9a308bb19cecaa789
Merge remote-tracking branch 'origin/master' into samual/combined_updates
defaultXonotic.cfg
qcsrc/common/util.qc
qcsrc/common/util.qh