Module Name: src
Committed By: christos
Date: Sat Oct 15 19:49:34 UTC 2022
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/contrib/amd64: amd64-match.S
src/common/dist/zlib/contrib/asm686: README.686 match.S
src/common/dist/zlib/contrib/inflate86: inffas86.c inffast.S
src/common/dist/zlib/contrib/masmx64: bld_ml64.bat gvmat64.asm
inffas8664.c inffasx64.asm readme.txt
src/common/dist/zlib/contrib/masmx86: bld_ml32.bat inffas32.asm
match686.asm readme.txt
src/common/dist/zlib/contrib/vstudio/vc14: miniunz.vcxproj.user
minizip.vcxproj.user testzlib.vcxproj.user testzlibdll.vcxproj.user
zlibstat.vcxproj.user zlibvc.vcxproj.user
Log Message:
merge conflicts between 1.2.10 and 1.2.13
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 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.5 -r1.6 src/common/dist/zlib/crc32.c \
src/common/dist/zlib/deflate.c src/common/dist/zlib/trees.c \
src/common/dist/zlib/zlib.h src/common/dist/zlib/zutil.h
cvs rdiff -u -r1.4 -r1.5 src/common/dist/zlib/deflate.h \
src/common/dist/zlib/inffast.c
cvs rdiff -u -r1.2 -r1.3 src/common/dist/zlib/gzguts.h \
src/common/dist/zlib/gzwrite.c
cvs rdiff -u -r1.6 -r1.7 src/common/dist/zlib/inflate.c
cvs rdiff -u -r1.1.1.1 -r0 src/common/dist/zlib/contrib/amd64/amd64-match.S
cvs rdiff -u -r1.1.1.2 -r0 src/common/dist/zlib/contrib/asm686/README.686 \
src/common/dist/zlib/contrib/asm686/match.S
cvs rdiff -u -r1.1.1.2 -r0 src/common/dist/zlib/contrib/inflate86/inffas86.c
cvs rdiff -u -r1.1.1.1 -r0 src/common/dist/zlib/contrib/inflate86/inffast.S
cvs rdiff -u -r1.1.1.1 -r0 src/common/dist/zlib/contrib/masmx64/bld_ml64.bat
cvs rdiff -u -r1.1.1.2 -r0 src/common/dist/zlib/contrib/masmx64/gvmat64.asm \
src/common/dist/zlib/contrib/masmx64/inffas8664.c \
src/common/dist/zlib/contrib/masmx64/inffasx64.asm \
src/common/dist/zlib/contrib/masmx64/readme.txt
cvs rdiff -u -r1.1.1.2 -r0 src/common/dist/zlib/contrib/masmx86/bld_ml32.bat \
src/common/dist/zlib/contrib/masmx86/inffas32.asm \
src/common/dist/zlib/contrib/masmx86/readme.txt
cvs rdiff -u -r1.1.1.1 -r0 src/common/dist/zlib/contrib/masmx86/match686.asm
cvs rdiff -u -r1.1.1.1 -r0 \
src/common/dist/zlib/contrib/vstudio/vc14/miniunz.vcxproj.user \
src/common/dist/zlib/contrib/vstudio/vc14/minizip.vcxproj.user \
src/common/dist/zlib/contrib/vstudio/vc14/testzlib.vcxproj.user \
src/common/dist/zlib/contrib/vstudio/vc14/testzlibdll.vcxproj.user \
src/common/dist/zlib/contrib/vstudio/vc14/zlibstat.vcxproj.user \
src/common/dist/zlib/contrib/vstudio/vc14/zlibvc.vcxproj.user
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
