Merge branch 'sev/luma_ok' into 'master' master
authorMario <zacjardine@y7mail.com>
Mon, 1 Oct 2018 04:04:09 +0000 (04:04 +0000)
committerMario <zacjardine@y7mail.com>
Mon, 1 Oct 2018 04:04:09 +0000 (04:04 +0000)
commit3a56e8310f560c8a7ddd53b5d6a4be189e1bf696
tree5d8e80168ef03cee5f09050c27121c3664e9865a
parent604dd39eed8039d764ecd98f2fd138f5b22245bd
parent2cf7cdd78bd274b1eafe6446050623c4399c769f
Merge branch 'sev/luma_ok' into 'master'

Merge some older luma sourcefiles

See merge request xonotic/mediasource!14