From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 20 Jun 2014 15:57:28 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-vnc-20140619-1' into staging
X-Git-Tag: qemu-xen-4.6.0-rc1~371
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=9d3c512021f7363f5877abd975070d08b02ba65c;p=qemu-upstream-4.6-testing.git

Merge remote-tracking branch 'remotes/kraxel/tags/pull-vnc-20140619-1' into staging

vnc: cleanups and fixes

# gpg: Signature made Thu 19 Jun 2014 12:02:09 BST 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-20140619-1:
  vnc: fix screen updates
  vnc: Drop superfluous conditionals around g_strdup()
  vnc: Drop superfluous conditionals around g_free()

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

9d3c512021f7363f5877abd975070d08b02ba65c