Merge branch 'master' into k9er/physics-hud-features

diff --cc _hud_common.cfg
Simple merge

diff --cc qcsrc/client/hud/_mod.inc
index b6849038524e036db62e8f57b366dcdc357b0768,f0ab341e3a9bd4cdeadfdfc5e936ada85593dad5..f12e31de0dd840710b957db486a2222d5b407600
--- 1/qcsrc/client/hud/_mod.inc
--- 2/qcsrc/client/hud/_mod.inc
+++ b/qcsrc/client/hud/_mod.inc
@@@ -1,5 -1,4 +1,5 @@@
- // generated file; do not modify
+ // genmod.sh autogenerated file; do not modify
 +#include <client/hud/common_physics.qc>
  #include <client/hud/crosshair.qc>
  #include <client/hud/hud.qc>
  #include <client/hud/hud_config.qc>

diff --cc qcsrc/client/hud/_mod.qh
index 6551a408b16526099c9050d20ff8e0413891a164,77a063e1598f50cc2f43badfebdd801239995c62..10f849cf44c52a30ee9ac6268165ff70ddd06c11
--- 1/qcsrc/client/hud/_mod.qh
--- 2/qcsrc/client/hud/_mod.qh
+++ b/qcsrc/client/hud/_mod.qh
@@@ -1,5 -1,4 +1,5 @@@
- // generated file; do not modify
+ // genmod.sh autogenerated file; do not modify
 +#include <client/hud/common_physics.qh>
  #include <client/hud/crosshair.qh>
  #include <client/hud/hud.qh>
  #include <client/hud/hud_config.qh>

diff --cc qcsrc/client/hud/panel/strafehud.qc
Simple merge