From: Peter Maydell Date: Mon, 18 Jan 2016 16:00:47 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20160118-1' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=46188349ad7e23abef0e453d2b0406985f6552a1;p=qemu.git Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20160118-1' into staging ui: misc small gtk/spice/vnc patches. # gpg: Signature made Mon 18 Jan 2016 15:52:13 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-ui-20160118-1: vnc: fix tls-creds error message Fix corner-case when using VNC+SASL+SPICE vnc: clear vs->tlscreds after unparenting it gtk: implement set_echo Signed-off-by: Peter Maydell --- 46188349ad7e23abef0e453d2b0406985f6552a1