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

Merge branch 'master' into Mario/race_cts_mutators
---

31bf64ba7821ebb5c0aba8a154472810074ed11e
diff --cc qcsrc/server/progs.src
index 9426d2d741,812a1d390a..07683fc166
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@@ -48,10 -50,9 +50,11 @@@ mutators/gamemode_keepaway.q
  mutators/gamemode_nexball.qh 
  mutators/gamemode_lms.qh
  mutators/gamemode_invasion.qh
 +mutators/gamemode_cts.qh
 +mutators/gamemode_race.qh
  mutators/mutator_dodging.qh
  mutators/mutator_nades.qh
+ mutators/mutator_buffs.qh
  
  //// tZork Turrets ////
  tturrets/include/turrets_early.qh