From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 11 Jun 2015 10:18:11 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-gtk-20150611-1' into staging
X-Git-Tag: v2.4.0-rc0~85
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=39e16a5b708358202e8d2252e3d84863666dc9e5;p=users%2Fdwmw2%2Fqemu.git

Merge remote-tracking branch 'remotes/kraxel/tags/pull-gtk-20150611-1' into staging

gtk: don't exit early in case gtk init fails

# gpg: Signature made Thu Jun 11 10:38:29 2015 BST 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-20150611-1:
  gtk: don't exit early in case gtk init fails

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

39e16a5b708358202e8d2252e3d84863666dc9e5