]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bb450e8 b7da27d)
Merge branch 'sev/luma_supplement' into 'master'
authorMario <zacjardine@y7mail.com>
Fri, 30 Jan 2015 10:26:16 +0000 (10:26 +0000)
committerMario <zacjardine@y7mail.com>
Fri, 30 Jan 2015 10:26:16 +0000 (10:26 +0000)
Luma Supplement

This branch adds Luma (!76) variants of the chatbubble and the teambubble.
The current images will be replaced, hence the separate branch.

See merge request !87


Trivial merge