From: Lyberta <lyberta@lyberta.net>
Date: Sun, 10 Jun 2018 08:13:53 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/GunGame
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a22cbff0e1d4a93141e02410f27d0db78d72139d;p=xonotic%2Fxonotic-data.pk3dir.git

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

a22cbff0e1d4a93141e02410f27d0db78d72139d
diff --cc qcsrc/common/gamemodes/gamemode/_mod.inc
index 6cec1df92,c4cd002c7..01a5a060c
--- a/qcsrc/common/gamemodes/gamemode/_mod.inc
+++ b/qcsrc/common/gamemodes/gamemode/_mod.inc
@@@ -1,5 -1,17 +1,18 @@@
  // generated file; do not modify
  
+ #include <common/gamemodes/gamemode/assault/_mod.inc>
+ #include <common/gamemodes/gamemode/clanarena/_mod.inc>
+ #include <common/gamemodes/gamemode/ctf/_mod.inc>
+ #include <common/gamemodes/gamemode/cts/_mod.inc>
+ #include <common/gamemodes/gamemode/deathmatch/_mod.inc>
+ #include <common/gamemodes/gamemode/domination/_mod.inc>
+ #include <common/gamemodes/gamemode/freezetag/_mod.inc>
 +#include <common/gamemodes/gamemode/gungame/_mod.inc>
+ #include <common/gamemodes/gamemode/invasion/_mod.inc>
+ #include <common/gamemodes/gamemode/keepaway/_mod.inc>
+ #include <common/gamemodes/gamemode/keyhunt/_mod.inc>
+ #include <common/gamemodes/gamemode/lms/_mod.inc>
  #include <common/gamemodes/gamemode/nexball/_mod.inc>
  #include <common/gamemodes/gamemode/onslaught/_mod.inc>
+ #include <common/gamemodes/gamemode/race/_mod.inc>
+ #include <common/gamemodes/gamemode/tdm/_mod.inc>
diff --cc qcsrc/common/gamemodes/gamemode/_mod.qh
index f06b224d8,d7c1aa66c..8ddd27c59
--- a/qcsrc/common/gamemodes/gamemode/_mod.qh
+++ b/qcsrc/common/gamemodes/gamemode/_mod.qh
@@@ -1,5 -1,17 +1,18 @@@
  // generated file; do not modify
  
+ #include <common/gamemodes/gamemode/assault/_mod.qh>
+ #include <common/gamemodes/gamemode/clanarena/_mod.qh>
+ #include <common/gamemodes/gamemode/ctf/_mod.qh>
+ #include <common/gamemodes/gamemode/cts/_mod.qh>
+ #include <common/gamemodes/gamemode/deathmatch/_mod.qh>
+ #include <common/gamemodes/gamemode/domination/_mod.qh>
+ #include <common/gamemodes/gamemode/freezetag/_mod.qh>
 +#include <common/gamemodes/gamemode/gungame/_mod.qh>
+ #include <common/gamemodes/gamemode/invasion/_mod.qh>
+ #include <common/gamemodes/gamemode/keepaway/_mod.qh>
+ #include <common/gamemodes/gamemode/keyhunt/_mod.qh>
+ #include <common/gamemodes/gamemode/lms/_mod.qh>
  #include <common/gamemodes/gamemode/nexball/_mod.qh>
  #include <common/gamemodes/gamemode/onslaught/_mod.qh>
+ #include <common/gamemodes/gamemode/race/_mod.qh>
+ #include <common/gamemodes/gamemode/tdm/_mod.qh>