diff options
author | 2014-06-10 12:06:17 +0100 | |
---|---|---|
committer | 2014-06-10 12:06:17 +0100 | |
commit | 3334e929ae2d01e47c3e64757ee7fcf975cede94 (patch) | |
tree | e7e04900a51003b0b1af23213cc24336ff08707b /ui/spice-display.c | |
parent | Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20140610' into staging (diff) | |
parent | console: fix -vga none -sdl crash (diff) | |
download | qemu-3334e929ae2d01e47c3e64757ee7fcf975cede94.tar.xz qemu-3334e929ae2d01e47c3e64757ee7fcf975cede94.zip |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-console-20140610-1' into staging
console: two little bugfixes.
# gpg: Signature made Tue 10 Jun 2014 12:01:07 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-console-20140610-1:
console: fix -vga none -sdl crash
console: kill MAX_CONSOLES, alloc consoles dynamically
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/spice-display.c')
0 files changed, 0 insertions, 0 deletions