Merge branch 'master' into Mario/vehicles

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

diff --git a/qcsrc/server/progs.src b/qcsrc/server/progs.src
index 85e75cda9e2fce18b2f2715b0bd1c10e8452b7bb..9160f6f0bd676a90abd198e2fe833f1e44c30b47 100644 (file)
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@ -102,6 +102,7 @@ weapons/weaponsystem.qc
 ../common/test.qc
 ../common/urllib.qc
 ../common/util.qc
 ../common/test.qc
 ../common/urllib.qc
 ../common/util.qc

+../common/vehicles/vehicles_include.qc

 ../common/weapons/config.qc
 ../common/weapons/weapons.qc // TODO
 
 ../common/weapons/config.qc
 ../common/weapons/weapons.qc // TODO