Merge remote-tracking branch 'origin/master' into samual/combined_updates
authorSamual Lenks <samual@xonotic.org>
Sun, 9 Mar 2014 01:12:14 +0000 (20:12 -0500)
committerSamual Lenks <samual@xonotic.org>
Sun, 9 Mar 2014 01:12:14 +0000 (20:12 -0500)
1  2 
qcsrc/common/util.qc
qcsrc/common/util.qh

Simple merge
Simple merge