From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 14 Jun 2018 13:04:14 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180614-pull-request' into... 
X-Git-Tag: qemu-xen-4.12.0-rc1~166
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=409c241f887a38bb7a2ac12e34d3a8d73922a9a5;p=qemu-xen.git

Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180614-pull-request' into staging

ui: bugfixes for sdl and gtk

# gpg: Signature made Thu 14 Jun 2018 09:32:45 BST
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/ui-20180614-pull-request:
  sdl2: restore window dimensions by resize
  ui: darwin: gtk: Add missing input keymap

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

409c241f887a38bb7a2ac12e34d3a8d73922a9a5