aboutsummaryrefslogtreecommitdiffstats
path: root/util/qemu-timer.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2019-11-06 22:05:53 +0000
committerPeter Maydell <peter.maydell@linaro.org>2019-11-06 22:05:53 +0000
commit395e4ed1a3662d86fb73fad1d2e76d5dad1c7bc1 (patch)
tree412907c02d2f579aa3331120b82cb85344e199a4 /util/qemu-timer.c
parentMerge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-4.2-pull-request' into staging (diff)
parentqemu-options: Rework the help text of the '-display' option (diff)
downloadqemu-395e4ed1a3662d86fb73fad1d2e76d5dad1c7bc1.tar.xz
qemu-395e4ed1a3662d86fb73fad1d2e76d5dad1c7bc1.zip
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20191106-pull-request' into staging
ui: rework -display help text # gpg: Signature made Wed 06 Nov 2019 07:06:52 GMT # 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-20191106-pull-request: qemu-options: Rework the help text of the '-display' option Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'util/qemu-timer.c')
0 files changed, 0 insertions, 0 deletions