From: z411 <z411@omaera.org>
Date: Sat, 26 Feb 2022 18:50:33 +0000 (-0300)
Subject: Merge branch 'master' into z411/bai-server
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d0bed6db9e531c846f12b0d9ae8f772b42d02a35;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into z411/bai-server
---

d0bed6db9e531c846f12b0d9ae8f772b42d02a35
diff --cc qcsrc/common/gamemodes/gamemode/clanarena/cl_clanarena.qc
index 771f4ebcd,c91d9a33c..7cfdc7b30
--- a/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");