From owner-cvs-src@FreeBSD.ORG  Thu Mar 23 14:09:22 2006
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B0AE216A401;
	Thu, 23 Mar 2006 14:09:22 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7714043D48;
	Thu, 23 Mar 2006 14:09:22 +0000 (GMT) (envelope-from des@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2NE9Maf078380;
	Thu, 23 Mar 2006 14:09:22 GMT (envelope-from des@repoman.freebsd.org)
Received: (from des@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2NE9MNN078379;
	Thu, 23 Mar 2006 14:09:22 GMT (envelope-from des)
Message-Id: <200603231409.k2NE9MNN078379@repoman.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Thu, 23 Mar 2006 14:09:22 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/lib/libz adler32.c compress.c crc32.c deflate.c
 deflate.h example.c gzio.c infback.c inffast.c inflate.c
 inftrees.c inftrees.h minigzip.c trees.c zconf.h zlib.3 zutil.c
 zutil.h
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Mar 2006 14:09:22 -0000

des         2006-03-23 14:09:22 UTC

  FreeBSD src repository

  Modified files:
    lib/libz             adler32.c compress.c crc32.c deflate.c 
                         deflate.h example.c gzio.c infback.c 
                         inffast.c inflate.c inftrees.c inftrees.h 
                         minigzip.c trees.c zconf.h zlib.3 zutil.c 
                         zutil.h 
  Log:
  Resolve conflicts.
  
  Revision  Changes    Path
  1.10      +95 -20    src/lib/libz/adler32.c
  1.10      +1 -1      src/lib/libz/compress.c
  1.10      +96 -6     src/lib/libz/crc32.c
  1.10      +258 -24   src/lib/libz/deflate.c
  1.9       +8 -2      src/lib/libz/deflate.h
  1.10      +1 -3      src/lib/libz/example.c
  1.12      +35 -18    src/lib/libz/gzio.c
  1.4       +6 -5      src/lib/libz/infback.c
  1.6       +13 -0     src/lib/libz/inffast.c
  1.7       +110 -16   src/lib/libz/inflate.c
  1.7       +5 -4      src/lib/libz/inftrees.c
  1.3       +1 -1      src/lib/libz/inftrees.h
  1.15      +4 -4      src/lib/libz/minigzip.c
  1.10      +20 -16    src/lib/libz/trees.c
  1.10      +10 -4     src/lib/libz/zconf.h
  1.9       +3 -3      src/lib/libz/zlib.3
  1.10      +16 -17    src/lib/libz/zutil.c
  1.9       +18 -12    src/lib/libz/zutil.h