]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9fb7d3c 5130a01)
Merge branch 'Mario/tenshihan_newsounds' into 'master'
authorMario <mario.mario@y7mail.com>
Fri, 30 Aug 2019 08:32:49 +0000 (08:32 +0000)
committerMario <mario.mario@y7mail.com>
Fri, 30 Aug 2019 08:32:49 +0000 (08:32 +0000)
Merge branch Mario/tenshihan_newsounds (S merge request)

See merge request xonotic/xonotic-data.pk3dir!697


Trivial merge