From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 27 Jul 2017 14:27:06 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/ui-20170727-pull-request' into... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e01151de165070c25a1b202e9e2392950bd7c8da;p=qemu.git

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

ui: keymap fixes for 2.10

# gpg: Signature made Thu 27 Jul 2017 15:00:06 BST
# gpg:                using RSA key 0x4CB6D8EED3E87138
# 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-20170727-pull-request:
  ps2: fix sending of PAUSE/BREAK scancodes
  ui: drop altgr and altgr_r QKeyCodes
  ps2: enable multimedia keys
  ui: add multimedia keys
  ui: update keymaps
  ui: move qemu_input_linux_to_qcode()
  ui: add next and prior keysyms

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

e01151de165070c25a1b202e9e2392950bd7c8da