Merge remote-tracking branch 'origin/master' into terencehill/hud_code_restructure
authorSamual Lenks <samual@xonotic.org>
Sun, 28 Apr 2013 23:34:38 +0000 (19:34 -0400)
committerSamual Lenks <samual@xonotic.org>
Sun, 28 Apr 2013 23:34:38 +0000 (19:34 -0400)
commit635a3c9a8a5c60e09e9449bf53128393d3355f20
tree04ebd025df575e39faeac8a871905a2b2f256494
parentad444437c8652444006ef4e5261c26984050dbc3
parent01842eb78579a8418cc59614c902720fb21cb151
Merge remote-tracking branch 'origin/master' into terencehill/hud_code_restructure
qcsrc/client/Main.qc
qcsrc/common/constants.qh
qcsrc/common/util.qh