Merge branch 'master' into Mario/vehicles

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

diff --git a/qcsrc/client/progs.src b/qcsrc/client/progs.src
index 86a8b43395e199d83a1dc1676f5a7d234cf1a27f..3e32ee235acaedc9c6f01a9fb1f48bfca78acd69 100644 (file)
--- a/qcsrc/client/progs.src
+++ b/qcsrc/client/progs.src
@@ -54,7 +54,7 @@ tturrets.qh
 ../server/tturrets/include/turrets_early.qh
 ../server/movelib.qc
 main.qh
-vehicles/vehicles.qh
+../common/vehicles/vehicles_include.qh
 ../common/csqcmodel_settings.qh
 ../csqcmodellib/common.qh
 ../csqcmodellib/cl_model.qh
@@ -90,8 +90,7 @@ modeleffects.qc
 tuba.qc
 target_music.qc
 
-vehicles/vehicles.qc
-../server/vehicles/bumblebee.qc
+../common/vehicles/vehicles_include.qc
 shownames.qh
 shownames.qc