]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 242da34 b31580d)
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)
Merge branch Mario/weaponorder (XS merge request)

Closes #1929

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


Trivial merge