Merge remote-tracking branch 'origin/master' into terencehill/ca_arena_mutators

diff --cc qcsrc/client/autocvars.qh
Simple merge

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

diff --cc qcsrc/client/hud_config.qc
index d21234ccecaf6bf868dd0ba786f0b2497dfe6b68,da56e00cc20c8386ea5c6c9bbae32476752b648d..c831c17f58b3d0e7285fdb07998f5d3806bbc3d6
--- 1/qcsrc/client/hud_config.qc
--- 2/qcsrc/client/hud_config.qc
+++ b/qcsrc/client/hud_config.qc
@@@ -139,13 -139,11 +139,13 @@@ void HUD_Panel_ExportCfg(string cfgname
                                        HUD_Write_PanelCvar_q("_alreadyvoted_alpha");
                                        break;
                                case HUD_PANEL_MODICONS:
 +                                      HUD_Write_PanelCvar_q("_ca_layout");
                                        HUD_Write_PanelCvar_q("_dom_layout");
 +                                      HUD_Write_PanelCvar_q("_freezetag_layout");
                                        break;
                                case HUD_PANEL_PRESSEDKEYS:
-                                       HUD_Write_PanelCvar_q("_attack");
                                        HUD_Write_PanelCvar_q("_aspect");
+                                       HUD_Write_PanelCvar_q("_attack");
                                        break;
                                case HUD_PANEL_ENGINEINFO:
                                        HUD_Write_PanelCvar_q("_framecounter_time");

diff --cc qcsrc/server/autocvars.qh
Simple merge

diff --cc qcsrc/server/cl_client.qc
Simple merge

diff --cc qcsrc/server/cl_player.qc
Simple merge

diff --cc qcsrc/server/defs.qh
Simple merge

diff --cc qcsrc/server/progs.src
Simple merge