diff options
| author | des <des@FreeBSD.org> | 2006-03-23 14:09:21 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2006-03-23 14:09:21 +0000 |
| commit | ec17f7788515f838ae8c595748fbd664f1e2f1f1 (patch) | |
| tree | 297104a1ee790469dfe9ff88a857a9836926bccc /lib/libz/zlib.3 | |
| parent | 6d9b0264a175d883795d7a2549ca6f2d9c2a15b7 (diff) | |
| download | FreeBSD-src-ec17f7788515f838ae8c595748fbd664f1e2f1f1.zip FreeBSD-src-ec17f7788515f838ae8c595748fbd664f1e2f1f1.tar.gz | |
Resolve conflicts.
Diffstat (limited to 'lib/libz/zlib.3')
| -rw-r--r-- | lib/libz/zlib.3 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libz/zlib.3 b/lib/libz/zlib.3 index 3139e24..90b8162 100644 --- a/lib/libz/zlib.3 +++ b/lib/libz/zlib.3 @@ -1,4 +1,4 @@ -.TH ZLIB 3 "3 October 2004" +.TH ZLIB 3 "18 July 2005" .SH NAME zlib \- compression/decompression library .SH SYNOPSIS @@ -133,8 +133,8 @@ before asking for help. Send questions and/or comments to zlib@gzip.org, or (for the Windows DLL version) to Gilles Vollant (info@winimage.com). .SH AUTHORS -Version 1.2.2 -Copyright (C) 1995-2004 Jean-loup Gailly (jloup@gzip.org) +Version 1.2.3 +Copyright (C) 1995-2005 Jean-loup Gailly (jloup@gzip.org) and Mark Adler (madler@alumni.caltech.edu). .LP This software is provided "as-is," |
