summaryrefslogtreecommitdiffstats
path: root/hw/char/mcf_uart.c
diff options
context:
space:
mode:
authorPeter Maydell2017-07-17 17:31:30 +0200
committerPeter Maydell2017-07-17 17:31:31 +0200
commit3408d5aee0c078074ba547ca5025d350cbaf64b0 (patch)
treebfbde7dd3bdb3ce3038639b799044b10ab356a0f /hw/char/mcf_uart.c
parentMerge remote-tracking branch 'remotes/kraxel/tags/audio-20170717-pull-request... (diff)
parentkeymaps: fr-ca: add missing keys (diff)
downloadqemu-3408d5aee0c078074ba547ca5025d350cbaf64b0.tar.gz
qemu-3408d5aee0c078074ba547ca5025d350cbaf64b0.tar.xz
qemu-3408d5aee0c078074ba547ca5025d350cbaf64b0.zip
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 'hw/char/mcf_uart.c')
0 files changed, 0 insertions, 0 deletions