From: terencehill <piuntn@gmail.com>
Date: Fri, 8 Feb 2013 13:48:56 +0000 (+0100)
Subject: Merge branch 'terencehill/ca_arena_freezetag_bugfixes' into terencehill/ca_arena_mutators
X-Git-Tag: xonotic-v0.7.0~61^2~58
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=6ec0f2147065145e9310fc5af6e16243ef805a0f

Merge branch 'terencehill/ca_arena_freezetag_bugfixes' into terencehill/ca_arena_mutators
---

6ec0f2147065145e9310fc5af6e16243ef805a0f
diff --cc qcsrc/server/progs.src
index 7c3f23e3e7,340487ae5d..654b77f293
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@@ -29,9 -29,8 +29,10 @@@ defs.qh		// Should rename this, it has 
  
  mutators/base.qh
  mutators/mutators.qh
 +mutators/gamemode_arena.qh
 +mutators/gamemode_ca.qh
  mutators/gamemode_ctf.qh
+ mutators/gamemode_domination.qh
  mutators/gamemode_keyhunt.qh // TODO fix this
  mutators/gamemode_keepaway.qh
  mutators/gamemode_nexball.qh 
@@@ -212,9 -212,8 +213,10 @@@ round_handler.q
  ../common/explosion_equation.qc
  
  mutators/base.qc
 +mutators/gamemode_arena.qc
 +mutators/gamemode_ca.qc
  mutators/gamemode_ctf.qc
+ mutators/gamemode_domination.qc
  mutators/gamemode_freezetag.qc
  mutators/gamemode_keyhunt.qc
  mutators/gamemode_keepaway.qc