From: Mario <zacjardine@y7mail.com>
Date: Sun, 21 Feb 2016 07:01:59 +0000 (+0000)
Subject: Merge branch 'morphed/hagar' into 'master'
X-Git-Tag: xonotic-v0.8.2~11
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7e688edd740e9c283dff73d6ceed15ffaf8ad5cc;p=xonotic%2Fmediasource.git

Merge branch 'morphed/hagar' into 'master'

Merge branch morphed/hagar (M merge request)

Media source for Morphed's hagar model.

See merge request !8
---

7e688edd740e9c283dff73d6ceed15ffaf8ad5cc