From: Mario <zacjardine@y7mail.com>
Date: Mon, 10 Aug 2015 19:10:59 +0000 (+0000)
Subject: Merge branch 'sev/luma_hud_vehicles' into 'master'
X-Git-Tag: xonotic-v0.8.1~4
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fmediasource.git;a=commitdiff_plain;h=3a39b18c3c6cb4a155f4df8d5646446094f3365e

Merge branch 'sev/luma_hud_vehicles' into 'master'

Luma sourcefiles

This branch includes all recent updates to the Luma sourcefiles (don't mind the branch name).
Now that all my recent Luma branches have been merged into master, I recommend merging the sourcefiles as well.

See merge request !5
---

3a39b18c3c6cb4a155f4df8d5646446094f3365e