projects / sdk / emulator / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2dda43b 2f487a3)
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)
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>

Trivial merge
Domain: SDK / Emulator;