diff options
| author | Peter Maydell | 2019-05-09 10:58:41 +0200 |
|---|---|---|
| committer | Peter Maydell | 2019-05-09 10:58:41 +0200 |
| commit | c56247e55bde4386003365bb5e40b2875e88f779 (patch) | |
| tree | a25233ccb1dd75bab0a40085a4218dcafac3646d /Makefile | |
| parent | Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2019-05-07' into st... (diff) | |
| parent | Update upstream slirp (diff) | |
| download | qemu-c56247e55bde4386003365bb5e40b2875e88f779.tar.gz qemu-c56247e55bde4386003365bb5e40b2875e88f779.tar.xz qemu-c56247e55bde4386003365bb5e40b2875e88f779.zip | |
Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into staging
Update slirp submodule
Samuel Thibault (1):
Update upstream slirp
Adds gitignore, README file, and fixes ident protocol parsing.
# gpg: Signature made Thu 09 May 2019 09:00:30 BST
# 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:
Update upstream slirp
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions