]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: d1a9779 96c600d)
Merge branch 'morphed/hagar' into 'master'
authorMario <zacjardine@y7mail.com>
Sun, 21 Feb 2016 07:00:43 +0000 (07:00 +0000)
committerMario <zacjardine@y7mail.com>
Sun, 21 Feb 2016 07:00:43 +0000 (07:00 +0000)
Merge branch morphed/hagar (M merge request)

New hagar model by Morphed.

See merge request !284


Trivial merge