diff options
| author | Peter Maydell | 2015-03-10 20:28:09 +0100 |
|---|---|---|
| committer | Peter Maydell | 2015-03-10 20:28:09 +0100 |
| commit | 21025c29f5cc716cea8a8865d96fa259acbd4d47 (patch) | |
| tree | 111dcf47496b63349951cff005d464a737bde1f7 /hw/sparc/sun4m.c | |
| parent | Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (diff) | |
| parent | Fix crash when connecting to VNC through websocket (diff) | |
| download | qemu-21025c29f5cc716cea8a8865d96fa259acbd4d47.tar.gz qemu-21025c29f5cc716cea8a8865d96fa259acbd4d47.tar.xz qemu-21025c29f5cc716cea8a8865d96fa259acbd4d47.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-vnc-20150310-1' into staging
vnc bugfixes.
# gpg: Signature made Tue Mar 10 10:37:51 2015 GMT 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-vnc-20150310-1:
Fix crash when connecting to VNC through websocket
vnc: -readconfig fix
vnc: set id at parse time not init time
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/sparc/sun4m.c')
0 files changed, 0 insertions, 0 deletions