Merge branch 'master' into Juhu/strafehud-server

diff --cc _hud_common.cfg
Simple merge

diff --cc qcsrc/client/hud/panel/strafehud.qc
index d61039692e2bf8f0a8faaa8e332a57c83f62b434,e4e339c44a53497c54e60485d00ce88b23468134..d656d8a005af4f8fd287738156856dbe6bd4bdb2
--- 1/qcsrc/client/hud/panel/strafehud.qc
--- 2/qcsrc/client/hud/panel/strafehud.qc
+++ b/qcsrc/client/hud/panel/strafehud.qc
@@@ -11,17 -10,9 +10,18 @@@
  #include <common/mapinfo.qh>
  #include <common/physics/movetypes/movetypes.qh>
  #include <common/physics/player.qh>
+ #include <common/resources/cl_resources.qh>
  #include <lib/csqcmodel/cl_player.qh>
  
 +AUTOCVAR_SAVE(hud_panel_strafehud_pos, string, "0.320000 0.570000", "position of this base of the panel");
 +AUTOCVAR_SAVE(hud_panel_strafehud_size, string, "0.360000 0.020000", "size of this panel");
 +AUTOCVAR_SAVE(hud_panel_strafehud_bg, string, "0", "if set to something else than \"\" = override default background");
 +AUTOCVAR_SAVE(hud_panel_strafehud_bg_color, string, "", "if set to something else than \"\" = override default panel background color");
 +AUTOCVAR_SAVE(hud_panel_strafehud_bg_color_team, string, "", "override panel color with team color in team based games");
 +AUTOCVAR_SAVE(hud_panel_strafehud_bg_alpha, string, "0.7", "if set to something else than \"\" = override default panel background alpha");
 +AUTOCVAR_SAVE(hud_panel_strafehud_bg_border, string, "", "if set to something else than \"\" = override default size of border around the background");
 +AUTOCVAR_SAVE(hud_panel_strafehud_bg_padding, string, "", "if set to something else than \"\" = override default padding of contents from border");
 +
  // StrafeHUD (#25)
  
  void HUD_StrafeHUD_Export(int fh)