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)
commit996b946d7e61b9519d177e6bd29755871cd1dee2
tree27e6d7747603e4d6e10cc18e85ef20f0319d6a4e
parent0ba71dc570e81c28d76967aa31aff3138a713559
parent97acd4ed6f919824662aca0b2f227a2f9b8c3f44
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