summary refs log tree commit diff stats
path: root/ui/sdl2-gl.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-04-04 09:36:14 +0100
committerPeter Maydell <peter.maydell@linaro.org>2018-04-04 09:36:14 +0100
commit71ad102baa599c3bdeee1f6d0913bbd3e0f08ee3 (patch)
treeea1547672e29a052a7b7e405a61dc13f6257f0e5 /ui/sdl2-gl.c
parentf7481f651ccf7bf0fe3547b16820c9d18da8f584 (diff)
parent3ea7f4a226cd3a4d107772569976dbb13400a632 (diff)
downloadfocaccia-qemu-71ad102baa599c3bdeee1f6d0913bbd3e0f08ee3.tar.gz
focaccia-qemu-71ad102baa599c3bdeee1f6d0913bbd3e0f08ee3.zip
Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-2.12-pull-request' into staging
# gpg: Signature made Tue 03 Apr 2018 11:33:31 BST
# gpg:                using RSA key F30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>"
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>"
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>"
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier2/tags/linux-user-for-2.12-pull-request:
  linux-user: fix TARGET___O_TMPFILE for sparc
  linux-user: define TARGET_ARCH_HAS_KA_RESTORER
  linux-user: fix alpha signal emulation

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/sdl2-gl.c')
0 files changed, 0 insertions, 0 deletions