]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ebb9076 f08c418)
Merge branch 'master' into Mario/fullbright_skins
authorMario <mario@smbclan.net>
Mon, 13 Jun 2016 09:22:03 +0000 (19:22 +1000)
committerMario <mario@smbclan.net>
Mon, 13 Jun 2016 09:22:03 +0000 (19:22 +1000)

Trivial merge