Merge branch 'master' into mario/domination_mutator

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / progs.src

diff --git a/qcsrc/server/progs.src b/qcsrc/server/progs.src
index 36936e38642e597bad39ca5b3d56621450a9dbe1..f1bdb24439ee84eab4c5aef4a59597c79a720b0a 100644 (file)
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@ -30,6 +30,7 @@ defs.qh               // Should rename this, it has fields and globals
 mutators/base.qh
 mutators/mutators.qh
 mutators/gamemode_ctf.qh
+mutators/gamemode_domination.qh
 mutators/gamemode_keyhunt.qh // TODO fix this
 mutators/gamemode_keepaway.qh
 mutators/gamemode_nexball.qh 
@@ -141,7 +142,7 @@ t_plats.qc
 antilag.qc
 
 //ctf.qc
-domination.qc
+//domination.qc
 //mode_onslaught.qc
 //nexball.qc
 g_hook.qc
@@ -208,6 +209,7 @@ playerstats.qc
 
 mutators/base.qc
 mutators/gamemode_ctf.qc
+mutators/gamemode_domination.qc
 mutators/gamemode_freezetag.qc
 mutators/gamemode_keyhunt.qc
 mutators/gamemode_keepaway.qc