From: Samual <samual@xonotic.org>
Date: Thu, 17 Nov 2011 20:31:47 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/master' into samual/updatecommands
X-Git-Tag: xonotic-v0.6.0~188^2~28^2~210
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f549654c23b2b27cd81d4a92ee990edd1b663747;p=xonotic%2Fxonotic-data.pk3dir.git

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

f549654c23b2b27cd81d4a92ee990edd1b663747
diff --cc qcsrc/client/main.qh
index c93d5cc03,6efedb7de..9d47e601f
--- a/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);