From: Peter Maydell Date: Mon, 27 Apr 2015 18:06:08 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-gtk-20150427-1' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3f9d69ba12da6f2874631f6e426a7ef148ba4c82;p=qemu.git Merge remote-tracking branch 'remotes/kraxel/tags/pull-gtk-20150427-1' into staging gtk: support text consoles without vte, bugfixes. # gpg: Signature made Mon Apr 27 14:34:15 2015 BST using RSA key ID D3E87138 # gpg: Good signature from "Gerd Hoffmann (work) " # gpg: aka "Gerd Hoffmann " # gpg: aka "Gerd Hoffmann (private) " * remotes/kraxel/tags/pull-gtk-20150427-1: gtk: Avoid accel key leakage into guest on console switch gtk: Fix VTE focus grabbing console/gtk: add qemu_console_get_label gtk: bind to text terminal consoles too gtk: handle switch_surface(NULL) properly Signed-off-by: Peter Maydell --- 3f9d69ba12da6f2874631f6e426a7ef148ba4c82