]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180626-pull-request' into...
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 26 Jun 2018 15:44:57 +0000 (16:44 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 26 Jun 2018 15:44:57 +0000 (16:44 +0100)
commit0ab4c574a55448a37b9f616259b82950742c9427
tree760945aa3534ab90f10959e58870cc8a394502fe
parentbd4e4a387aa733e40270a7406c7d111f2292de65
parent49213b721f4620364aa09142b5f4d559fed26b53
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180626-pull-request' into staging

ui: sdl2 fixes, gles support.

# gpg: Signature made Tue 26 Jun 2018 14:56:15 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-20180626-pull-request:
  sdl2: add checking for NULL
  sdl2: fix copypaste issues
  Add gles support to egl-helpers, wire up in egl-headless and gtk.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>