diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-07-17 16:31:30 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-07-17 16:31:31 +0100 |
| commit | 3408d5aee0c078074ba547ca5025d350cbaf64b0 (patch) | |
| tree | bfbde7dd3bdb3ce3038639b799044b10ab356a0f /pc-bios | |
| parent | 63dba7e6b18aa85392800f0cb7c897e3a05b097b (diff) | |
| parent | feb47cf2fac5a0b8fe8509b18edf077e065dc97f (diff) | |
| download | qemu-3408d5aee0c078074ba547ca5025d350cbaf64b0.tar.gz | |
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20170717-pull-request' into staging
ui: vnc and keymap updates for 2.10
# gpg: Signature made Mon 17 Jul 2017 10:38:11 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-20170717-pull-request:
keymaps: fr-ca: add missing keys
hmp: Update info vnc
vnc: Set default kbd delay to 10ms
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'pc-bios')
| -rw-r--r-- | pc-bios/keymaps/fr-ca | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pc-bios/keymaps/fr-ca b/pc-bios/keymaps/fr-ca index b645208e42..030f56a78e 100644 --- a/pc-bios/keymaps/fr-ca +++ b/pc-bios/keymaps/fr-ca @@ -48,3 +48,5 @@ parenleft 0xa shift parenright 0xb shift underscore 0xc shift plus 0xd shift +minus 0xc +equal 0xd |