From: Peter Maydell Date: Tue, 31 Jan 2017 18:41:33 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20170131-2' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6fe791b5e3aca8a6de8a322e85e76d2f13338a7e;p=qemu.git Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20170131-2' into staging ui: bugfixes and small improvements all over the place. # gpg: Signature made Tue 31 Jan 2017 15:48:20 GMT # gpg: using RSA key 0x4CB6D8EED3E87138 # 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/pull-ui-20170131-2: console: fix console resize gtk: Hardcode LC_CTYPE as C.utf-8 vnc: fix overflow in vnc_update_stats spice: wakeup QXL worker to pick up mouse changes ui/gtk.c: add ctrl-alt-= support for zoom in acceleration ui: fix format specfier in vnc to avoid break in build. ui/gtk: Fix mouse wheel on 3.4.0 or later vnc: track LED state separately ui: add support for mice with extra/side buttons ps2: add support for mice with extra/side buttons qapi: add support for mice with extra/side buttons Signed-off-by: Peter Maydell --- 6fe791b5e3aca8a6de8a322e85e76d2f13338a7e