diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-01-08 12:50:19 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-01-08 12:50:19 +0000 |
| commit | 6bb9ead762bf749af11ea225fc2a74db1b93c105 (patch) | |
| tree | 599fe48ac364f15e925f65dea7c4294133b9cb7c /linux-user/m68k | |
| parent | 9df2513730c5902813f575a74ac9303388fd029d (diff) | |
| parent | cb47dc9ab9f55083017291b2b8fbae639c576ec2 (diff) | |
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) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
* 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 <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/m68k')
0 files changed, 0 insertions, 0 deletions