From owner-cvs-all@FreeBSD.ORG  Thu Mar 23 14:02:41 2006
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2B01716A400;
	Thu, 23 Mar 2006 14:02:41 +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 AAC6D43D68;
	Thu, 23 Mar 2006 14:02:38 +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 k2NE2bHC078132;
	Thu, 23 Mar 2006 14:02:37 GMT (envelope-from des@repoman.freebsd.org)
Received: (from des@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2NE2b8d078131;
	Thu, 23 Mar 2006 14:02:37 GMT (envelope-from des)
Message-Id: <200603231402.k2NE2b8d078131@repoman.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Thu, 23 Mar 2006 14:02:37 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: ZLIB
Cc: 
Subject: cvs commit: src/lib/libz - Imported sources
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Mar 2006 14:02:41 -0000

des         2006-03-23 14:02:37 UTC

  FreeBSD src repository

  src/lib/libz - Imported sources
  Update of /home/ncvs/src/lib/libz
  In directory repoman.freebsd.org:/tmp/cvs-serv78119
  
  Log Message:
  Vendor import of ZLib 1.2.3.
  
  Status:
  
  Vendor Tag:	ZLIB
  Release Tags:	v1_2_3
  		
  U src/lib/libz/ChangeLog
  C src/lib/libz/deflate.h
  C src/lib/libz/zutil.h
  C src/lib/libz/inftrees.c
  C src/lib/libz/deflate.c
  C src/lib/libz/zutil.c
  U src/lib/libz/inflate.h
  U src/lib/libz/crc32.h
  U src/lib/libz/zlib.h
  C src/lib/libz/inflate.c
  C src/lib/libz/crc32.c
  C src/lib/libz/zlib.3
  U src/lib/libz/inffixed.h
  C src/lib/libz/compress.c
  C src/lib/libz/zconf.h
  U src/lib/libz/inffast.h
  U src/lib/libz/algorithm.txt
  U src/lib/libz/uncompr.c
  C src/lib/libz/inffast.c
  C src/lib/libz/adler32.c
  U src/lib/libz/trees.h
  C src/lib/libz/infback.c
  U src/lib/libz/README
  C src/lib/libz/trees.c
  C src/lib/libz/gzio.c
  U src/lib/libz/FAQ
  C src/lib/libz/minigzip.c
  C src/lib/libz/example.c
  C src/lib/libz/inftrees.h
  
  18 conflicts created by this import.
  Use the following command to help the merge:
  
  	cvs checkout -jZLIB:yesterday -jZLIB src/lib/libz