Module Name:	src
Committed By:	tron
Date:		Sun Nov  1 20:33:27 UTC 1998

Modified Files:
	src/lib/libz: ChangeLog Makefile README adler32.c algorithm.doc
	    compress.c crc32.c deflate.c deflate.h example.c gzio.c infblock.c
	    infblock.h infcodes.c infcodes.h inffast.c inffast.h inflate.c
	    inftrees.c inftrees.h infutil.c infutil.h minigzip.c trees.c
	    uncompr.c zconf.h zlib.h zutil.c zutil.h
Removed Files:
	src/lib/libz: maketree.c
Log Message:
Resolve import conflicts.