diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-03-25 07:59:40 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-03-25 07:59:40 +0000 |
| commit | c442b7b4a7ae8696bcdf46091d781bd9052731be (patch) | |
| tree | af2c87f0bca3e0fddf0f228bbedd7522bdb8b994 /slirp/src/sbuf.c | |
| parent | d97a39d903fe33c45be83ac6943a2f82a3649a11 (diff) | |
| parent | 7849f0c2ecf35f04c8dfcea30f675182cafdd455 (diff) | |
| download | qemu-c442b7b4a7ae8696bcdf46091d781bd9052731be.zip qemu-c442b7b4a7ae8696bcdf46091d781bd9052731be.tar.gz qemu-c442b7b4a7ae8696bcdf46091d781bd9052731be.tar.bz2 | |
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 'slirp/src/sbuf.c')
| -rw-r--r-- | slirp/src/sbuf.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/slirp/src/sbuf.c b/slirp/src/sbuf.c index 51a9f0c..9c0b31b 100644 --- a/slirp/src/sbuf.c +++ b/slirp/src/sbuf.c @@ -1,8 +1,6 @@ +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Copyright (c) 1995 Danny Gasparovski. - * - * Please read the file COPYRIGHT for the - * terms and conditions of the copyright. */ #include "slirp.h" |