]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b0c9248 832d649)
Merge branch 'martint-t/weap-order' into 'master'
authorMario <zacjardine@y7mail.com>
Sat, 15 Jul 2017 01:00:57 +0000 (01:00 +0000)
committerMario <zacjardine@y7mail.com>
Sat, 15 Jul 2017 01:00:57 +0000 (01:00 +0000)
Fix weapon order

See merge request !454


Trivial merge