Merge branch 'master' into terencehill/weapon_panel_fix
authorterencehill <piuntn@gmail.com>
Mon, 2 Feb 2015 23:37:19 +0000 (00:37 +0100)
committerterencehill <piuntn@gmail.com>
Mon, 2 Feb 2015 23:37:19 +0000 (00:37 +0100)
commitbb80a6aba067167c6ef8d5f3465f03bd34142fa2
tree359d8e31eab76485934be212491197230787ae19
parenta035d049951445f892a37bfdef3e738f8a18e8b9
parent61c76972374b56c3df73abc2a71fe665fffc2212
Merge branch 'master' into terencehill/weapon_panel_fix

Conflicts:
qcsrc/client/hud.qc
qcsrc/client/hud.qc