From: Peter Maydell Date: Thu, 26 Nov 2015 10:58:10 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-vnc-20151126-1' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=fe4cf57da7a85fa65488448acdc22a65096e832a;p=qemu.git Merge remote-tracking branch 'remotes/kraxel/tags/pull-vnc-20151126-1' into staging vnc: fix segfault # gpg: Signature made Thu 26 Nov 2015 07:37:43 GMT using RSA key ID D3E87138 # gpg: Good signature from "Gerd Hoffmann (work) " # gpg: aka "Gerd Hoffmann " # gpg: aka "Gerd Hoffmann (private) " * remotes/kraxel/tags/pull-vnc-20151126-1: vnc: fix segfault Signed-off-by: Peter Maydell --- fe4cf57da7a85fa65488448acdc22a65096e832a