]> 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: ccc4cc7 3b0a061)
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)
Merge branch Mario/duel (S merge request)

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


Trivial merge