From: Mario <zacjardine@y7mail.com>
Date: Sat, 30 Apr 2016 11:15:07 +0000 (+0000)
Subject: Merge branch 'sev/luma_update' into 'master'
X-Git-Tag: xonotic-v0.8.2~9
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=86409039b02762ee78184e90bc7feebaf728119e;p=xonotic%2Fmediasource.git

Merge branch 'sev/luma_update' into 'master'

Luma Source Update

The sourcefiles for merged branch xonotic/xonotic-data.pk3dir!304

See merge request !10
---

86409039b02762ee78184e90bc7feebaf728119e