Module Name:	basesrc
Committed By:	fvdl
Date:		Mon Mar 11 23:40:25 UTC 2002

Modified Files:
	basesrc/lib/libz: ChangeLog README adler32.c 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:
	basesrc/lib/libz: algorithm.doc

Log Message:
Resolve (rcsid) conflicts.


To generate a diff of this commit:
cvs rdiff -r1.5 -r1.6 basesrc/lib/libz/ChangeLog basesrc/lib/libz/README \
    basesrc/lib/libz/infblock.c basesrc/lib/libz/infcodes.c \
    basesrc/lib/libz/inffast.c basesrc/lib/libz/inflate.c \
    basesrc/lib/libz/infutil.c
cvs rdiff -r1.6 -r1.7 basesrc/lib/libz/adler32.c basesrc/lib/libz/compress.c \
    basesrc/lib/libz/infblock.h basesrc/lib/libz/infcodes.h \
    basesrc/lib/libz/inffast.h basesrc/lib/libz/inftrees.c \
    basesrc/lib/libz/inftrees.h basesrc/lib/libz/infutil.h \
    basesrc/lib/libz/uncompr.c
cvs rdiff -r1.5 -r0 basesrc/lib/libz/algorithm.doc
cvs rdiff -r1.7 -r1.8 basesrc/lib/libz/crc32.c basesrc/lib/libz/deflate.c \
    basesrc/lib/libz/deflate.h basesrc/lib/libz/trees.c \
    basesrc/lib/libz/zutil.c
cvs rdiff -r1.8 -r1.9 basesrc/lib/libz/example.c
cvs rdiff -r1.11 -r1.12 basesrc/lib/libz/gzio.c basesrc/lib/libz/zlib.h
cvs rdiff -r1.10 -r1.11 basesrc/lib/libz/minigzip.c basesrc/lib/libz/zconf.h \
    basesrc/lib/libz/zutil.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.