summaryrefslogtreecommitdiffstats
path: root/compat/zlib/README
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2022-04-12 08:53:36 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2022-04-12 08:53:36 (GMT)
commitc346d913c2a03702ff06c81ca4e3397aa93e3967 (patch)
treec0e0752d59f7ddf9fc1c930da2220c136fa95f37 /compat/zlib/README
parentecd8e8bce1ae18281cf79ca447cbafe017127afb (diff)
parentb6adef13aed1c3638007e945a6c3aca62e4fe1a5 (diff)
downloadtcl-c346d913c2a03702ff06c81ca4e3397aa93e3967.zip
tcl-c346d913c2a03702ff06c81ca4e3397aa93e3967.tar.gz
tcl-c346d913c2a03702ff06c81ca4e3397aa93e3967.tar.bz2
Merge 8.6
Diffstat (limited to 'compat/zlib/README')
-rw-r--r--compat/zlib/README11
1 files changed, 7 insertions, 4 deletions
diff --git a/compat/zlib/README b/compat/zlib/README
index 51106de..024b79d 100644
--- a/compat/zlib/README
+++ b/compat/zlib/README
@@ -1,6 +1,6 @@
ZLIB DATA COMPRESSION LIBRARY
-zlib 1.2.11 is a general purpose data compression library. All the code is
+zlib 1.2.12 is a general purpose data compression library. All the code is
thread safe. The data format used by the zlib library is described by RFCs
(Request for Comments) 1950 to 1952 in the files
http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and
@@ -31,7 +31,7 @@ Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan. 1997
issue of Dr. Dobb's Journal; a copy of the article is available at
http://marknelson.us/1997/01/01/zlib-engine/ .
-The changes made in version 1.2.11 are documented in the file ChangeLog.
+The changes made in version 1.2.12 are documented in the file ChangeLog.
Unsupported third party contributions are provided in directory contrib/ .
@@ -84,7 +84,7 @@ Acknowledgments:
Copyright notice:
- (C) 1995-2017 Jean-loup Gailly and Mark Adler
+ (C) 1995-2022 Jean-loup Gailly and Mark Adler
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@@ -108,7 +108,10 @@ Copyright notice:
If you use the zlib library in a product, we would appreciate *not* receiving
lengthy legal documents to sign. The sources are provided for free but without
warranty of any kind. The library has been entirely written by Jean-loup
-Gailly and Mark Adler; it does not include third-party code.
+Gailly and Mark Adler; it does not include third-party code. We make all
+contributions to and distributions of this project solely in our personal
+capacity, and are not conveying any rights to any intellectual property of
+any third parties.
If you redistribute modified sources, we would appreciate that you include in
the file ChangeLog history information documenting your changes. Please read