Google Git
Sign in
qemu-android / qemu-android / 8af47027eb51d2d2afd15cff3ab7236a0211b8a0
commit8af47027eb51d2d2afd15cff3ab7236a0211b8a0[log] [tgz]
authorPeter Maydell <peter.maydell@linaro.org>Tue Sep 16 18:29:40 2014 +0100
committerPeter Maydell <peter.maydell@linaro.org>Tue Sep 16 18:29:40 2014 +0100
treea55efc42897cf5692e7f8cbf3b138c4e892f07dd
parent5f3fb5a2e259322d50d289f180ac7e452ad1b6f8 [diff]
parent0d61f7dcc6c04e7e825417c74e50362d990330bf [diff]
Merge remote-tracking branch 'remotes/kraxel/tags/pull-sdl-20140916-1' into staging

Two minor sdl2 fixes.

# gpg: Signature made Tue 16 Sep 2014 07:20:37 BST 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-sdl-20140916-1:
  sdl2: keymap fixups
  sdl2: drop sdl_zoom.h

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
tree: a55efc42897cf5692e7f8cbf3b138c4e892f07dd
  1. audio/
  2. backends/
  3. block/
  4. bsd-user/
  5. default-configs/
  6. disas/
  7. docs/
  8. fpu/
  9. fsdev/
  10. gdb-xml/
  11. hw/
  12. include/
  13. libcacard/
  14. libdecnumber/
  15. linux-headers/
  16. linux-user/
  17. net/
  18. pc-bios/
  19. po/
  20. qapi/
  21. qga/
  22. qobject/
  23. qom/
  24. roms/
  25. scripts/
  26. slirp/
  27. stubs/
  28. sysconfigs/
  29. target-alpha/
  30. target-arm/
  31. target-cris/
  32. target-i386/
  33. target-lm32/
  34. target-m68k/
  35. target-microblaze/
  36. target-mips/
  37. target-moxie/
  38. target-openrisc/
  39. target-ppc/
  40. target-s390x/
  41. target-sh4/
  42. target-sparc/
  43. target-tricore/
  44. target-unicore32/
  45. target-xtensa/
  46. tcg/
  47. tests/
  48. trace/
  49. ui/
  50. util/
  51. dtc
  52. pixman
  53. .exrc
  54. .gitignore
  55. .gitmodules
  56. .mailmap
  57. .travis.yml
  58. aio-posix.c
  59. aio-win32.c
  60. arch_init.c
  61. async.c
  62. balloon.c
  63. block-migration.c
  64. block.c
  65. blockdev-nbd.c
  66. blockdev.c
  67. blockjob.c
  68. bt-host.c
  69. bt-vhci.c
  70. Changelog
  71. CODING_STYLE
  72. configure
  73. COPYING
  74. COPYING.LIB
  75. coroutine-gthread.c
  76. coroutine-sigaltstack.c
  77. coroutine-ucontext.c
  78. coroutine-win32.c
  79. cpu-exec.c
  80. cpus.c
  81. cputlb.c
  82. device-hotplug.c
  83. device_tree.c
  84. disas.c
  85. dma-helpers.c
  86. dump.c
  87. exec.c
  88. gdbstub.c
  89. HACKING
  90. hmp-commands.hx
  91. hmp.c
  92. hmp.h
  93. iohandler.c
  94. ioport.c
  95. iothread.c
  96. kvm-all.c
  97. kvm-stub.c
  98. LICENSE
  99. main-loop.c
  100. MAINTAINERS
  101. Makefile
  102. Makefile.objs
  103. Makefile.target
  104. memory.c
  105. memory_mapping.c
  106. migration-exec.c
  107. migration-fd.c
  108. migration-rdma.c
  109. migration-tcp.c
  110. migration-unix.c
  111. migration.c
  112. module-common.c
  113. monitor.c
  114. nbd.c
  115. numa.c
  116. os-posix.c
  117. os-win32.c
  118. page_cache.c
  119. qapi-schema.json
  120. qdev-monitor.c
  121. qdict-test-data.txt
  122. qemu-bridge-helper.c
  123. qemu-char.c
  124. qemu-coroutine-io.c
  125. qemu-coroutine-lock.c
  126. qemu-coroutine-sleep.c
  127. qemu-coroutine.c
  128. qemu-doc.texi
  129. qemu-file.c
  130. qemu-img-cmds.hx
  131. qemu-img.c
  132. qemu-img.texi
  133. qemu-io-cmds.c
  134. qemu-io.c
  135. qemu-log.c
  136. qemu-nbd.c
  137. qemu-nbd.texi
  138. qemu-options-wrapper.h
  139. qemu-options.h
  140. qemu-options.hx
  141. qemu-seccomp.c
  142. qemu-tech.texi
  143. qemu-timer.c
  144. qemu.nsi
  145. qemu.sasl
  146. qmp-commands.hx
  147. qmp.c
  148. qtest.c
  149. README
  150. rules.mak
  151. savevm.c
  152. softmmu_template.h
  153. spice-qemu-char.c
  154. tcg-runtime.c
  155. tci.c
  156. thread-pool.c
  157. thunk.c
  158. tpm.c
  159. trace-events
  160. translate-all.c
  161. translate-all.h
  162. user-exec.c
  163. VERSION
  164. version.rc
  165. vl.c
  166. vmstate.c
  167. xbzrle.c
  168. xen-common-stub.c
  169. xen-common.c
  170. xen-hvm-stub.c
  171. xen-hvm.c
  172. xen-mapcache.c