From: Lyberta <lyberta@lyberta.net>
Date: Mon, 16 Jul 2018 12:27:30 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/PlayerTemplates
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f6dc194f6394a97881b890a7f07eadd60e00591e;p=xonotic%2Fxonotic-data.pk3dir.git

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

f6dc194f6394a97881b890a7f07eadd60e00591e
diff --cc qcsrc/server/_mod.inc
index 62e4cd3a2,a4cb8bd5e..5ccd29914
--- a/qcsrc/server/_mod.inc
+++ b/qcsrc/server/_mod.inc
@@@ -16,8 -16,6 +16,7 @@@
  #include <server/matrix.qc>
  #include <server/miscfunctions.qc>
  #include <server/player.qc>
- #include <server/playerdemo.qc>
 +#include <server/player_templates.qc>
  #include <server/portals.qc>
  #include <server/race.qc>
  #include <server/resources.qc>
diff --cc qcsrc/server/_mod.qh
index 233a4a7a6,0a00d6807..8be7fefd4
--- a/qcsrc/server/_mod.qh
+++ b/qcsrc/server/_mod.qh
@@@ -16,8 -16,6 +16,7 @@@
  #include <server/matrix.qh>
  #include <server/miscfunctions.qh>
  #include <server/player.qh>
- #include <server/playerdemo.qh>
 +#include <server/player_templates.qh>
  #include <server/portals.qh>
  #include <server/race.qh>
  #include <server/resources.qh>