]> git.xonotic.org Git - xonotic/mediasource.git/commitdiff
projects / xonotic / mediasource.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8cc2944 8bcc8f8)
Merge branch 'morphed/hagar' into 'master'
authorMario <zacjardine@y7mail.com>
Sun, 21 Feb 2016 07:01:59 +0000 (07:01 +0000)
committerMario <zacjardine@y7mail.com>
Sun, 21 Feb 2016 07:01:59 +0000 (07:01 +0000)
Merge branch morphed/hagar (M merge request)

Media source for Morphed's hagar model.

See merge request !8


Trivial merge