From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 16 Sep 2014 17:29:40 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-sdl-20140916-1' into staging
X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~592
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8af47027eb51d2d2afd15cff3ab7236a0211b8a0;p=sdk%2Femulator%2Fqemu.git

Merge remote-tracking branch 'remotes/kraxel/tags/pull-sdl-20140916-1' into staging

Two minor sdl2 fixes.

# gpg: Signature made Tue 16 Sep 2014 07:20:37 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-sdl-20140916-1:
  sdl2: keymap fixups
  sdl2: drop sdl_zoom.h

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

8af47027eb51d2d2afd15cff3ab7236a0211b8a0