From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 18 Mar 2014 16:39:29 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-vnc-2' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=059b3527f0229f4d60fd77a317503d42abd5e50f;p=qemu.git

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

vnc: fix vmware VGA incompatiblities

# gpg: Signature made Tue 18 Mar 2014 07:23:10 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-2:
  ui/vnc: fix vmware VGA incompatiblities

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

059b3527f0229f4d60fd77a317503d42abd5e50f