diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-04-04 12:09:27 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-04-04 12:09:27 +0100 |
| commit | bdc5db01c354abf19d21872cbcf51328bb8650db (patch) | |
| tree | c8f390cd7e7cc6986b6a5febcdcaf5c99bc6012f /ui/cocoa.m | |
| parent | de1d099a448beb2ec39af4bd9ce4dd6452a18cb5 (diff) | |
| parent | 0b11c036620251f8f831ab8f0d9a7280ec1c4813 (diff) | |
| download | qemu-bdc5db01c354abf19d21872cbcf51328bb8650db.tar.gz qemu-bdc5db01c354abf19d21872cbcf51328bb8650db.tar.bz2 qemu-bdc5db01c354abf19d21872cbcf51328bb8650db.zip | |
Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault-2' into staging
slirp updates (2)
# gpg: Signature made Fri 01 Apr 2016 16:52:09 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: Allow disabling IPv4 or IPv6
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/cocoa.m')
0 files changed, 0 insertions, 0 deletions