From: LegendaryGuard <rootuser999@gmail.com>
Date: Mon, 10 Oct 2022 21:42:02 +0000 (+0200)
Subject: Merge branch 'master' into LegendaryGuard/armorizing_and_dark_nades
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9da12804461bb59fbc3596523fcea28d8d1fe536;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into LegendaryGuard/armorizing_and_dark_nades
---

9da12804461bb59fbc3596523fcea28d8d1fe536
diff --cc notifications.cfg
index 770eedb0bc,5a31635fbb..83874ed863
--- a/notifications.cfg
+++ b/notifications.cfg
@@@ -343,7 -345,7 +345,11 @@@ seta notification_INFO_WEAPON_TUBA_SUIC
  seta notification_INFO_WEAPON_VAPORIZER_MURDER "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
  seta notification_INFO_WEAPON_VORTEX_MURDER "1" "0 = off, 1 = print to console, 2 = print to console and chatbox (if notification_allow_chatboxprint is enabled)"
  
++<<<<<<< HEAD
 +// MSG_CENTER notifications (count = 243):
++=======
+ // MSG_CENTER notifications:
++>>>>>>> master
  seta notification_CENTER_ALONE "1" "0 = off, 1 = centerprint"
  seta notification_CENTER_ASSAULT_ATTACKING "1" "0 = off, 1 = centerprint"
  seta notification_CENTER_ASSAULT_DEFENDING "1" "0 = off, 1 = centerprint"