Module Name: src Committed By: tls Date: Sun Jun 15 17:37:22 UTC 2014
Update of /cvsroot/src/external/zlib/pigz/dist In directory ivanova.netbsd.org:/tmp/cvs-serv11940 Log Message: pigz 2.3.1 Status: Vendor Tag: adler Release Tags: pigz-2-3-1 U src/external/zlib/pigz/dist/Makefile C src/external/zlib/pigz/dist/pigz.1 U src/external/zlib/pigz/dist/pigz.c U src/external/zlib/pigz/dist/pigz.pdf U src/external/zlib/pigz/dist/pigz.spec U src/external/zlib/pigz/dist/README U src/external/zlib/pigz/dist/yarn.c U src/external/zlib/pigz/dist/yarn.h N src/external/zlib/pigz/dist/zopfli/blocksplitter.c N src/external/zlib/pigz/dist/zopfli/blocksplitter.h N src/external/zlib/pigz/dist/zopfli/cache.c N src/external/zlib/pigz/dist/zopfli/cache.h N src/external/zlib/pigz/dist/zopfli/CONTRIBUTORS N src/external/zlib/pigz/dist/zopfli/COPYING N src/external/zlib/pigz/dist/zopfli/deflate.c N src/external/zlib/pigz/dist/zopfli/deflate.h N src/external/zlib/pigz/dist/zopfli/gzip_container.c N src/external/zlib/pigz/dist/zopfli/gzip_container.h N src/external/zlib/pigz/dist/zopfli/hash.c N src/external/zlib/pigz/dist/zopfli/hash.h N src/external/zlib/pigz/dist/zopfli/katajainen.c N src/external/zlib/pigz/dist/zopfli/katajainen.h N src/external/zlib/pigz/dist/zopfli/lz77.c N src/external/zlib/pigz/dist/zopfli/lz77.h N src/external/zlib/pigz/dist/zopfli/makefile N src/external/zlib/pigz/dist/zopfli/README N src/external/zlib/pigz/dist/zopfli/squeeze.c N src/external/zlib/pigz/dist/zopfli/squeeze.h N src/external/zlib/pigz/dist/zopfli/tree.c N src/external/zlib/pigz/dist/zopfli/tree.h N src/external/zlib/pigz/dist/zopfli/util.c N src/external/zlib/pigz/dist/zopfli/util.h N src/external/zlib/pigz/dist/zopfli/zlib_container.c N src/external/zlib/pigz/dist/zopfli/zlib_container.h N src/external/zlib/pigz/dist/zopfli/zopfli.h N src/external/zlib/pigz/dist/zopfli/zopfli_bin.c N src/external/zlib/pigz/dist/zopfli/zopfli_lib.c 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jadler:yesterday -jadler src/external/zlib/pigz/dist