From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 26 Jun 2018 15:44:57 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180626-pull-request' into... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0ab4c574a55448a37b9f616259b82950742c9427;p=qemu.git

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>
---

0ab4c574a55448a37b9f616259b82950742c9427