]> git.xonotic.org Git - xonotic/mediasource.git/commitdiff
projects / xonotic / mediasource.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 36b7fc3 5e7e6f9)
Merge branch 'morphed/newrl'
authorMario <mario.mario@y7mail.com>
Tue, 21 Feb 2017 10:26:43 +0000 (20:26 +1000)
committerMario <mario.mario@y7mail.com>
Tue, 21 Feb 2017 10:26:43 +0000 (20:26 +1000)

Trivial merge