Module Name: src
Committed By: christos
Date: Sun Sep 22 19:12:28 UTC 2024
Modified Files:
src/common/dist/zlib: compress.c crc32.c deflate.c deflate.h gzguts.h
gzwrite.c infback.c inffast.c inflate.c inftrees.c trees.c
uncompr.c zconf.h zlib.h zutil.c zutil.h
Removed Files:
src/common/dist/zlib: zlib2ansi
Log Message:
Merge conflicts between 1.2.13 and 1.3.1
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/common/dist/zlib/compress.c \
src/common/dist/zlib/infback.c src/common/dist/zlib/inftrees.c \
src/common/dist/zlib/uncompr.c src/common/dist/zlib/zconf.h \
src/common/dist/zlib/zutil.c
cvs rdiff -u -r1.6 -r1.7 src/common/dist/zlib/crc32.c \
src/common/dist/zlib/deflate.c src/common/dist/zlib/trees.c
cvs rdiff -u -r1.5 -r1.6 src/common/dist/zlib/deflate.h \
src/common/dist/zlib/inffast.c
cvs rdiff -u -r1.3 -r1.4 src/common/dist/zlib/gzguts.h \
src/common/dist/zlib/gzwrite.c
cvs rdiff -u -r1.7 -r1.8 src/common/dist/zlib/inflate.c \
src/common/dist/zlib/zlib.h src/common/dist/zlib/zutil.h
cvs rdiff -u -r1.1.1.2 -r0 src/common/dist/zlib/zlib2ansi
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
