From: Peter Maydell Date: Fri, 18 Dec 2015 16:04:31 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/berrange/tags/pull-io-channel-vnc-2015-12-18... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b06f904f2e37eb2a9ab0a8344faec7e5d609508a;p=qemu.git Merge remote-tracking branch 'remotes/berrange/tags/pull-io-channel-vnc-2015-12-18-1' into staging Merge VNC conversion to I/O channels # gpg: Signature made Fri 18 Dec 2015 15:44:30 GMT using RSA key ID 15104FDF # gpg: Good signature from "Daniel P. Berrange " # gpg: aka "Daniel P. Berrange " * remotes/berrange/tags/pull-io-channel-vnc-2015-12-18-1: ui: convert VNC server to use QIOChannelWebsock ui: convert VNC server to use QIOChannelTLS ui: convert VNC server to use QIOChannelSocket Signed-off-by: Peter Maydell --- b06f904f2e37eb2a9ab0a8344faec7e5d609508a