From: Lyberta <lyberta@lyberta.net>
Date: Mon, 28 Aug 2017 20:35:40 +0000 (+0300)
Subject: Merge branch 'Lyberta/RandomStartWeapons' into Lyberta/PlayerTemplates
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=84293ea0c2c2d066e8afe90d8d4ade2013f09ec9;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Lyberta/RandomStartWeapons' into Lyberta/PlayerTemplates
---

84293ea0c2c2d066e8afe90d8d4ade2013f09ec9
diff --cc qcsrc/server/_mod.inc
index 204d81e5c5,99115fbdc4..47cea84122
--- a/qcsrc/server/_mod.inc
+++ b/qcsrc/server/_mod.inc
@@@ -18,9 -18,9 +18,10 @@@
  #include <server/miscfunctions.qc>
  #include <server/player.qc>
  #include <server/playerdemo.qc>
 +#include <server/playertemplates.qc>
  #include <server/portals.qc>
  #include <server/race.qc>
+ #include <server/resources.qc>
  #include <server/round_handler.qc>
  #include <server/scores.qc>
  #include <server/scores_rules.qc>
diff --cc qcsrc/server/_mod.qh
index 9092faafc0,3a88986703..6f7c0e796c
--- a/qcsrc/server/_mod.qh
+++ b/qcsrc/server/_mod.qh
@@@ -18,9 -18,9 +18,10 @@@
  #include <server/miscfunctions.qh>
  #include <server/player.qh>
  #include <server/playerdemo.qh>
 +#include <server/playertemplates.qh>
  #include <server/portals.qh>
  #include <server/race.qh>
+ #include <server/resources.qh>
  #include <server/round_handler.qh>
  #include <server/scores.qh>
  #include <server/scores_rules.qh>