diff options
| author | Brian Feldman <green@FreeBSD.org> | 2002-03-11 22:36:26 +0000 |
|---|---|---|
| committer | Brian Feldman <green@FreeBSD.org> | 2002-03-11 22:36:26 +0000 |
| commit | 4d22b11a56999255d263ddecadfbe73b9a80030d (patch) | |
| tree | bff2461c1653758bf9b8443f106c8627f9369418 /lib/libz/maketree.c | |
| parent | 422658d92461cf1f8c1121f44057d99b5d4ac228 (diff) | |
Fix conflicts.
Notes
Notes:
svn path=/head/; revision=92114
Diffstat (limited to 'lib/libz/maketree.c')
| -rw-r--r-- | lib/libz/maketree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libz/maketree.c b/lib/libz/maketree.c index 57a35356f8d3..a71af29b977a 100644 --- a/lib/libz/maketree.c +++ b/lib/libz/maketree.c @@ -1,5 +1,5 @@ /* maketree.c -- make inffixed.h table for decoding fixed codes - * Copyright (C) 1998 Mark Adler + * Copyright (C) 1995-2002 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ |