The following changes since commit b22726abdfa54592d6ad88f65b0297c0e8b363e2:
Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-6.1-pull-request' into staging (2021-06-22 16:07:53 +0100) are available in the Git repository at: git://git.kraxel.org/qemu tags/ui-20210624-pull-request for you to fetch changes up to 66c2207fd28a6025792fbb75151ee848b911dc35: ui: Make the DisplayType enum entries conditional (2021-06-23 14:42:30 +0200) ---------------------------------------------------------------- ui: better cocoa integration (ui info + clipboard). ui: add lang1+lang2 keys, fixes, doc updates. ---------------------------------------------------------------- Ahmed Abouzied (1): Add display suboptions to man pages Akihiko Odaki (3): ui/cocoa: Set UI information ui/cocoa: Add clipboard support input: Add lang1 and lang2 to QKeyCode Thomas Huth (1): ui: Make the DisplayType enum entries conditional include/ui/clipboard.h | 2 +- softmmu/vl.c | 20 +++++- ui/clipboard.c | 2 +- ui/console.c | 8 ++- qapi/ui.json | 29 ++++++-- qemu-options.hx | 35 ++++----- ui/cocoa.m | 158 +++++++++++++++++++++++++++++++++++++++++ 7 files changed, 224 insertions(+), 30 deletions(-) -- 2.31.1
