Merge remote-tracking branch 'remotes/kraxel/tags/pull-vnc-2' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 18 Mar 2014 16:39:29 +0000 (16:39 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 18 Mar 2014 16:39:29 +0000 (16:39 +0000)
commit059b3527f0229f4d60fd77a317503d42abd5e50f
tree0211fd3632bbe6f86569001f9e7e50cc0e8c5794
parent2dda43bacc79f8e283702614745cd700c637de64
parent2f487a3d40faff1772e14da6b921900915501f9a
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>