Merge branch 'master' into Mario/gametypes
authorMario <mario.mario@y7mail.com>
Wed, 15 Jul 2020 12:10:27 +0000 (22:10 +1000)
committerMario <mario.mario@y7mail.com>
Wed, 15 Jul 2020 12:10:27 +0000 (22:10 +1000)
1  2 
qcsrc/common/mapinfo.qc
qcsrc/server/compat/quake3.qc

Simple merge
@@@ -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>