]> 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: 93e98e9 f29ce8d)
Merge branch 'Mario/q3_speaker_fix' into 'master'
authorMario <mario.mario@y7mail.com>
Fri, 17 Jul 2020 16:35:04 +0000 (16:35 +0000)
committerMario <mario.mario@y7mail.com>
Fri, 17 Jul 2020 16:35:04 +0000 (16:35 +0000)
Merge branch Mario/q3_speaker_fix (XXS merge request)

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


Trivial merge