Merge branch 'sev/luma' into 'master'
authorMario <zacjardine@y7mail.com>
Wed, 4 Feb 2015 02:56:27 +0000 (02:56 +0000)
committerMario <zacjardine@y7mail.com>
Wed, 4 Feb 2015 02:56:27 +0000 (02:56 +0000)
commit4392e85072ef0b5e87436d607d58fc7ab6af55cb
tree93c07083b4eaec7dc2d35dff8166f3404e82ae86
parentd4713d5fb349f31d509d8bb54a3129f0786e7ca7
parentabc94a4a536553880a2b4fc0ee8c6e565e2e1312
Merge branch 'sev/luma' into 'master'

Luma sourcefiles

Title says it all. Reference: xonotic/xonotic-data.pk3dir!76

See merge request !2