Module Name: src
Committed By: christos
Date: Tue Jan 10 01:27:42 UTC 2017
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: algorithm.txt example.c gzio.c minigzip.c
zconf.in.h
src/common/dist/zlib/as400: bndsrc compile.clp readme.txt zlib.inc
src/common/dist/zlib/contrib/asm586: README.586 match.S
src/common/dist/zlib/contrib/masm686: match.asm
src/common/dist/zlib/contrib/masmx86: gvmat32.asm gvmat32c.c mkasm.bat
src/common/dist/zlib/contrib/minizip: ChangeLogUnzip
src/common/dist/zlib/contrib/vstudio/vc7: miniunz.vcproj minizip.vcproj
testzlib.vcproj zlib.rc zlibstat.vcproj zlibvc.def zlibvc.sln
zlibvc.vcproj
src/common/dist/zlib/contrib/vstudio/vc8: miniunz.vcproj minizip.vcproj
testzlib.vcproj testzlibdll.vcproj zlib.rc zlibstat.vcproj
zlibvc.def zlibvc.sln zlibvc.vcproj
src/common/dist/zlib/old: zlib.html
src/common/dist/zlib/projects: README.projects
src/common/dist/zlib/projects/visualc6: README.txt example.dsp
minigzip.dsp zlib.dsp zlib.dsw
src/common/dist/zlib/win32: Makefile.emx
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 src/common/dist/zlib/algorithm.txt \
src/common/dist/zlib/example.c src/common/dist/zlib/minigzip.c \
src/common/dist/zlib/zconf.in.h
cvs rdiff -u -r1.2 -r1.3 src/common/dist/zlib/compress.c \
src/common/dist/zlib/deflate.h 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.4 -r1.5 src/common/dist/zlib/crc32.c \
src/common/dist/zlib/inflate.c src/common/dist/zlib/zutil.h
cvs rdiff -u -r1.3 -r1.4 src/common/dist/zlib/deflate.c \
src/common/dist/zlib/inffast.c src/common/dist/zlib/trees.c \
src/common/dist/zlib/zlib.h
cvs rdiff -u -r1.1.1.1 -r1.2 src/common/dist/zlib/gzguts.h \
src/common/dist/zlib/gzwrite.c
cvs rdiff -u -r1.4 -r0 src/common/dist/zlib/gzio.c
cvs rdiff -u -r1.1.1.1 -r0 src/common/dist/zlib/as400/bndsrc \
src/common/dist/zlib/as400/compile.clp \
src/common/dist/zlib/as400/readme.txt src/common/dist/zlib/as400/zlib.inc
cvs rdiff -u -r1.2 -r0 src/common/dist/zlib/contrib/asm586/README.586
cvs rdiff -u -r1.1.1.1 -r0 src/common/dist/zlib/contrib/asm586/match.S
cvs rdiff -u -r1.1.1.1 -r0 src/common/dist/zlib/contrib/masm686/match.asm
cvs rdiff -u -r1.1.1.1 -r0 src/common/dist/zlib/contrib/masmx86/gvmat32.asm \
src/common/dist/zlib/contrib/masmx86/gvmat32c.c \
src/common/dist/zlib/contrib/masmx86/mkasm.bat
cvs rdiff -u -r1.1.1.1 -r0 \
src/common/dist/zlib/contrib/minizip/ChangeLogUnzip
cvs rdiff -u -r1.1.1.1 -r0 \
src/common/dist/zlib/contrib/vstudio/vc7/miniunz.vcproj \
src/common/dist/zlib/contrib/vstudio/vc7/minizip.vcproj \
src/common/dist/zlib/contrib/vstudio/vc7/testzlib.vcproj \
src/common/dist/zlib/contrib/vstudio/vc7/zlib.rc \
src/common/dist/zlib/contrib/vstudio/vc7/zlibstat.vcproj \
src/common/dist/zlib/contrib/vstudio/vc7/zlibvc.def \
src/common/dist/zlib/contrib/vstudio/vc7/zlibvc.sln \
src/common/dist/zlib/contrib/vstudio/vc7/zlibvc.vcproj
cvs rdiff -u -r1.1.1.1 -r0 \
src/common/dist/zlib/contrib/vstudio/vc8/miniunz.vcproj \
src/common/dist/zlib/contrib/vstudio/vc8/minizip.vcproj \
src/common/dist/zlib/contrib/vstudio/vc8/testzlib.vcproj \
src/common/dist/zlib/contrib/vstudio/vc8/testzlibdll.vcproj \
src/common/dist/zlib/contrib/vstudio/vc8/zlib.rc \
src/common/dist/zlib/contrib/vstudio/vc8/zlibstat.vcproj \
src/common/dist/zlib/contrib/vstudio/vc8/zlibvc.def \
src/common/dist/zlib/contrib/vstudio/vc8/zlibvc.sln \
src/common/dist/zlib/contrib/vstudio/vc8/zlibvc.vcproj
cvs rdiff -u -r1.1.1.1 -r0 src/common/dist/zlib/old/zlib.html
cvs rdiff -u -r1.1.1.1 -r0 src/common/dist/zlib/projects/README.projects
cvs rdiff -u -r1.1.1.1 -r0 src/common/dist/zlib/projects/visualc6/README.txt \
src/common/dist/zlib/projects/visualc6/example.dsp \
src/common/dist/zlib/projects/visualc6/minigzip.dsp \
src/common/dist/zlib/projects/visualc6/zlib.dsp \
src/common/dist/zlib/projects/visualc6/zlib.dsw
cvs rdiff -u -r1.1.1.1 -r0 src/common/dist/zlib/win32/Makefile.emx
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
