From: Juhu <5894800-Juhu_@users.noreply.gitlab.com>
Date: Fri, 16 Oct 2020 05:14:34 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into Juhu/scoreboard-strafe
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e61a3995056e6406a0498ca06fedee4ed43cdc0d;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/master' into Juhu/scoreboard-strafe
---

e61a3995056e6406a0498ca06fedee4ed43cdc0d
diff --cc qcsrc/server/_mod.inc
index b2139aa90,34ca1e2c8..345b1d3eb
--- a/qcsrc/server/_mod.inc
+++ b/qcsrc/server/_mod.inc
@@@ -25,9 -26,9 +26,10 @@@
  #include <server/scores_rules.qc>
  #include <server/spawnpoints.qc>
  #include <server/steerlib.qc>
 +#include <server/strafe.qc>
  #include <server/teamplay.qc>
  #include <server/tests.qc>
+ #include <server/world.qc>
  
  #include <server/bot/_mod.inc>
  #include <server/command/_mod.inc>
diff --cc qcsrc/server/_mod.qh
index 730345519,c99753826..2c7bbe404
--- a/qcsrc/server/_mod.qh
+++ b/qcsrc/server/_mod.qh
@@@ -25,9 -26,9 +26,10 @@@
  #include <server/scores_rules.qh>
  #include <server/spawnpoints.qh>
  #include <server/steerlib.qh>
 +#include <server/strafe.qh>
  #include <server/teamplay.qh>
  #include <server/tests.qh>
+ #include <server/world.qh>
  
  #include <server/bot/_mod.qh>
  #include <server/command/_mod.qh>