From: Jakob MG <jakob_mg@hotmail.com>
Date: Tue, 29 Nov 2011 14:06:35 +0000 (+0100)
Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
X-Git-Tag: xonotic-v0.6.0~35^2~33
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=966ecd5b871fc8ef6db7665c08bd17971a8830db;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
---

966ecd5b871fc8ef6db7665c08bd17971a8830db
diff --cc qcsrc/client/autocvars.qh
index 0270b020e,b3b4fb567..e18433e96
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@@ -151,11 -151,7 +151,10 @@@ float autocvar_g_waypointsprite_normdis
  float autocvar_g_waypointsprite_scale;
  float autocvar_g_waypointsprite_spam;
  float autocvar_g_waypointsprite_timealphaexponent;
 +float autocvar_g_waypointsprites_turrets;
 +float autocvar_g_waypointsprites_turrets_maxdist;
 +
  float autocvar_hud_colorflash_alpha;
- float autocvar_hud_configure_bg_minalpha;
  float autocvar_hud_configure_checkcollisions;
  float autocvar_hud_configure_grid;
  float autocvar_hud_configure_grid_alpha;