Merge branch 'master' into Mario/showspecs

diff --cc defaultXonotic.cfg
Simple merge

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

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

diff --cc qcsrc/client/main.qh
index 65aad3e9f64357a290a707eb8c4f32b629c38765,15362aad339c875a4e9f15f3fd333e34396b580f..bc6b5afec0d4059f446ba60df7443b035d7d4163
--- 1/qcsrc/client/main.qh
--- 2/qcsrc/client/main.qh
+++ b/qcsrc/client/main.qh
@@@ -140,10 -140,8 +140,13 @@@ float g_trueaim_minrange
  
  float hud;
  float view_quality;
 +
 +int num_spectators;
 +const int MAX_SPECTATORS = 7;
 +int spectatorlist[MAX_SPECTATORS];
 +
  int framecount;
  .float health;
+ 
+ float GetSpeedUnitFactor(int speed_unit);
+ string GetSpeedUnit(int speed_unit);

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