diff options
author | green <green@FreeBSD.org> | 2002-03-11 22:36:26 +0000 |
---|---|---|
committer | green <green@FreeBSD.org> | 2002-03-11 22:36:26 +0000 |
commit | 7ca574f59c0cfa1c18dfad38e2695df7c5356ccd (patch) | |
tree | bff2461c1653758bf9b8443f106c8627f9369418 /lib/libz/zlib.3 | |
parent | 08dc078a21e50f8bfdb56683ae019a8081cf84b5 (diff) | |
download | FreeBSD-src-7ca574f59c0cfa1c18dfad38e2695df7c5356ccd.zip FreeBSD-src-7ca574f59c0cfa1c18dfad38e2695df7c5356ccd.tar.gz |
Fix 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 1c29509..c1d495c 100644 --- a/lib/libz/zlib.3 +++ b/lib/libz/zlib.3 @@ -1,6 +1,6 @@ .\" $FreeBSD$ .\" -.TH ZLIB 3 "9 July 1998" +.TH ZLIB 3 "11 March 2002" .SH NAME zlib \- compression/decompression library .SH SYNOPSIS @@ -84,8 +84,8 @@ These documents are also available in other formats from: .IP ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html .SH AUTHORS -Version 1.1.3 -Copyright (C) 1995-1998 Jean-loup Gailly (jloup@gzip.org) +Version 1.1.4 +Copyright (C) 1995-2002 Jean-loup Gailly (jloup@gzip.org) and Mark Adler (madler@alumni.caltech.edu). .LP This software is provided "as-is," |