diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2018-06-14 14:04:14 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2018-06-14 14:04:14 +0100 |
commit | 409c241f887a38bb7a2ac12e34d3a8d73922a9a5 (patch) | |
tree | e1ca801582db08673758bf7159638acab73bcd10 /net/tap.c | |
parent | 666b0e732f694c995797e2a31ba19138ce4f69eb (diff) | |
parent | 64bf97e56f3ab44d587c92c40503d646273a24df (diff) |
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180614-pull-request' into staging
ui: bugfixes for sdl and gtk
# gpg: Signature made Thu 14 Jun 2018 09:32:45 BST
# gpg: using RSA key 4CB6D8EED3E87138
# 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-20180614-pull-request:
sdl2: restore window dimensions by resize
ui: darwin: gtk: Add missing input keymap
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'net/tap.c')
0 files changed, 0 insertions, 0 deletions