| commit | 8af47027eb51d2d2afd15cff3ab7236a0211b8a0 | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Tue, 16 Sep 2014 17:29:40 +0000 (16 18:29 +0100) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Tue, 16 Sep 2014 17:29:40 +0000 (16 18:29 +0100) | ||
| tree | a55efc42897cf5692e7f8cbf3b138c4e892f07dd | treesnapshot (tar.gz zip) |
| parent | 5f3fb5a2e259322d50d289f180ac7e452ad1b6f8 | commitdiff |
| parent | 0d61f7dcc6c04e7e825417c74e50362d990330bf | commitdiff |
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>
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>