From: Mario <zacjardine@y7mail.com>
Date: Thu, 13 Nov 2014 14:39:17 +0000 (+1100)
Subject: Merge branch 'Mario/race_cts_mutators'
X-Git-Tag: xonotic-v0.8.0~164
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=22cd565b717daf5c4b2c327cfb3d6ad2b851a719

Merge branch 'Mario/race_cts_mutators'

Conflicts:
	qcsrc/server/progs.src
---

22cd565b717daf5c4b2c327cfb3d6ad2b851a719
diff --cc qcsrc/server/mutators/mutators_include.qc
index 887f9929f,000000000..92bef2d70
mode 100644,000000..100644
--- a/qcsrc/server/mutators/mutators_include.qc
+++ b/qcsrc/server/mutators/mutators_include.qc
@@@ -1,34 -1,0 +1,36 @@@
 +#include "base.qc"
 +#include "gamemode_assault.qc"
 +#include "gamemode_ca.qc"
 +#include "gamemode_ctf.qc"
 +#include "gamemode_domination.qc"
 +#include "gamemode_freezetag.qc"
 +#include "gamemode_keyhunt.qc"
 +#include "gamemode_keepaway.qc"
 +#include "gamemode_nexball.qc"
 +#include "gamemode_onslaught.qc"
 +#include "gamemode_lms.qc"
 +#include "gamemode_invasion.qc"
++#include "gamemode_race.qc"
++#include "gamemode_cts.qc"
 +
 +#include "mutator_invincibleproj.qc"
 +#include "mutator_new_toys.qc"
 +#include "mutator_nix.qc"
 +#include "mutator_dodging.qc"
 +#include "mutator_rocketflying.qc"
 +#include "mutator_vampire.qc"
 +#include "mutator_spawn_near_teammate.qc"
 +#include "mutator_physical_items.qc"
 +#include "sandbox.qc"
 +#include "mutator_superspec.qc"
 +#include "mutator_minstagib.qc"
 +#include "mutator_touchexplode.qc"
 +#include "mutator_pinata.qc"
 +#include "mutator_midair.qc"
 +#include "mutator_bloodloss.qc"
 +#include "mutator_random_gravity.qc"
 +#include "mutator_multijump.qc"
 +#include "mutator_melee_only.qc"
 +#include "mutator_nades.qc"
 +#include "mutator_campcheck.qc"
 +#include "mutator_buffs.qc"
diff --cc qcsrc/server/mutators/mutators_include.qh
index c0fbbe4ec,000000000..08841db93
mode 100644,000000..100644
--- a/qcsrc/server/mutators/mutators_include.qh
+++ b/qcsrc/server/mutators/mutators_include.qh
@@@ -1,15 -1,0 +1,17 @@@
 +#include "base.qh"
 +#include "mutators.qh"
 +#include "gamemode_assault.qh"
 +#include "gamemode_ca.qh"
 +#include "gamemode_ctf.qh"
 +#include "gamemode_domination.qh"
 +#include "gamemode_keyhunt.qh"
 +#include "gamemode_keepaway.qh"
 +#include "gamemode_nexball.qh"
 +#include "gamemode_lms.qh"
 +#include "gamemode_invasion.qh"
++#include "gamemode_race.qh"
++#include "gamemode_cts.qh"
 +
 +#include "mutator_dodging.qh"
 +#include "mutator_nades.qh"
 +#include "mutator_buffs.qh"