]> 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: b4cde52 aa18a57)
Merge branch 'master' into Mario/killsound
authorMario <mario@smbclan.net>
Sun, 25 Dec 2016 11:06:28 +0000 (21:06 +1000)
committerMario <mario@smbclan.net>
Sun, 25 Dec 2016 11:06:28 +0000 (21:06 +1000)

Trivial merge