From: k9wolf8634 <k9wolf@pm.me>
Date: Thu, 14 Nov 2024 15:57:32 +0000 (+0800)
Subject: Merge branch 'master' into k9er/physics-hud-features
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b148460f6631c305ca9b7b3a81d12be5733bcfa3;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into k9er/physics-hud-features
---

b148460f6631c305ca9b7b3a81d12be5733bcfa3
diff --cc qcsrc/client/hud/_mod.inc
index b68490385,f0ab341e3..f12e31de0
--- a/qcsrc/client/hud/_mod.inc
+++ b/qcsrc/client/hud/_mod.inc
@@@ -1,5 -1,4 +1,5 @@@
- // generated file; do not modify
+ // genmod.sh autogenerated file; do not modify
 +#include <client/hud/common_physics.qc>
  #include <client/hud/crosshair.qc>
  #include <client/hud/hud.qc>
  #include <client/hud/hud_config.qc>
diff --cc qcsrc/client/hud/_mod.qh
index 6551a408b,77a063e15..10f849cf4
--- a/qcsrc/client/hud/_mod.qh
+++ b/qcsrc/client/hud/_mod.qh
@@@ -1,5 -1,4 +1,5 @@@
- // generated file; do not modify
+ // genmod.sh autogenerated file; do not modify
 +#include <client/hud/common_physics.qh>
  #include <client/hud/crosshair.qh>
  #include <client/hud/hud.qh>
  #include <client/hud/hud_config.qh>