CVS commit: src/common/dist/zlib

["Christos Zoulas" <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Wed Nov 11 15:50:27 UTC 2026

Modified Files:
        src/common/dist/zlib: compress.c crc32.c deflate.c gzguts.h gzwrite.c
            infback.c inflate.c inftrees.c trees.c uncompr.c zconf.h zlib.h
            zutil.c
Removed Files:
        src/common/dist/zlib/contrib/blast: test.pk test.txt tester.cmake

Log Message:
merge conflicts between zlib-1.3.2 and 1.4.0


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 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/zutil.c
cvs rdiff -u -r1.8 -r1.9 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/gzguts.h \
    src/common/dist/zlib/gzwrite.c
cvs rdiff -u -r1.9 -r1.10 src/common/dist/zlib/inflate.c \
    src/common/dist/zlib/zlib.h
cvs rdiff -u -r1.7 -r1.8 src/common/dist/zlib/zconf.h
cvs rdiff -u -r1.1.1.1 -r0 src/common/dist/zlib/contrib/blast/test.pk \
    src/common/dist/zlib/contrib/blast/test.txt \
    src/common/dist/zlib/contrib/blast/tester.cmake

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