Merge branch 'master' into Mario/vehicles
[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / progs.src
index 7e5aec8..2ed1e03 100644 (file)
@@ -70,8 +70,6 @@ pathlib/movenode.qc
 pathlib/path_waypoint.qc
 pathlib/utility.qc
 
-vehicles/all.qc
-
 weapons/accuracy.qc
 weapons/common.qc
 weapons/csqcprojectile.qc // TODO
@@ -104,6 +102,7 @@ weapons/weaponsystem.qc
 ../common/triggers/include.qc
 ../common/urllib.qc
 ../common/util.qc
+../common/vehicles/vehicles_include.qc
 
 ../common/items/all.qc