From: Samual Lenks <samual@xonotic.org>
Date: Sun, 10 Feb 2013 01:01:32 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/master' into terencehill/ca_arena_mutators
X-Git-Tag: xonotic-v0.7.0~61^2~52^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=66cf5d96044bf7bdc5b2c243e84af1b3c4f0efb0;p=xonotic%2Fxonotic-data.pk3dir.git

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

66cf5d96044bf7bdc5b2c243e84af1b3c4f0efb0
diff --cc qcsrc/client/hud_config.qc
index d21234cce,da56e00cc..c831c17f5
--- a/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");