From: Mario <zacjardine@y7mail.com>
Date: Wed, 14 Aug 2019 20:25:56 +0000 (+0000)
Subject: Merge branch 'Mario/weapon_specialattack_flag' into 'master'
X-Git-Tag: xonotic-v0.8.5~1392
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=996b946d7e61b9519d177e6bd29755871cd1dee2;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/weapon_specialattack_flag' into 'master'

Merge branch Mario/weapon_specialattack_flag (M merge request)

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

996b946d7e61b9519d177e6bd29755871cd1dee2