From: Peter Maydell Date: Fri, 8 Jan 2016 12:50:19 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20160108-1' into staging X-Git-Tag: v2.6.0-rc0~237 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6bb9ead762bf749af11ea225fc2a74db1b93c105;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20160108-1' into staging sdl2/opengl: add opengl context and scanout support ui/curses: Fix color attribute of monitor for curses # gpg: Signature made Fri 08 Jan 2016 12:42:02 GMT 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-ui-20160108-1: sdl2/opengl: add opengl context and scanout support ui/curses: Fix color attribute of monitor for curses Signed-off-by: Peter Maydell --- 6bb9ead762bf749af11ea225fc2a74db1b93c105