Merge branch 'master' into mario/monsters

diff --cc qcsrc/server/cl_client.qc
Simple merge

diff --cc qcsrc/server/g_world.qc
Simple merge

diff --cc qcsrc/server/mutators/mutators.qh
index bfd06002ea3b1a4525f2acfd6fa6d71fb913f116,4bdcbb28234834629ecc13f8f52767fcd1e4ce90..e8a5aa8b9c64a306cc807a5742a1668e4dfce612
--- 1/qcsrc/server/mutators/mutators.qh
--- 2/qcsrc/server/mutators/mutators.qh
+++ b/qcsrc/server/mutators/mutators.qh
@@@ -4,7 -4,7 +4,8 @@@ MUTATOR_DECLARATION(gamemode_keepaway)
  MUTATOR_DECLARATION(gamemode_ctf);
  MUTATOR_DECLARATION(gamemode_nexball);
  MUTATOR_DECLARATION(gamemode_onslaught);
 +MUTATOR_DECLARATION(gamemode_td);
+ MUTATOR_DECLARATION(gamemode_domination);
  
  MUTATOR_DECLARATION(mutator_dodging);
  MUTATOR_DECLARATION(mutator_invincibleprojectiles);

diff --cc qcsrc/server/progs.src
index 6139d33714a5dc7edadc5b6bf25201418b0530fb,f1bdb24439ee84eab4c5aef4a59597c79a720b0a..3ac35eee205644e500e80df2ffcd5963395011d4
--- 1/qcsrc/server/progs.src
--- 2/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@@ -207,10 -207,9 +208,11 @@@ playerstats.q
  
  ../common/explosion_equation.qc
  
 +monsters/monsters.qh
 +
  mutators/base.qc
  mutators/gamemode_ctf.qc
+ mutators/gamemode_domination.qc
  mutators/gamemode_freezetag.qc
  mutators/gamemode_keyhunt.qc
  mutators/gamemode_keepaway.qc

diff --cc qcsrc/server/teamplay.qc
Simple merge