Merge remote branch 'origin/master' into tzork/gm_nexball
[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / progs.src
index 00e66e2..b062cc2 100644 (file)
@@ -35,7 +35,6 @@ vehicles/vehicles_def.qh
 campaign.qh
 ../common/campaign_common.qh
 ../common/mapinfo.qh
-../common/util.qc
 
 accuracy.qh
 csqcprojectile.qh
@@ -210,4 +209,6 @@ mutators/sandbox.qc
 ../warpzonelib/util_server.qc
 ../warpzonelib/server.qc
 
+../common/util.qc
+
 ../common/if-this-file-errors-scroll-up-and-fix-the-warnings.fteqccfail