projects / sdk / emulator / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5f3fb5a 0d61f7d)
Merge remote-tracking branch 'remotes/kraxel/tags/pull-sdl-20140916-1' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 16 Sep 2014 17:29:40 +0000 (18:29 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 16 Sep 2014 17:29:40 +0000 (18:29 +0100)
commit8af47027eb51d2d2afd15cff3ab7236a0211b8a0
treea55efc42897cf5692e7f8cbf3b138c4e892f07ddtree | snapshot
parent5f3fb5a2e259322d50d289f180ac7e452ad1b6f8commit | diff
parent0d61f7dcc6c04e7e825417c74e50362d990330bfcommit | diff
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>
Domain: SDK / Emulator;