Merge branch 'master' into Mario/minigames_merge

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

diff --git a/qcsrc/server/progs.src b/qcsrc/server/progs.src
index 3d39893d06401c9989255ba5935ac317c215f259..f10b721ae5ec081b08e2972d808f3acd32533c57 100644 (file)
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@ -23,7 +23,6 @@ g_hook.qc
 // g_lights.qc // TODO: was never used
 g_models.qc
 g_subs.qc
-g_tetris.qc
 g_violence.qc
 g_world.qc
 generator.qc
@@ -90,6 +89,8 @@ weapons/weaponsystem.qc
 ../common/mapinfo.qc
 ../common/monsters/spawn.qc
 ../common/monsters/sv_monsters.qc
+../common/minigames/minigames.qc
+../common/minigames/sv_minigames.qc
 ../common/movetypes/include.qc
 ../common/nades.qc
 ../common/net_notice.qc