diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-02-14 15:22:29 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-02-14 15:22:29 +0000 |
| commit | 7e407466b1efbd65225cc72fe09c0c5ec79df75b (patch) | |
| tree | 1e03d44f2be85d8e7d38bb0622f611a047a1df25 /target/mips/machine.c | |
| parent | c4c5f6573a93dfbd351c41a27ea29a662d7445fa (diff) | |
| parent | adf1add2927c7bb652a168f5be627102921cf35f (diff) | |
Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into staging
Fix slirp on windows
Marc-André Lureau (2):
slirp: remove slirp_ prefix for socket wrappers
slirp: wrap the remaining socket functions
# gpg: Signature made Wed 13 Feb 2019 18:31:21 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:
slirp: wrap the remaining socket functions
slirp: remove slirp_ prefix for socket wrappers
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target/mips/machine.c')
0 files changed, 0 insertions, 0 deletions