Merge remote-tracking branch 'remotes/origin/master' into TimePath/itemsys

# Conflicts:
#	qcsrc/client/main.qc
#	qcsrc/client/progs.src
#	qcsrc/menu/menu.qc
#	qcsrc/menu/progs.src
#	qcsrc/server/g_world.qc

diff --cc qcsrc/client/main.qc
index 0cedf8fd7ce5fdba8d5a1dcf59f1b8829f10a7f3,298bcdbefefff66e1b26993c8dd3b23a41f1e842..7648b129775afa875f38ff5e16de5339c62c3a80
--- 1/qcsrc/client/main.qc
--- 2/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@@ -39,9 -39,7 +39,9 @@@
  #include "../common/stats.qh"
  #include "../common/teams.qh"
  
- #include "../common/weapons/weapons.qh"
 +#include "../common/items/all.qh"
 +
+ #include "../common/weapons/all.qh"
  
  #include "../csqcmodellib/cl_model.qh"
  #include "../csqcmodellib/interpolate.qh"

diff --cc qcsrc/client/progs.src
index 5fbff743d499a619fd9fd3ec903a8df5336920a4,843ae12a47f6b4b1860744929bde122136ed898e..8ba12b9e71d957c7260fcbd09dbf80b562c9b4ee
--- 1/qcsrc/client/progs.src
--- 2/qcsrc/client/progs.src
+++ b/qcsrc/client/progs.src
@@@ -55,11 -55,9 +55,11 @@@ weapons/projectile.qc // TOD
  ../common/urllib.qc
  ../common/util.qc
  
- ../common/monsters/monsters.qc
 +../common/items/all.qc
 +
+ ../common/monsters/all.qc
  
- ../common/weapons/weapons.qc // TODO
+ ../common/weapons/all.qc // TODO
  
  ../csqcmodellib/cl_model.qc
  ../csqcmodellib/cl_player.qc

diff --cc qcsrc/menu/menu.qc
index 50183b977335f68a32d3a181479967fb48f1ad95,70f4249d038436088a5d5b05ab19aefdf23208a5..d8a3ede2e7d8988afd29865a409af7de2defe772
--- 1/qcsrc/menu/menu.qc
--- 2/qcsrc/menu/menu.qc
+++ b/qcsrc/menu/menu.qc
@@@ -2,8 -2,7 +2,8 @@@
  #include "oo/classes.qc"
  #include "xonotic/util.qh"
  
- #include "../common/weapons/weapons.qh"
 +#include "../common/items/all.qh"
+ #include "../common/weapons/all.qh"
  #include "../common/mapinfo.qh"
  
  ///////////////////////////////////////////////

diff --cc qcsrc/menu/progs.src
index 124ac9db7d00ec266f4025ca714d8b4b40660e8f,636c862b7d0148f3915ca58e2f63ae1327fb89df..2315616d1701bfc29dbdbe8cc7c6ce04e8433092
--- 1/qcsrc/menu/progs.src
--- 2/qcsrc/menu/progs.src
+++ b/qcsrc/menu/progs.src
@@@ -21,10 -21,8 +21,10 @@@ xonotic/util.q
  ../common/urllib.qc
  ../common/util.qc
  
- ../common/monsters/monsters.qc
 +../common/items/all.qc
 +
+ ../common/monsters/all.qc
  
- ../common/weapons/weapons.qc // TODO
+ ../common/weapons/all.qc // TODO
  
  ../warpzonelib/mathlib.qc

diff --cc qcsrc/server/g_world.qc
index 63f2db883298b7071bd86532e4684899c5e1d9b1,3806d5eb240d84ca5a2f82a4bcacc4583cb1b3f3..a31670a08a050f6997b9eb6f81e2277e3cdfe584
--- 1/qcsrc/server/g_world.qc
--- 2/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@@ -32,8 -32,7 +32,8 @@@
  #include "../common/stats.qh"
  #include "../common/teams.qh"
  #include "../common/util.qh"
- #include "../common/weapons/weapons.qh"
 +#include "../common/items/all.qh"
+ #include "../common/weapons/all.qh"
  
  const float LATENCY_THINKRATE = 10;
  .float latency_sum;

diff --cc qcsrc/server/miscfunctions.qc
Simple merge

diff --cc qcsrc/server/progs.src
index 0455f6b6bfb49a93852bc3b2a3785062343795e4,a812de46a4c612e7f96641b6690ee92881c6ac49..75301d592972ee3e67ade8b01a84a72c7d188f19
--- 1/qcsrc/server/progs.src
--- 2/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@@ -107,11 -107,8 +107,11 @@@ weapons/weaponsystem.q
  ../common/test.qc
  ../common/urllib.qc
  ../common/util.qc
 +
 +../common/items/all.qc
 +
  ../common/weapons/config.qc
- ../common/weapons/weapons.qc // TODO
+ ../common/weapons/all.qc // TODO
  
  ../csqcmodellib/sv_model.qc
  

diff --cc qcsrc/server/t_items.qc
Simple merge