From: Mario <zacjardine@y7mail.com>
Date: Mon, 1 Oct 2018 04:04:09 +0000 (+0000)
Subject: Merge branch 'sev/luma_ok' into 'master'
X-Git-Tag: xonotic-v0.8.5~10
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3a56e8310f560c8a7ddd53b5d6a4be189e1bf696;p=xonotic%2Fmediasource.git

Merge branch 'sev/luma_ok' into 'master'

Merge some older luma sourcefiles

See merge request xonotic/mediasource!14
---

3a56e8310f560c8a7ddd53b5d6a4be189e1bf696