]> git.xonotic.org Git - xonotic/mediasource.git/commitdiff
projects / xonotic / mediasource.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cf2fdd1 a3d36f4)
Merge branch 'sev/luma_hud_vehicles' into 'master'
authorMario <zacjardine@y7mail.com>
Mon, 10 Aug 2015 19:10:59 +0000 (19:10 +0000)
committerMario <zacjardine@y7mail.com>
Mon, 10 Aug 2015 19:10:59 +0000 (19:10 +0000)
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


Trivial merge