Merge branch 'master' into z411/bai-server

diff --cc qcsrc/common/gamemodes/gamemode/clanarena/cl_clanarena.qc
index 771f4ebcdf7a98dc37e26dd312d969c08e9ee9f4,c91d9a33c2a4b6edfcf6d0bfb53f6aa7a50dfada..7cfdc7b30d376cddc68820cb33c279cb5c418bae
--- 1/qcsrc/common/gamemodes/gamemode/clanarena/cl_clanarena.qc
--- 2/qcsrc/common/gamemodes/gamemode/clanarena/cl_clanarena.qc
+++ b/qcsrc/common/gamemodes/gamemode/clanarena/cl_clanarena.qc
@@@ -1,7 -1,9 +1,9 @@@
  #include "cl_clanarena.qh"
  
 -#include <client/draw.qh>
 +/*#include <client/draw.qh>
  
+ #include <common/mutators/base.qh>
+ 
  void HUD_Mod_CA_Export(int fh)
  {
        HUD_Write_Cvar("hud_panel_modicons_ca_layout");

diff --cc qcsrc/common/util.qc
Simple merge

diff --cc qcsrc/menu/xonotic/util.qc
Simple merge

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

diff --cc qcsrc/server/client.qh
Simple merge

diff --cc qcsrc/server/command/sv_cmd.qc
Simple merge