From: Mario <mario.mario@y7mail.com>
Date: Wed, 15 Jul 2020 12:10:27 +0000 (+1000)
Subject: Merge branch 'master' into Mario/gametypes
X-Git-Tag: xonotic-v0.8.5~855^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e12b0503854a3db83f9ddcda6285b6c343c0741a;p=xonotic%2Fxonotic-data.pk3dir.git

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

e12b0503854a3db83f9ddcda6285b6c343c0741a
diff --cc qcsrc/server/compat/quake3.qc
index 73bf3c375,c405b8a24..134956e7d
--- a/qcsrc/server/compat/quake3.qc
+++ b/qcsrc/server/compat/quake3.qc
@@@ -4,8 -4,8 +4,9 @@@
  #include <server/miscfunctions.qh>
  #include <server/items.qh>
  #include <server/resources.qh>
 +#include <common/gamemodes/_mod.qh>
  #include <common/t_items.qh>
+ #include <common/gamemodes/gamemode/ctf/sv_ctf.qh>
  #include <common/mapobjects/triggers.qh>
  #include <common/mapobjects/trigger/counter.qh>
  #include <common/mutators/mutator/buffs/buffs.qh>