]> git.xonotic.org Git - xonotic/xonotic-music.pk3dir.git/commitdiff
projects / xonotic / xonotic-music.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5037b99 c47983a)
Merge branch 'Mirio/nanite' into 'master'
authorMirio <opivy@hotmail.de>
Wed, 26 Oct 2016 00:40:36 +0000 (00:40 +0000)
committerMirio <opivy@hotmail.de>
Wed, 26 Oct 2016 00:40:36 +0000 (00:40 +0000)
Add soundtrack contest winner Nanite

See merge request !2


Trivial merge