From: Peter Maydell Date: Mon, 9 Apr 2018 11:02:19 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180409-pull-request' into... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b2c1742da0c79dd52080260edacaf0a7b6d309e5;p=qemu.git Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180409-pull-request' into staging sdl2: fix kbd regression (compared to sdl1), cleanups. # gpg: Signature made Mon 09 Apr 2018 10:40:21 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-20180409-pull-request: sdl2: drop dead code sdl2: drop QEMU_KEY_BACKSPACE special case sdl2: enable ctrl modifier keys for text consoles sdl2: track kbd modifier state unconditionally ui: add ctrl modifier support to kbd_put_qcode_console() sdl2: Remove unused epoxy include Signed-off-by: Peter Maydell --- b2c1742da0c79dd52080260edacaf0a7b6d309e5