]> git.xonotic.org Git - xonotic/mediasource.git/commitdiff
projects / xonotic / mediasource.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0d38296 5d3c32b)
Merge remote-tracking branch 'origin/master'
authorMario <mario@smbclan.net>
Wed, 22 Aug 2018 08:09:10 +0000 (18:09 +1000)
committerMario <mario@smbclan.net>
Wed, 22 Aug 2018 08:09:10 +0000 (18:09 +1000)

Trivial merge