]> rtime.felk.cvut.cz Git - lisovros/qemu_apohw.git/commit
Merge remote-tracking branch 'remotes/kraxel/tags/pull-vnc-20140619-1' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 20 Jun 2014 15:57:28 +0000 (16:57 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 20 Jun 2014 15:57:28 +0000 (16:57 +0100)
commit9d3c512021f7363f5877abd975070d08b02ba65c
treee9229e1519add00d2e066dd4b926100d23017132
parente8e23b7dcf1466a11061bcb1da454489187bbb97
parenteb214ff8ef6cceec348f3ad1643b39443fe07910
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>