From: Peter Maydell Date: Thu, 10 Jan 2019 16:29:02 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/kraxel/tags/ui-20190110-pull-request' into... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=823dcd58ea58c7e983cc301ab2c1c55c4c8f4c18;p=qemu.git Merge remote-tracking branch 'remotes/kraxel/tags/ui-20190110-pull-request' into staging ui: bugfixes, drop keymap include support, drop dead code. # gpg: Signature made Thu 10 Jan 2019 08:47:10 GMT # 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-20190110-pull-request: spice: Remove unused include keymaps: drop support for include files keymaps: remove common include keymaps: drop nl-be map keymaps: remove modifiers include ui/console: Remove qemu_create_display_surface_guestmem() configure: bump spice-server required version to 0.12.5 egl-headless: add egl_create_context Signed-off-by: Peter Maydell --- 823dcd58ea58c7e983cc301ab2c1c55c4c8f4c18