]> git.xonotic.org Git - xonotic/mediasource.git/commitdiff
projects / xonotic / mediasource.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 234b4db 2dff6fb)
Merge branch 'Melanosuchus/minigames'
authorMario <mario.mario@y7mail.com>
Sat, 21 Nov 2015 08:18:30 +0000 (18:18 +1000)
committerMario <mario.mario@y7mail.com>
Sat, 21 Nov 2015 08:18:30 +0000 (18:18 +1000)

Trivial merge