aboutsummaryrefslogtreecommitdiff
path: root/slirp/tcp_timer.h
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-04-01 11:15:20 +0100
committerPeter Maydell <peter.maydell@linaro.org>2016-04-01 11:15:20 +0100
commitde1d099a448beb2ec39af4bd9ce4dd6452a18cb5 (patch)
tree0d867a2d94010750fd3744b41c9a6f0ba169f0d7 /slirp/tcp_timer.h
parent57528a3fef2fd65661320723ad8c3c781f4fd49f (diff)
parenteaf136f9a21e02a2f55346e44d2d88df37b2cde3 (diff)
downloadqemu-de1d099a448beb2ec39af4bd9ce4dd6452a18cb5.zip
qemu-de1d099a448beb2ec39af4bd9ce4dd6452a18cb5.tar.gz
qemu-de1d099a448beb2ec39af4bd9ce4dd6452a18cb5.tar.bz2
Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault-2' into staging
slirp updates (2) # gpg: Signature made Thu 31 Mar 2016 23:19:08 BST using RSA key ID FB6B2F1D # gpg: Good signature from "Samuel Thibault <samuel.thibault@gnu.org>" # gpg: aka "Samuel Thibault <sthibault@debian.org>" # gpg: aka "Samuel Thibault <samuel.thibault@inria.fr>" # gpg: aka "Samuel Thibault <samuel.thibault@labri.fr>" # gpg: aka "Samuel Thibault <samuel.thibault@ens-lyon.org>" # 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: F632 74CD C630 0873 CB3D 29D9 E3E5 1CE8 FB6B 2F1D * remotes/thibault/tags/samuel-thibault-2: slirp: Fix migration from older versions of QEMU to the current one Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'slirp/tcp_timer.h')
0 files changed, 0 insertions, 0 deletions