From cdd66651ce6f8c52f03fb06fc9a27402f6d3282a Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Mon, 26 Jun 2006 18:21:37 +0200 Subject: [PATCH] --- yaml --- r: 30627 b: refs/heads/master c: 0ecbf4b5fc38479ba29149455d56c11a23b131c0 h: refs/heads/master i: 30625: e54635b8b495af57b7213131b1440b3a8b74b871 30623: 0fd28e9fe63c63d55c56527314ddbfd910160628 v: v3 --- [refs] | 2 +- trunk/CREDITS | 5 +++++ trunk/lib/zlib_inflate/inftrees.c | 9 --------- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 82c9764754ff..dc166b449bbb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bdca3f202dbeaca2fcc4fb47219476286c999b0d +refs/heads/master: 0ecbf4b5fc38479ba29149455d56c11a23b131c0 diff --git a/trunk/CREDITS b/trunk/CREDITS index 1d35f10ec3b2..85c7c70b7044 100644 --- a/trunk/CREDITS +++ b/trunk/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/trunk/lib/zlib_inflate/inftrees.c b/trunk/lib/zlib_inflate/inftrees.c index 62343c53bf7e..da665fbb16aa 100644 --- a/trunk/lib/zlib_inflate/inftrees.c +++ b/trunk/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,