]> de.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: 2ff5923 4c3cf7e)
Merge remote-tracking branch 'origin/master' into sev/luma
authorMario <zacjardine@y7mail.com>
Mon, 19 Jan 2015 08:01:29 +0000 (19:01 +1100)
committerMario <zacjardine@y7mail.com>
Mon, 19 Jan 2015 08:01:29 +0000 (19:01 +1100)

Trivial merge