Merge remote-tracking branch 'remotes/kraxel/tags/pull-sdl-3' into staging
commit1673e89e93e08cbfee7c9b552008e5b39469ad0e
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 2 Jun 2014 15:10:12 +0000 (2 16:10 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 2 Jun 2014 15:10:12 +0000 (2 16:10 +0100)
treeee271bf37bcbff51f8b9436ba4820bc08afb653f
parent36f5db59cff03fd289541da104249f00356a19a7
parentf2335791fd0ceb2f9e3cc99b57bfd9c63d98baf0
Merge remote-tracking branch 'remotes/kraxel/tags/pull-sdl-3' into staging

sdl2: add support for text consoles

# gpg: Signature made Mon 02 Jun 2014 15:35:20 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-3:
  sdl2: textinput + terminal
  sdl2: make Ctrl-Alt-<nr> hotkeys show and hide windows
  console: add kbd_put_string_console
  console: add kbd_put_qcode_console

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