Merge branch 'master' into terencehill/dynamic_hud

author terencehill <piuntn@gmail.com>

Wed, 6 Apr 2016 16:34:00 +0000 (18:34 +0200)

committer terencehill <piuntn@gmail.com>

Wed, 6 Apr 2016 16:34:00 +0000 (18:34 +0200)
author terencehill <piuntn@gmail.com>
Wed, 6 Apr 2016 16:34:00 +0000 (18:34 +0200)
committer terencehill <piuntn@gmail.com>
Wed, 6 Apr 2016 16:34:00 +0000 (18:34 +0200)
diff --cc _hud_common.cfg
Simple merge
diff --cc qcsrc/client/autocvars.qh
Simple merge
diff --cc qcsrc/client/hud/hud.qc
Simple merge
diff --cc qcsrc/client/hud/hud.qh
Simple merge
diff --cc qcsrc/client/hud/hud_config.qc
Simple merge
diff --cc qcsrc/client/hud/panel/healtharmor.qc
Simple merge
diff --cc qcsrc/lib/string.qh
Simple merge
author	terencehill <piuntn@gmail.com>
	Wed, 6 Apr 2016 16:34:00 +0000 (18:34 +0200)
committer	terencehill <piuntn@gmail.com>
	Wed, 6 Apr 2016 16:34:00 +0000 (18:34 +0200)
		1	2
_hud_common.cfg	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/client/autocvars.qh	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud/hud.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud/hud.qh	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud/hud_config.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud/panel/healtharmor.qc	patch \|	diff1 \|	diff2 \|	blob \| history
qcsrc/lib/string.qh	patch \|	diff1 \|	diff2 \|	blob \| history