From: Peter Maydell Date: Tue, 10 Apr 2018 13:04:27 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180410-pull-request' into... X-Git-Tag: v2.12.0-rc3~9 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=df6378eb0e6cfd58a22a1c3ff8fa4a9039f1eaa8;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180410-pull-request' into staging configure: don't warn on old sdl/gtk versions if disabled. keymap + gtk fixes. # gpg: Signature made Tue 10 Apr 2018 10:23:37 BST # gpg: using RSA key 4CB6D8EED3E87138 # gpg: Good signature from "Gerd Hoffmann (work) " # gpg: aka "Gerd Hoffmann " # gpg: aka "Gerd Hoffmann (private) " # Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138 * remotes/kraxel/tags/ui-20180410-pull-request: configure: don't warn SDL abi if disabled configure: don't warn GTK if disabled gtk: drop pointless code from gd_window_close ui: fix keymap detection under Xwayland Signed-off-by: Peter Maydell --- df6378eb0e6cfd58a22a1c3ff8fa4a9039f1eaa8