diff options
| author | Peter Maydell | 2017-10-03 14:50:10 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-10-03 14:50:10 +0200 |
| commit | 2c94822167672597d870dbeed9ffc95ea2bf93d3 (patch) | |
| tree | 64360f9d04fe2c6ddec5fffb6272d6f811490d45 /include/hw/ide.h | |
| parent | Merge remote-tracking branch 'remotes/famz/tags/docker-testing-pull-request' ... (diff) | |
| parent | ui: add tracing of VNC authentication process (diff) | |
| download | qemu-2c94822167672597d870dbeed9ffc95ea2bf93d3.tar.gz qemu-2c94822167672597d870dbeed9ffc95ea2bf93d3.tar.xz qemu-2c94822167672597d870dbeed9ffc95ea2bf93d3.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20170929-pull-request' into staging
ui and input patches.
# gpg: Signature made Fri 29 Sep 2017 11:21:45 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-20170929-pull-request:
ui: add tracing of VNC authentication process
ui: add tracing of VNC operations related to QIOChannel
virtio-input: send rel-wheel events for wheel buttons
egl: misc framebuffer helper improvements.
console: purge curses bits from console.h
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw/ide.h')
0 files changed, 0 insertions, 0 deletions