From: Peter Maydell <peter.maydell@linaro.org>
Date: Thu, 11 Dec 2014 11:19:57 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-vnc-20141210-1' into staging
X-Git-Tag: v2.3.0-rc0~144
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67a5eebca1ac15442f06096977381a70a403bc5b;p=thirdparty%2Fqemu.git

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

vnc-enc-tight fix, keymaps code style.

# gpg: Signature made Wed 10 Dec 2014 09:24:33 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-20141210-1:
  keymaps: correct keymaps.c following Qemu coding style
  vnc-enc-tight: fix Arguments in wrong order

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

67a5eebca1ac15442f06096977381a70a403bc5b