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

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/client/autocvars.qh
index 0270b020e1313e51e28bb8ff6c6de706ac868ed2,b3b4fb567cbfcbe0ee7bf914631aa27b02861b44..e18433e9666465ef36702c7ba10637eb4e3d1a6a
--- 1/qcsrc/client/autocvars.qh
--- 2/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;