summary refs log tree commit diff stats
path: root/util
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-07-20 16:40:01 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-07-20 16:40:01 +0100
commit25d0233c1ac6cd14a15fcc834f1de3b179037b1d (patch)
treefc56a0393d1626ae9258023a3d15ee6e90a4f931 /util
parent64f871e3c92ecd3c72a37b48bcf12812f0057734 (diff)
parentb02cf99b9d998b3ec23dae8a4a8210e222b4294b (diff)
downloadfocaccia-qemu-25d0233c1ac6cd14a15fcc834f1de3b179037b1d.tar.gz
focaccia-qemu-25d0233c1ac6cd14a15fcc834f1de3b179037b1d.zip
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20170720-pull-request' into staging
ui fixes (vnc docs, keymaps) for 2.10

# gpg: Signature made Thu 20 Jul 2017 08:54:25 BST
# gpg:                using RSA key 0x4CB6D8EED3E87138
# 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>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/ui-20170720-pull-request:
  keymaps: fr-ca: more fixups
  vnc: Clarify documentation of QMP command change

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'util')
0 files changed, 0 insertions, 0 deletions