From: Peter Maydell Date: Thu, 1 May 2014 13:17:33 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-gtk-6' into staging X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=051b9980b99dbfba22ea5f79bd3708d513ae121d;p=osstest%2Fqemu.git Merge remote-tracking branch 'remotes/kraxel/tags/pull-gtk-6' into staging gtk: collection of fixes and cleanups by Cole Robinson # gpg: Signature made Tue 29 Apr 2014 10:44:44 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-6: gtk: Fix accelerators being triggered twice with gtk3 gtk: Fix -serial vc gtk: Use ctrl+alt+q for quit accelerator gtk: Remove use of deprecated stock items gtk: Don't use deprecated vte_terminal_get_adjustment gtk: Don't use deprecated gtk_image_menu_item_new_with_mnemonic configure: Re-run make if gtkabi/sdlabi is changed configure: Document --with-gtkabi Signed-off-by: Peter Maydell --- 051b9980b99dbfba22ea5f79bd3708d513ae121d