]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/kraxel/tags/pull-gtk-20141028-1' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 30 Oct 2014 14:45:53 +0000 (14:45 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 30 Oct 2014 14:45:53 +0000 (14:45 +0000)
commit3c1d9a15be679afd3fb9173a242827ff2d43af8f
tree10853247c3a1ff63063df2eb53eb7fc97bf9b995
parent08118672d06c8d2fb937cab5c97b2dfdc8786520
parent316cb068bdaf456040934f7368e09be7be4d942e
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) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* 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 <peter.maydell@linaro.org>