]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0096c40 33fd23e)
Merge branch 'Mario/killsound' into 'master'
authorMario <zacjardine@y7mail.com>
Sun, 12 Mar 2017 16:54:50 +0000 (16:54 +0000)
committerMario <zacjardine@y7mail.com>
Sun, 12 Mar 2017 16:54:50 +0000 (16:54 +0000)
Merge branch Mario/killsound (XS merge request)

See merge request !397


Trivial merge