Module Name:	basesrc
Committed By:	fvdl
Date:		Mon Mar 11 23:24:06 UTC 2002

Update of /cvsroot/basesrc/lib/libz
In directory netbsd.hut.fi:/tmp/cvs-serv8685

Log Message:
Upgrade to zlib 1.1.4 (security fix)


Vendor Tag:	zlib
Release Tags:	zlib114
		
C basesrc/lib/libz/README
N basesrc/lib/libz/FAQ
C basesrc/lib/libz/ChangeLog
C basesrc/lib/libz/adler32.c
C basesrc/lib/libz/compress.c
C basesrc/lib/libz/crc32.c
C basesrc/lib/libz/deflate.c
C basesrc/lib/libz/deflate.h
C basesrc/lib/libz/example.c
C basesrc/lib/libz/gzio.c
C basesrc/lib/libz/infblock.c
C basesrc/lib/libz/infblock.h
C basesrc/lib/libz/infcodes.c
C basesrc/lib/libz/infcodes.h
C basesrc/lib/libz/inffast.c
C basesrc/lib/libz/inffast.h
U basesrc/lib/libz/inffixed.h
C basesrc/lib/libz/inflate.c
C basesrc/lib/libz/inftrees.c
C basesrc/lib/libz/inftrees.h
C basesrc/lib/libz/infutil.c
C basesrc/lib/libz/infutil.h
C basesrc/lib/libz/minigzip.c
C basesrc/lib/libz/trees.c
U basesrc/lib/libz/trees.h
C basesrc/lib/libz/uncompr.c
C basesrc/lib/libz/zconf.h
C basesrc/lib/libz/zlib.h
C basesrc/lib/libz/zutil.c
C basesrc/lib/libz/zutil.h
N basesrc/lib/libz/algorithm.txt

27 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jzlib:yesterday -jzlib basesrc/lib/libz