From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 21 Nov 2014 13:22:18 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-gtk-20141121-1' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a00c1173385741007f71ce505d092f4cc174f449;p=qemu.git

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

gtk: two bugfixes for 2.2.

# gpg: Signature made Fri 21 Nov 2014 07:38:45 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-20141121-1:
  gtk: Don't crash if -nodefaults
  gtk: fix possible memory leak about local_err

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

a00c1173385741007f71ce505d092f4cc174f449