Merge branch 'Mario/duel' into 'master'
authorMario <zacjardine@y7mail.com>
Sun, 30 Sep 2018 12:30:31 +0000 (12:30 +0000)
committerMario <zacjardine@y7mail.com>
Sun, 30 Sep 2018 12:30:31 +0000 (12:30 +0000)
commit6106500d9562e3964f10a534b2721b35d764c995
tree1b85d5f3efc6534dc0dfd74af9cac7e08db74717
parentccc4cc78914bababed38e4902d4d8ce63c7ca6ce
parent3b0a06185f8581577825241de865998e409ed638
Merge branch 'Mario/duel' into 'master'

Merge branch Mario/duel (S merge request)

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