From: Mario <mario.mario@y7mail.com>
Date: Mon, 30 Sep 2019 14:05:39 +0000 (+0000)
Subject: Merge branch 'Mario/weaponorder' into 'master'
X-Git-Tag: xonotic-v0.8.5~1253
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=55f166a94432b80e71f6f76702a1b15fde60c474;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/weaponorder' into 'master'

Merge branch Mario/weaponorder (XS merge request)

Closes #1929

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

55f166a94432b80e71f6f76702a1b15fde60c474