From: Mario <mario.mario@y7mail.com>
Date: Wed, 8 Jan 2020 05:48:31 +0000 (+0000)
Subject: Merge branch 'martin-t/weaponorder' into 'master'
X-Git-Tag: xonotic-v0.8.5~1105^2~34
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=729f7cf812441720792d8a0e3444f3c3828368b6;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'martin-t/weaponorder' into 'master'

Cleanup weaponorder

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

729f7cf812441720792d8a0e3444f3c3828368b6