]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'remotes/kraxel/tags/pull-console-1' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Wed, 28 May 2014 11:36:25 +0000 (12:36 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Wed, 28 May 2014 11:36:25 +0000 (12:36 +0100)
console: multiwindow support for text terminal QemuConsoles
console: small fixes

# gpg: Signature made Mon 26 May 2014 09:17:27 BST using RSA key ID D3E87138
# gpg: Can't check signature: public key not found

* remotes/kraxel/tags/pull-console-1:
  console: add kbd_put_keysym_console
  console: rework text terminal cursor logic
  console: update text terminal surface unconditionally
  console: nicer initial screen
  console: Abort on property access errors

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

Trivial merge