From: Peter Maydell Date: Wed, 6 Nov 2019 22:05:53 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/kraxel/tags/ui-20191106-pull-request' into... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=395e4ed1a3662d86fb73fad1d2e76d5dad1c7bc1;p=qemu.git 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) " [full] # gpg: aka "Gerd Hoffmann " [full] # gpg: aka "Gerd Hoffmann (private) " [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 --- 395e4ed1a3662d86fb73fad1d2e76d5dad1c7bc1