]> git.proxmox.com Git - mirror_qemu.git/commitdiff
projects / mirror_qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b8b0ee0 7fe4a41)
Merge remote-tracking branch 'remotes/kraxel/tags/pull-vnc-20151126-1' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 26 Nov 2015 10:58:10 +0000 (10:58 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 26 Nov 2015 10:58:10 +0000 (10:58 +0000)
vnc: fix segfault

# gpg: Signature made Thu 26 Nov 2015 07:37:43 GMT 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-20151126-1:
  vnc: fix segfault

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

Trivial merge
QEMU mirror