From owner-cvs-all Fri Feb 27 22:09:05 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id WAA26661 for cvs-all-outgoing; Fri, 27 Feb 1998 22:09:05 -0800 (PST) (envelope-from owner-cvs-all@FreeBSD.ORG) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id WAA26656; Fri, 27 Feb 1998 22:09:03 -0800 (PST) (envelope-from steve@FreeBSD.org) From: Steve Price Received: (from steve@localhost) by freefall.freebsd.org (8.8.8/8.8.5) id WAA02401; Fri, 27 Feb 1998 22:08:19 -0800 (PST) Date: Fri, 27 Feb 1998 22:08:19 -0800 (PST) Message-Id: <199802280608.WAA02401@freefall.freebsd.org> To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-lib@FreeBSD.ORG Subject: cvs commit: src/lib/libz adler32.c compress.c crc32.c deflate.c deflate.h example.c gzio.c minigzip.c trees.c uncompr.c zconf.h zutil.c zutil.h Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk steve 1998/02/27 22:08:19 PST Modified files: lib/libz adler32.c compress.c crc32.c deflate.c deflate.h example.c gzio.c minigzip.c trees.c uncompr.c zconf.h zutil.c zutil.h Log: Merge conflicts. Revision Changes Path 1.3 +2 -2 src/lib/libz/adler32.c 1.3 +24 -13 src/lib/libz/compress.c 1.3 +6 -6 src/lib/libz/crc32.c 1.3 +212 -71 src/lib/libz/deflate.c 1.3 +44 -1 src/lib/libz/deflate.h 1.3 +71 -24 src/lib/libz/example.c 1.3 +365 -32 src/lib/libz/gzio.c 1.3 +97 -26 src/lib/libz/minigzip.c 1.3 +113 -38 src/lib/libz/trees.c 1.3 +3 -3 src/lib/libz/uncompr.c 1.3 +80 -12 src/lib/libz/zconf.h 1.3 +18 -4 src/lib/libz/zutil.c 1.3 +41 -23 src/lib/libz/zutil.h To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message