From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 21 Nov 2019 12:46:07 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/fixes-20191121-pull-request' into... 
X-Git-Tag: qemu-xen-4.14.0~264
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=996970236c00f244ed9518238fef480725a40ff2;p=qemu-xen.git

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>
---

996970236c00f244ed9518238fef480725a40ff2