]> git.xonotic.org Git - xonotic/mediasource.git/commitdiff
projects / xonotic / mediasource.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f002dae 556e9de)
Merge branch 'Mario/morphed_explosivesmodel'
authorMario <mario@smbclan.net>
Wed, 22 Aug 2018 08:06:45 +0000 (18:06 +1000)
committerMario <mario@smbclan.net>
Wed, 22 Aug 2018 08:06:45 +0000 (18:06 +1000)

Trivial merge