diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-07-20 16:40:01 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-07-20 16:40:01 +0100 |
| commit | 25d0233c1ac6cd14a15fcc834f1de3b179037b1d (patch) | |
| tree | fc56a0393d1626ae9258023a3d15ee6e90a4f931 | |
| parent | 64f871e3c92ecd3c72a37b48bcf12812f0057734 (diff) | |
| parent | b02cf99b9d998b3ec23dae8a4a8210e222b4294b (diff) | |
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>
| -rw-r--r-- | pc-bios/keymaps/fr-ca | 10 | ||||
| -rw-r--r-- | qapi-schema.json | 3 |
2 files changed, 10 insertions, 3 deletions
diff --git a/pc-bios/keymaps/fr-ca b/pc-bios/keymaps/fr-ca index 030f56a78e..13a0306762 100644 --- a/pc-bios/keymaps/fr-ca +++ b/pc-bios/keymaps/fr-ca @@ -10,6 +10,7 @@ sterling 0x4 altgr cent 0x5 altgr currency 0x6 altgr notsign 0x7 altgr +numbersign 0x29 bar 0x29 shift twosuperior 0x9 altgr threesuperior 0xa altgr @@ -38,6 +39,10 @@ dead_cedilla 0x1b dead_diaeresis 0x1b shift exclam 0x2 shift quotedbl 0x3 shift +comma 0x33 +apostrophe 0x33 shift +period 0x34 +period 0x34 shift slash 0x4 shift dollar 0x5 shift percent 0x6 shift @@ -47,6 +52,9 @@ asterisk 0x9 shift parenleft 0xa shift parenright 0xb shift underscore 0xc shift -plus 0xd shift minus 0xc +underscore 0xc shift equal 0xd +plus 0xd shift +semicolon 0x27 +colon 0x27 shift diff --git a/qapi-schema.json b/qapi-schema.json index 8b015bee2e..58d3a0209f 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -3011,8 +3011,7 @@ # @arg: If @device is a block device, then this is an optional format to open # the device with. # If @device is 'vnc' and @target is 'password', this is the new VNC -# password to set. If this argument is an empty string, then no future -# logins will be allowed. +# password to set. See change-vnc-password for additional notes. # # Returns: Nothing on success. # If @device is not a valid block device, DeviceNotFound |