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)
commitf52ddede69621c7c9d31983591902f47fd40d7d0
treef50f40a95a7f61add04fd1c03ae029d66c8f3b1b
parent834fed09016056ff2cd32d1980f0719d09c403a2
parentb0423598270855d5f0a3206d46f0ebf43182b411
Merge branch 'master' into terencehill/dynamic_hud
_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