]> Git Repo - qemu.git/commitdiff
Merge remote-tracking branch 'remotes/berrange/tags/pull-io-channel-vnc-2015-12-18...
authorPeter Maydell <[email protected]>
Fri, 18 Dec 2015 16:04:31 +0000 (16:04 +0000)
committerPeter Maydell <[email protected]>
Fri, 18 Dec 2015 16:04:31 +0000 (16:04 +0000)
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 <[email protected]>"
# gpg:                 aka "Daniel P. Berrange <[email protected]>"

* 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 <[email protected]>

Trivial merge
This page took 0.024496 seconds and 4 git commands to generate.