Merge remote-tracking branch 'origin/morosophos/2184-crylink-buttons-swap' into moros...

diff --cc bal-wep-mario.cfg
index adb7cc654fa3565e82441a1ca9115936191ebfc1,9ceb54ee90169d2d0758cc572da28252ff436968..526fd0e544a72ea742526216b454c5f49e55ba4d
--- 1/bal-wep-mario.cfg
--- 2/bal-wep-mario.cfg
+++ b/bal-wep-mario.cfg
@@@ -284,9 -278,10 +284,10 @@@ set g_balance_crylink_secondary_other_l
  set g_balance_crylink_secondary_radius 100
  set g_balance_crylink_secondary_refire 0.65
  set g_balance_crylink_secondary_shots 5
 -set g_balance_crylink_secondary_speed 7000
 +set g_balance_crylink_secondary_speed 4000
  set g_balance_crylink_secondary_spread 0.08
  set g_balance_crylink_secondary_spreadtype 0
+ set g_balance_crylink_swap_attacks 0
  set g_balance_crylink_switchdelay_drop 0.2
  set g_balance_crylink_switchdelay_raise 0.2
  set g_balance_crylink_weaponreplace ""

diff --cc bal-wep-nexuiz25.cfg
Simple merge

diff --cc bal-wep-samual.cfg
Simple merge

diff --cc bal-wep-xdf.cfg
Simple merge

diff --cc bal-wep-xonotic.cfg
Simple merge

diff --cc qcsrc/common/weapons/weapon/crylink.qc
Simple merge

diff --cc qcsrc/common/weapons/weapon/crylink.qh
Simple merge