From: Peter Maydell Date: Thu, 30 Oct 2014 14:45:53 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-gtk-20141028-1' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3c1d9a15be679afd3fb9173a242827ff2d43af8f;p=qemu.git Merge remote-tracking branch 'remotes/kraxel/tags/pull-gtk-20141028-1' into staging gtk: fix two warnings with gtk 3.14+ # gpg: Signature made Tue 28 Oct 2014 10:25:52 GMT 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-20141028-1: gtk: avoid gd_widget_reparent with gtk 3.14+ gtk: drop gtk_widget_set_double_buffered call Signed-off-by: Peter Maydell --- 3c1d9a15be679afd3fb9173a242827ff2d43af8f