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/infutil.c | |
| parent | 08dc078a21e50f8bfdb56683ae019a8081cf84b5 (diff) | |
| download | FreeBSD-src-7ca574f59c0cfa1c18dfad38e2695df7c5356ccd.zip FreeBSD-src-7ca574f59c0cfa1c18dfad38e2695df7c5356ccd.tar.gz | |
Fix conflicts.
Diffstat (limited to 'lib/libz/infutil.c')
| -rw-r--r-- | lib/libz/infutil.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libz/infutil.c b/lib/libz/infutil.c index 7461404..36e14e3 100644 --- a/lib/libz/infutil.c +++ b/lib/libz/infutil.c @@ -1,5 +1,5 @@ /* inflate_util.c -- data and routines common to blocks and codes - * Copyright (C) 1995-1998 Mark Adler + * Copyright (C) 1995-2002 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ |
