From: Peter Maydell Date: Mon, 4 Apr 2016 11:09:27 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault-2' into staging X-Git-Tag: TizenStudio_2.0_p2.4~27^2~6^2~8^2~73 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bdc5db01c354abf19d21872cbcf51328bb8650db;p=sdk%2Femulator%2Fqemu.git 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 " # gpg: aka "Samuel Thibault " # gpg: aka "Samuel Thibault " # gpg: aka "Samuel Thibault " # gpg: aka "Samuel Thibault " # 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 --- bdc5db01c354abf19d21872cbcf51328bb8650db