From owner-cvs-all  Mon Mar 11 14:36:34 2002
Delivered-To: cvs-all@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP
	id 0BF1337B41B; Mon, 11 Mar 2002 14:36:27 -0800 (PST)
Received: (from green@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g2BMaRm24042;
	Mon, 11 Mar 2002 14:36:27 -0800 (PST)
	(envelope-from green)
Message-Id: <200203112236.g2BMaRm24042@freefall.freebsd.org>
From: Brian Feldman <green@FreeBSD.org>
Date: Mon, 11 Mar 2002 14:36:26 -0800 (PST)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/lib/libz adler32.c compress.c crc32.c deflate.c
         deflate.h example.c gzio.c infblock.c infcodes.c inffast.c
         inflate.c inftrees.c infutil.c maketree.c minigzip.c trees.c
         uncompr.c zconf.h zlib.3 zutil.c zutil.h
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
List-ID: <cvs-all.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20cvs-all>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG

green       2002/03/11 14:36:26 PST

  Modified files:
    lib/libz             adler32.c compress.c crc32.c deflate.c 
                         deflate.h example.c gzio.c infblock.c 
                         infcodes.c inffast.c inflate.c inftrees.c 
                         infutil.c maketree.c minigzip.c trees.c 
                         uncompr.c zconf.h zlib.3 zutil.c zutil.h 
  Log:
  Fix conflicts.
  
  Revision  Changes    Path
  1.7       +1 -1      src/lib/libz/adler32.c
  1.7       +1 -1      src/lib/libz/compress.c
  1.7       +1 -1      src/lib/libz/crc32.c
  1.7       +4 -4      src/lib/libz/deflate.c
  1.6       +1 -1      src/lib/libz/deflate.h
  1.7       +1 -1      src/lib/libz/example.c
  1.8       +1 -1      src/lib/libz/gzio.c
  1.4       +7 -5      src/lib/libz/infblock.c
  1.3       +3 -9      src/lib/libz/infcodes.c
  1.3       +30 -17    src/lib/libz/inffast.c
  1.3       +1 -1      src/lib/libz/inflate.c
  1.3       +4 -5      src/lib/libz/inftrees.c
  1.3       +1 -1      src/lib/libz/infutil.c
  1.3       +1 -1      src/lib/libz/maketree.c
  1.10      +1 -1      src/lib/libz/minigzip.c
  1.7       +1 -1      src/lib/libz/trees.c
  1.7       +1 -1      src/lib/libz/uncompr.c
  1.7       +2 -2      src/lib/libz/zconf.h
  1.5       +4 -4      src/lib/libz/zlib.3
  1.7       +1 -1      src/lib/libz/zutil.c
  1.6       +1 -1      src/lib/libz/zutil.h

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message