From: Mario <mario.mario@y7mail.com>
Date: Fri, 13 Sep 2019 12:54:55 +0000 (+1000)
Subject: Merge branch 'master' into Mario/monsters
X-Git-Tag: xonotic-v0.8.5~7^2~1^2~24
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2e60d4af0278db5d39618bf8fee353c220d90486;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/monsters
---

2e60d4af0278db5d39618bf8fee353c220d90486
diff --cc qcsrc/server/g_world.qc
index 8d773bcbe2,a044c2a468..2bda678b80
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@@ -266,8 -266,10 +266,9 @@@ void cvar_changes_init(
  		BADCVAR("g_domination");
  		BADCVAR("g_domination_default_teams");
  		BADCVAR("g_duel");
+ 		BADCVAR("g_duel_not_dm_maps");
  		BADCVAR("g_freezetag");
  		BADCVAR("g_freezetag_teams");
 -		BADCVAR("g_invasion_teams");
  		BADCVAR("g_invasion_type");
  		BADCVAR("g_jailbreak");
  		BADCVAR("g_jailbreak_teams");