diff options
| author | Peter Maydell | 2019-11-21 13:46:07 +0100 |
|---|---|---|
| committer | Peter Maydell | 2019-11-21 13:46:07 +0100 |
| commit | 996970236c00f244ed9518238fef480725a40ff2 (patch) | |
| tree | 43d1015444a71caa6b2efc4c77de4fa43a438cb9 /linux-user | |
| parent | Merge remote-tracking branch 'remotes/stsquad/tags/pull-rc3-testing-and-tcg-2... (diff) | |
| parent | ui/gtk: fix gettext message's charset. (diff) | |
| download | qemu-996970236c00f244ed9518238fef480725a40ff2.tar.gz qemu-996970236c00f244ed9518238fef480725a40ff2.tar.xz qemu-996970236c00f244ed9518238fef480725a40ff2.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/fixes-20191121-pull-request' into staging
two audio fixes and one gtk message fix.
# gpg: Signature made Thu 21 Nov 2019 10:04:32 GMT
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/fixes-20191121-pull-request:
ui/gtk: fix gettext message's charset.
display: xlnx_dp: Provide sufficient bytes for silent audio channel
audio: fix audio recording
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user')
0 files changed, 0 insertions, 0 deletions