From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 2 Jun 2014 15:10:12 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-sdl-3' into staging
X-Git-Tag: v2.1.0-rc0~92
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1673e89e93e08cbfee7c9b552008e5b39469ad0e;p=thirdparty%2Fqemu.git

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>
---

1673e89e93e08cbfee7c9b552008e5b39469ad0e