Merge branch 'master' into terencehill/dynamic_hud
authorterencehill <piuntn@gmail.com>
Wed, 6 Apr 2016 16:34:00 +0000 (18:34 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 6 Apr 2016 16:34:00 +0000 (18:34 +0200)
1  2 
_hud_common.cfg
qcsrc/client/autocvars.qh
qcsrc/client/hud/hud.qc
qcsrc/client/hud/hud.qh
qcsrc/client/hud/hud_config.qc
qcsrc/client/hud/panel/healtharmor.qc
qcsrc/lib/string.qh

diff --cc _hud_common.cfg
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge