Merge remote-tracking branch 'origin/master' into samual/updatecommands

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/client/main.qh
index c93d5cc03f0f8d01acd425ad3d2b793ec5c39c44,6efedb7deb6f52b2410793f5892d4df7c83de5ee..9d47e601fff8423307f14ca460d1e6e6505cf52a
--- 1/qcsrc/client/main.qh
--- 2/qcsrc/client/main.qh
+++ b/qcsrc/client/main.qh
@@@ -165,5 -165,6 +165,6 @@@ float g_trueaim_minrange
  entity entcs_receiver[255]; // 255 is the engine limit on maxclients
  
  float hud;
+ float view_quality;
  
 -void cvar_clientsettemp(string cv, string val);
 +float cvar_clientsettemp(string cv, string val);