Merge branch 'master' into bones_was_here/q3compat

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / weapons / spawning.qc

diff --git a/qcsrc/server/weapons/spawning.qc b/qcsrc/server/weapons/spawning.qc
index 730a73796a204e79646221831abf1572f3e83dbd..810cc2638453561cbf11ab56f2ecfd591310db5c 100644 (file)
--- a/qcsrc/server/weapons/spawning.qc
+++ b/qcsrc/server/weapons/spawning.qc
@@ -1,12 +1,12 @@
 #include "spawning.qh"
 
-#include "weaponsystem.qh"
-#include "../resources.qh"
-#include <server/mutators/_mod.qh>
+#include <common/weapons/_all.qh>
 #include <server/items/items.qh>
 #include <server/items/spawning.qh>
+#include <server/mutators/_mod.qh>
+#include <server/resources.qh>
+#include <server/weapons/weaponsystem.qh>
 #include <server/world.qh>
-#include <common/weapons/_all.qh>
 
 .bool m_isreplaced; ///< Holds whether the weapon has been replaced.