From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 25 Aug 2020 09:54:50 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/fixes-20200825-pull-request' into... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7774e403f2ac58b3e87bfe8d2f77676501ba893e;p=qemu.git

Merge remote-tracking branch 'remotes/kraxel/tags/fixes-20200825-pull-request' into staging

meson: keymap fixes

# gpg: Signature made Tue 25 Aug 2020 07:19:15 BST
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/fixes-20200825-pull-request:
  meson: avoid compiling qemu-keymap by default
  meson: move xkbcommon to meson
  meson: drop keymaps symlink

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

7774e403f2ac58b3e87bfe8d2f77676501ba893e