mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ui fixes (vnc docs, keymaps) for 2.10

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJZcGGxAAoJEEy22O7T6HE4IAUQAMuFyfDYbNYiyTW3tj64T07b
 /Kxnry9VY7vVVxAbOBbRMBuUd/4alpH0cf0XPI4bizE4CSuwLAyA84Vk2Tv3oGLF
 0kwOpQjTm1guc4pP7G6lfOTV2p6Kpn1a5CLN0F4gyDxYMnZz7iY7XwEVXJMZTL/5
 kyqNm9igSrlRp36lkmU9k84tYNaJ0r2smlaCZiQ4Qtxb4sfayNqpvJlnrInkkq6F
 k3Q34Pp2NIp3m5Sn4T369UsS0fWuek2fvqRHa5pW/ohf3DFK62qtmf/s4wyRG9qy
 9CuQC1caYV4TtAqCpcxE7eZ6CFCxzbHgoGseBuCkxT6qLze+l4LFnPppAYZ3v3J6
 hmI2ZAOGGUkZOiAfeccm0urUH/I5eGCeak8pJ85cQuJb8MFkLlm7udwtwiCCP4y5
 IjcMhQZNL81JGox3c5CzTjuYSgQRZNeR/Htq6qo+zkq0PsmP7iLaWilxZu0stPKK
 0O9k00KQVw4V8z1Yrd/SwQhqgDhg5A16C2j91kIKNtGx4gf+dOgOM+o/wp5QLTYj
 7Ykm/EFNw2Fh+R/tagLpU152MD6h5Nq5dyNsVqdR05GIqvYsmyEcz3z04m0c6Jke
 h7sB58NiKfFgeYP75Dmfpc4q3XN6baeIg0auoRH91nqxNQX3gM6/SqNl1BqEWRTZ
 fHqup1t2hIEIR4IqTpOJ
 =hhU5
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2017-07-20 16:40:01 +01:00
commit 25d0233c1a
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pc-bios/keymaps/fr-ca
View File

@ -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

3
qapi-schema.json
View File

@ -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