]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote-tracking branch 'remotes/spice/tags/pull-spice-20140613-1' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 13 Jun 2014 14:15:31 +0000 (15:15 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 13 Jun 2014 14:15:31 +0000 (15:15 +0100)
spice: add mouse cursor support
qxl-render: add sanity check

# gpg: Signature made Fri 13 Jun 2014 12:22:45 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/spice/tags/pull-spice-20140613-1:
  qxl-render: add sanity check
  spice: add mouse cursor support

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

Trivial merge