From: terencehill <piuntn@gmail.com>
Date: Fri, 27 Apr 2012 21:41:24 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/cmd_fixes
X-Git-Tag: xonotic-v0.7.0~194^2
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=3618a0f2000f064d6f59b99c7b79d7a3c25f77b9;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/cmd_fixes

Conflicts:
	qcsrc/common/util.qc
---

3618a0f2000f064d6f59b99c7b79d7a3c25f77b9
diff --cc qcsrc/common/util.qc
index 6b737603e,a1e059589..020cfd766
--- a/qcsrc/common/util.qc
+++ b/qcsrc/common/util.qc
@@@ -860,6 -860,8 +860,8 @@@ float cvar_settemp(string tmp_cvar, str
  	float created_saved_value;
  	entity e;
  
 -	created_saved_value = FALSE;
 -	
++	created_saved_value = 0;
++
  	if not(tmp_cvar || tmp_value)
  	{
  		dprint("Error: Invalid usage of cvar_settemp(string, string); !\n");