summary refs log tree commit diff stats
path: root/hw/display/framebuffer.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2019-03-14 07:43:39 +0000
committerPeter Maydell <peter.maydell@linaro.org>2019-03-14 07:43:39 +0000
commitabb7ede1fb60abbaf0b5dbd0e6e1d29e291d5767 (patch)
treef2965d81058dc86ad271f1549cad7294c7dfc75d /hw/display/framebuffer.c
parent1fa87eb56ea0af5a8133b9e11101732f5df7d46f (diff)
parent1f773d9dd3187281b29ceae38541fa2d945b1d0f (diff)
downloadfocaccia-qemu-abb7ede1fb60abbaf0b5dbd0e6e1d29e291d5767.tar.gz
focaccia-qemu-abb7ede1fb60abbaf0b5dbd0e6e1d29e291d5767.zip
Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into staging
Slirp updates

Daniel P. Berrangé (1):
  configure: remove slirp submodule support that doesn't exist yet

Marc-André Lureau (1):
  slirp: remove empty state.h

# gpg: Signature made Wed 13 Mar 2019 21:18:35 GMT
# gpg:                using RSA key E61DBB15D4172BDEC97E92D9DB550E89F0FA54F3
# gpg: Good signature from "Samuel Thibault <samuel.thibault@aquilenet.fr>" [unknown]
# gpg:                 aka "Samuel Thibault <sthibault@debian.org>" [marginal]
# gpg:                 aka "Samuel Thibault <samuel.thibault@gnu.org>" [unknown]
# gpg:                 aka "Samuel Thibault <samuel.thibault@inria.fr>" [marginal]
# gpg:                 aka "Samuel Thibault <samuel.thibault@labri.fr>" [marginal]
# gpg:                 aka "Samuel Thibault <samuel.thibault@ens-lyon.org>" [marginal]
# gpg:                 aka "Samuel Thibault <samuel.thibault@u-bordeaux.fr>" [unknown]
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 900C B024 B679 31D4 0F82  304B D017 8C76 7D06 9EE6
#      Subkey fingerprint: E61D BB15 D417 2BDE C97E  92D9 DB55 0E89 F0FA 54F3

* remotes/thibault/tags/samuel-thibault:
  configure: remove slirp submodule support that doesn't exist yet
  slirp: remove empty state.h

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