Merge branch 'master' into Mario/turrets

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

diff --git a/qcsrc/client/progs.src b/qcsrc/client/progs.src
index 88eba6d4bba4307340778c75432f76c6347cf6fd..6a427b464d6dae2d534e15f942ddbfd2f7f896d6 100644 (file)
--- a/qcsrc/client/progs.src
+++ b/qcsrc/client/progs.src
@@ -28,7 +28,6 @@ scoreboard.qc
 shownames.qc
 sortlist.qc
 teamradar.qc
-tturrets.qc
 tuba.qc
 t_items.qc
 view.qc
@@ -62,6 +61,9 @@ weapons/projectile.qc // TODO
 ../common/vehicles/all.qc
 ../common/weapons/all.qc
 
+../common/turrets/cl_turrets.qc
+../common/turrets/turrets.qc
+
 ../common/triggers/include.qc
 
 ../csqcmodellib/cl_model.qc