From owner-cvs-src@FreeBSD.ORG  Wed Jun 30 23:43:43 2004
Return-Path: <owner-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 1486316A4CE; Wed, 30 Jun 2004 23:43:43 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 0E40043D39; Wed, 30 Jun 2004 23:43:43 +0000 (GMT)
	(envelope-from tjr@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5UNhdrT056584;
	Wed, 30 Jun 2004 23:43:39 GMT
	(envelope-from tjr@repoman.freebsd.org)
Received: (from tjr@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5UNhdaW056583;
	Wed, 30 Jun 2004 23:43:39 GMT
	(envelope-from tjr)
Message-Id: <200406302343.i5UNhdaW056583@repoman.freebsd.org>
From: "Tim J. Robbins" <tjr@FreeBSD.org>
Date: Wed, 30 Jun 2004 23:43:39 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: ZLIB
Subject: cvs commit: src/lib/libz - Imported sources
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
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: Wed, 30 Jun 2004 23:43:43 -0000

tjr         2004-06-30 23:43:39 UTC

  FreeBSD src repository

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