Merge branch 'Mario/weaponorder' into 'master'
authorMario <mario.mario@y7mail.com>
Mon, 30 Sep 2019 14:05:39 +0000 (14:05 +0000)
committerMario <mario.mario@y7mail.com>
Mon, 30 Sep 2019 14:05:39 +0000 (14:05 +0000)
commit55f166a94432b80e71f6f76702a1b15fde60c474
tree2ef070ede5ab6cbb34926702b4df79a28bfa1c8a
parent242da345d0d786969b7ca3d478e89fa1662ab458
parentb31580d64eee1c3ee3fd2abf53495aca22d8a754
Merge branch 'Mario/weaponorder' into 'master'

Merge branch Mario/weaponorder (XS merge request)

Closes #1929

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