summary refs log tree commit diff stats
path: root/linux-user/qemu.h
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2020-05-15 11:18:13 +0100
committerPeter Maydell <peter.maydell@linaro.org>2020-05-15 11:18:13 +0100
commit2478b8ecd45f81a21b9aa319ce7147a790a2144f (patch)
treeeab6d7b2335e61e28855bf408740fa3aaaa73862 /linux-user/qemu.h
parent0db949f1810f4d497762d57d8db6f219c0607529 (diff)
parent32ec9839d89d2b814ada20b041b25feae23596bc (diff)
downloadfocaccia-qemu-2478b8ecd45f81a21b9aa319ce7147a790a2144f.tar.gz
focaccia-qemu-2478b8ecd45f81a21b9aa319ce7147a790a2144f.zip
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20200515-pull-request' into staging
ui: sdl bugfix, -show-cursor deprecation message

# gpg: Signature made Fri 15 May 2020 09:21:29 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/ui-20200515-pull-request:
  ui/sdl2: fix segment fault caused by null pointer dereference
  ui: improve -show-cursor deprecation message

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/qemu.h')
0 files changed, 0 insertions, 0 deletions