From: Peter Maydell Date: Fri, 29 May 2015 13:24:35 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-gtk-20150529-1' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2a90c454a1b90ace56ed908cd064f2fd483d1231;p=qemu.git Merge remote-tracking branch 'remotes/kraxel/tags/pull-gtk-20150529-1' into staging gtk: add opengl rendering support. small bugfixes for gtk and opengl ui code. # gpg: Signature made Fri May 29 10:44:54 2015 BST using RSA key ID D3E87138 # gpg: Good signature from "Gerd Hoffmann (work) " # gpg: aka "Gerd Hoffmann " # gpg: aka "Gerd Hoffmann (private) " * remotes/kraxel/tags/pull-gtk-20150529-1: gtk: Replace gdk_cursor_new() gtk: add opengl support, using egl ui: add egl-helpers ui: shader.h protect against double inclusion ui: use libexpoxy Signed-off-by: Peter Maydell --- 2a90c454a1b90ace56ed908cd064f2fd483d1231