]> 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: 8f62b60 8ab2ca8)
Merge branch 'Mario/morphed_explosivesmodel' into 'master'
authorMario <zacjardine@y7mail.com>
Mon, 25 Jun 2018 03:16:21 +0000 (03:16 +0000)
committerMario <zacjardine@y7mail.com>
Mon, 25 Jun 2018 03:16:21 +0000 (03:16 +0000)
Merge branch Mario/morphed_explosivesmodel (XS merge request)

Closes #2045

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


Trivial merge