From: Lyberta <lyberta@lyberta.net>
Date: Thu, 31 Aug 2017 13:17:53 +0000 (+0300)
Subject: Merge branch 'Lyberta/Survival' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=79b3ac85808690fc13f5d21c1a45747912498f60;p=xonotic%2Fxonotic-data.pk3dir.git

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

79b3ac85808690fc13f5d21c1a45747912498f60
diff --cc qcsrc/common/gamemodes/gamemode/_mod.inc
index 6cec1df923,6056ba7cc2..866e162279
--- a/qcsrc/common/gamemodes/gamemode/_mod.inc
+++ b/qcsrc/common/gamemodes/gamemode/_mod.inc
@@@ -1,5 -1,5 +1,6 @@@
  // generated file; do not modify
  
 +#include <common/gamemodes/gamemode/gungame/_mod.inc>
  #include <common/gamemodes/gamemode/nexball/_mod.inc>
  #include <common/gamemodes/gamemode/onslaught/_mod.inc>
+ #include <common/gamemodes/gamemode/survival/_mod.inc>
diff --cc qcsrc/common/gamemodes/gamemode/_mod.qh
index f06b224d8f,333d341709..f4c598f697
--- a/qcsrc/common/gamemodes/gamemode/_mod.qh
+++ b/qcsrc/common/gamemodes/gamemode/_mod.qh
@@@ -1,5 -1,5 +1,6 @@@
  // generated file; do not modify
  
 +#include <common/gamemodes/gamemode/gungame/_mod.qh>
  #include <common/gamemodes/gamemode/nexball/_mod.qh>
  #include <common/gamemodes/gamemode/onslaught/_mod.qh>
+ #include <common/gamemodes/gamemode/survival/_mod.qh>