Merge branch 'master' into Mario/ons_updates

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

diff --git a/qcsrc/server/progs.src b/qcsrc/server/progs.src
index ab87642aaa5843e6f9b05150b6f80aa0ec198ab0..12a4f81820f7ace88dc8cd5f62325eb9ec4d403a 100644 (file)
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@ -13,6 +13,7 @@ cheats.qc
 cl_client.qc
 cl_impulse.qc
 cl_player.qc
+controlpoint.qc
 csqceffects.qc
 ent_cs.qc
 g_casings.qc
@@ -24,6 +25,7 @@ g_subs.qc
 g_tetris.qc
 g_violence.qc
 g_world.qc
+generator.qc
 ipban.qc
 item_key.qc
 mapvoting.qc
@@ -54,7 +56,6 @@ bot/waypoints.qc
 
 bot/havocbot/havocbot.qc
 bot/havocbot/role_keyhunt.qc
-bot/havocbot/role_onslaught.qc
 bot/havocbot/roles.qc
 
 command/all.qc