From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sun, 4 Dec 2011 16:10:34 +0000 (+0200)
Subject: Merge branch 'master' into mirceakitsune/sandbox
X-Git-Tag: xonotic-v0.6.0~35^2~15^2~10
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d56c3437d965403eb83514b04b50323bc72bd0c4;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into mirceakitsune/sandbox
---

d56c3437d965403eb83514b04b50323bc72bd0c4
diff --cc qcsrc/server/mutators/mutators.qh
index 1cd07929e,b53153f7b..825062e1c
--- a/qcsrc/server/mutators/mutators.qh
+++ b/qcsrc/server/mutators/mutators.qh
@@@ -7,6 -7,6 +7,7 @@@ MUTATOR_DECLARATION(mutator_nix)
  MUTATOR_DECLARATION(mutator_dodging);
  MUTATOR_DECLARATION(mutator_rocketflying);
  MUTATOR_DECLARATION(mutator_vampire);
+ MUTATOR_DECLARATION(mutator_spawn_near_teammate);
++MUTATOR_DECLARATION(mutator_spawn_near_teammate);
  
  MUTATOR_DECLARATION(sandbox);
- MUTATOR_DECLARATION(mutator_spawn_near_teammate);