From: Peter Maydell <peter.maydell@linaro.org>
Date: Wed, 22 Oct 2014 13:01:42 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-gtk-20141015-1' into staging
X-Git-Tag: xen-15-06-02~360
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=4b4ce6c2b85cadefdd444d9791a96ffdb0377b24;p=people%2Fsstabellini%2Fqemu-dm.git%2F.git

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

gtk: fix memory leak, add pause key support.

# gpg: Signature made Wed 15 Oct 2014 11:30:39 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-20141015-1:
  gtk: add support for the Pause key
  gtk.c: Fix memory leak in gd_set_keycode_type()

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

4b4ce6c2b85cadefdd444d9791a96ffdb0377b24