]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1d2d6b2 e5a2cba)
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 patch | diff1 | diff2 | blob | history
qcsrc/server/compat/quake3.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/common/mapinfo.qc
Simple merge
diff --cc qcsrc/server/compat/quake3.qc
index 73bf3c375fb725ec0e2095ea1e38a4dc2505e006,c405b8a24b70a853003e52f4982702cc4039e274..134956e7d8fc528c328e1ee68f21a908139f6bac
--- 1/qcsrc/server/compat/quake3.qc
--- 2/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>