diff options
| author | Peter Maydell | 2019-03-25 08:59:40 +0100 |
|---|---|---|
| committer | Peter Maydell | 2019-03-25 08:59:40 +0100 |
| commit | c442b7b4a7ae8696bcdf46091d781bd9052731be (patch) | |
| tree | af2c87f0bca3e0fddf0f228bbedd7522bdb8b994 /scripts/tracetool/format | |
| parent | Merge remote-tracking branch 'remotes/ehabkost/tags/x86-next-pull-request' in... (diff) | |
| parent | slirp: is not maintained by Kelly Price for a long time (diff) | |
| download | qemu-c442b7b4a7ae8696bcdf46091d781bd9052731be.tar.gz qemu-c442b7b4a7ae8696bcdf46091d781bd9052731be.tar.xz qemu-c442b7b4a7ae8696bcdf46091d781bd9052731be.zip | |
Merge remote-tracking branch 'remotes/elmarco/tags/slirp-pull-request' into staging
slirp: clarify license of slirp as BSD-3
# gpg: Signature made Fri 22 Mar 2019 19:16:50 GMT
# gpg: using RSA key DAE8E10975969CE5
# gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>" [full]
# gpg: aka "Marc-André Lureau <marcandre.lureau@gmail.com>" [full]
# Primary key fingerprint: 87A9 BD93 3F87 C606 D276 F62D DAE8 E109 7596 9CE5
* remotes/elmarco/tags/slirp-pull-request:
slirp: is not maintained by Kelly Price for a long time
slirp: remove reference to COPYRIGHT file
slirp: clarify license of slirp files using SPDX: implicit via unstated
slirp: clarify license of slirp files using SPDX: implicit via COPYRIGHT
slirp: clarify license of slirp files using SPDX: explicit MIT
slirp: clarify license of slirp files using SPDX: explicit BSD
slirp: relicense GPL files to BSD-3
slirp: update COPYRIGHT to use full 3-Clause BSD License
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts/tracetool/format')
0 files changed, 0 insertions, 0 deletions