From: Adrian Bunk Date: Mon, 26 Jun 2006 16:21:37 +0000 (+0200) Subject: move acknowledgment for Mark Adler to CREDITS X-Git-Tag: v2.6.18-rc1~598^2~8 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ecbf4b5fc38479ba29149455d56c11a23b131c0;p=linux-2.6 move acknowledgment for Mark Adler to CREDITS The place in the documentation of the Linux kernel to acknowledge contributions is the CREDITS file. Give Mark Adler an entry there instead of including a string in the kernel image. Signed-off-by: Adrian Bunk --- diff --git a/CREDITS b/CREDITS index 1d35f10ec3..85c7c70b70 100644 --- a/CREDITS +++ b/CREDITS @@ -24,6 +24,11 @@ S: C. Negri 6, bl. D3 S: Iasi 6600 S: Romania +N: Mark Adler +E: madler@alumni.caltech.edu +W: http://alumnus.caltech.edu/~madler/ +D: zlib decompression + N: Monalisa Agrawal E: magrawal@nortelnetworks.com D: Basic Interphase 5575 driver with UBR and ABR support. diff --git a/lib/zlib_inflate/inftrees.c b/lib/zlib_inflate/inftrees.c index 62343c53bf..da665fbb16 100644 --- a/lib/zlib_inflate/inftrees.c +++ b/lib/zlib_inflate/inftrees.c @@ -8,15 +8,6 @@ #define MAXBITS 15 -const char inflate_copyright[] = - " inflate 1.2.3 Copyright 1995-2005 Mark Adler "; -/* - If you use the zlib library in a product, an acknowledgment is welcome - in the documentation of your product. If for some reason you cannot - include such an acknowledgment, I would appreciate that you keep this - copyright string in the executable of your product. - */ - /* Build a set of tables to decode the provided canonical Huffman code. The code lengths are lens[0..codes-1]. The result starts at *table,