From owner-cvs-src@FreeBSD.ORG  Wed May 11 03:47:49 2005
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 44B6816A4CE; Wed, 11 May 2005 03:47:49 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 310A643D6D; Wed, 11 May 2005 03:47:49 +0000 (GMT)
	(envelope-from kientzle@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 j4B3ln8F031760;
	Wed, 11 May 2005 03:47:49 GMT
	(envelope-from kientzle@repoman.freebsd.org)
Received: (from kientzle@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j4B3lnW6031759;
	Wed, 11 May 2005 03:47:49 GMT
	(envelope-from kientzle)
Message-Id: <200505110347.j4B3lnW6031759@repoman.freebsd.org>
From: Tim Kientzle <kientzle@FreeBSD.org>
Date: Wed, 11 May 2005 03:47:49 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/lib/libz adler32.c compress.c crc32.c deflate.c
 deflate.h example.c infback.c inffast.c inflate.c inftrees.c
 trees.c uncompr.c zlib.3 zutil.c zutil.h
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, 11 May 2005 03:47:49 -0000

kientzle    2005-05-11 03:47:49 UTC

  FreeBSD src repository

  Modified files:
    lib/libz             adler32.c compress.c crc32.c deflate.c 
                         deflate.h example.c infback.c inffast.c 
                         inflate.c inftrees.c trees.c uncompr.c 
                         zlib.3 zutil.c zutil.h 
  Log:
  Since the FreeBSD local modifications are mostly trivial (consisting
  primarily of pointless $FreeBSD$ tags), sync most files in HEAD with
  those in the ZLIB branch.  This minimizes the differences between
  HEAD and ZLIB and should simplify future imports.
  
  After this, there are only three files with local modifications
  (gzio.c, minigzip.c, and zconf.h) and two non-vendor files
  (Makefile, zopen.c).  The rest exactly match the vendor distribution.
  
  PR:             i386/76294
  MFC after:      2 weeks
  
  Revision  Changes    Path
  1.9       +1 -2      src/lib/libz/adler32.c
  1.9       +1 -2      src/lib/libz/compress.c
  1.9       +50 -29    src/lib/libz/crc32.c
  1.9       +3 -6      src/lib/libz/deflate.c
  1.8       +1 -2      src/lib/libz/deflate.h
  1.9       +1 -2      src/lib/libz/example.c
  1.3       +2 -2      src/lib/libz/infback.c
  1.5       +2 -5      src/lib/libz/inffast.c
  1.6       +3 -5      src/lib/libz/inflate.c
  1.5       +12 -8     src/lib/libz/inftrees.c
  1.9       +3 -4      src/lib/libz/trees.c
  1.9       +1 -2      src/lib/libz/uncompr.c
  1.8       +3 -5      src/lib/libz/zlib.3
  1.9       +1 -2      src/lib/libz/zutil.c
  1.8       +7 -2      src/lib/libz/zutil.h