]> git.xonotic.org Git - xonotic/xonotic-music.pk3dir.git/commit
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)
commitae64501898e864a215380f855928e7c914b2af33
tree0a777a69864a96ad054d8128cfdaa1aa86132b7f
parent5037b990d82ec0198d90a839e04fe3913b19452c
parentc47983ae474aba0c3498e95592206c2be370701c
Merge branch 'Mirio/nanite' into 'master'

Add soundtrack contest winner Nanite

See merge request !2