Merge remote branch 'origin/master' into samual/updatecommands

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

diff --git a/qcsrc/client/progs.src b/qcsrc/client/progs.src
index 77c12f4054fb3d9b59ec8cce409e901d3785ef55..cc11918985544a42e9c3f3a59268d07a02924594 100644 (file)
--- a/qcsrc/client/progs.src
+++ b/qcsrc/client/progs.src
@@ -25,7 +25,7 @@ command/cl_cmd.qh
 
 autocvars.qh
 
-../csqcmodel/interpolate.qh
+../csqcmodellib/interpolate.qh
 teamradar.qh
 hud.qh
 scoreboard.qh
@@ -40,10 +40,11 @@ tturrets.qh
 ../server/movelib.qc
 main.qh
 vehicles/vehicles.qh
-../csqcmodel/settings.qh
-../csqcmodel/common.qh
-../csqcmodel/cl_model.qh
-../csqcmodel/cl_player.qh
+../common/csqcmodel_settings.qh
+../csqcmodellib/common.qh
+../csqcmodellib/cl_model.qh
+../csqcmodellib/cl_player.qh
+projectile.qh
 
 sortlist.qc
 miscfunctions.qc
@@ -64,8 +65,8 @@ projectile.qc
 gibs.qc
 damage.qc
 casings.qc
-../csqcmodel/cl_model.qc
-../csqcmodel/cl_player.qc
+../csqcmodellib/cl_model.qc
+../csqcmodellib/cl_player.qc
 effects.qc
 wall.qc
 modeleffects.qc
@@ -79,7 +80,7 @@ shownames.qc
 announcer.qc
 Main.qc
 View.qc
-../csqcmodel/interpolate.qc
+../csqcmodellib/interpolate.qc
 waypointsprites.qc
 movetypes.qc
 prandom.qc