Merge branch 'sev/luma_update' into 'master'
authorMario <zacjardine@y7mail.com>
Sat, 30 Apr 2016 11:15:07 +0000 (11:15 +0000)
committerMario <zacjardine@y7mail.com>
Sat, 30 Apr 2016 11:15:07 +0000 (11:15 +0000)
commit86409039b02762ee78184e90bc7feebaf728119e
treec85acdcb88ff7cd9620bdd5658be4e80f4e8dd36
parent9bc7534870d66d65c3a7a7388c8ba5dbc53fde23
parentec2ddb34e16aa2b9a28b035dd90d4f2c972cc4fe
Merge branch 'sev/luma_update' into 'master'

Luma Source Update

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

See merge request !10