diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2018-06-04 15:46:15 +0100 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2018-06-04 15:46:15 +0100 |
commit | 5d7ad3ce103af3ab7c860a4ca97653f8ffa6e29c (patch) | |
tree | 5f64df14b1ae8c4835327537f32645b8b831ad50 /monitor.c | |
parent | cfe672510d77e8aa646c5e34768745271ffd772b (diff) | |
parent | 6bc2fd57e1fc2d1957d1ff952793c53764130218 (diff) |
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20180604-pull-request' into staging
Two little vga fixes.
# gpg: Signature made Mon 04 Jun 2018 09:48:53 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/vga-20180604-pull-request:
vga: cleanup surface handling
bochs-display: add missing break
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'monitor.c')
0 files changed, 0 insertions, 0 deletions