Merge branch 'master' into LegendaryGuard/armorizing_and_dark_nades

diff --cc notifications.cfg
index 770eedb0bc48440f058fef77372a1ecbd9e3259a,5a31635fbbc3edd5716615df6089a49ed16977a9..83874ed863c55c48cd86143a3588897e360175fb
--- 1/notifications.cfg
--- 2/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"

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

diff --cc qcsrc/common/mutators/mutator/nades/nades.qc
Simple merge

diff --cc qcsrc/common/notifications/all.inc
Simple merge

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