]> git.xonotic.org Git - xonotic/mediasource.git/commitdiff
projects / xonotic / mediasource.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7e688ed c8069f9)
Merge branch 'mirceakitsune/shotgun_cannon' into 'master'
authorMario <zacjardine@y7mail.com>
Fri, 26 Feb 2016 17:35:14 +0000 (17:35 +0000)
committerMario <zacjardine@y7mail.com>
Fri, 26 Feb 2016 17:35:14 +0000 (17:35 +0000)
Merge branch mirceakitsune/shotgun_cannon (M merge request)

The original model was merged with a colour swap as the Arc weapon model.

See merge request !9


Trivial merge