From: Peter Maydell Date: Tue, 10 Jan 2017 14:52:34 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20170110-1' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b44486dfb9447c88e4b216e730adcc780190852c;p=qemu.git Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20170110-1' into staging gtk,vnc: misc bugfixes. kbd: add jp keys, fix ps2 regressions. sdl: export window id for baum, remove sdl hooks from baum. egl: egl-helpers.c license change. # gpg: Signature made Tue 10 Jan 2017 07:16:05 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-20170110-1: ps2: Fix lost scancodes by recent changes curses: Fix compiler warnings (Mingw-w64 redefinition of macro KEY_EVENT) ui/vnc: Fix problem with sending too many bytes as server name gtk: avoid oob array access egl-helpers: Change file licensing to LGPLv2 sdl2: set window ID console: move window ID code from baum to sdl console: add API to get underlying gui window ID ui: use evdev keymap when running under wayland ui/gtk: fix crash at startup when no console is available Signed-off-by: Peter Maydell --- b44486dfb9447c88e4b216e730adcc780190852c