Merge branch 'Mario/weapon_specialattack_flag' into 'master'
authorMario <zacjardine@y7mail.com>
Wed, 14 Aug 2019 20:25:56 +0000 (20:25 +0000)
committerMario <zacjardine@y7mail.com>
Wed, 14 Aug 2019 20:25:56 +0000 (20:25 +0000)
Merge branch Mario/weapon_specialattack_flag (M merge request)

See merge request xonotic/xonotic-data.pk3dir!681


Trivial merge