From owner-cvs-src@FreeBSD.ORG  Thu Mar 20 02:56:25 2008
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5DE671065676;
	Thu, 20 Mar 2008 02:56:25 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 2BD0A8FC26;
	Thu, 20 Mar 2008 02:56:25 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2K2uPJN069434;
	Thu, 20 Mar 2008 02:56:25 GMT
	(envelope-from delphij@repoman.freebsd.org)
Received: (from delphij@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2K2uPQC069433;
	Thu, 20 Mar 2008 02:56:25 GMT (envelope-from delphij)
Message-Id: <200803200256.m2K2uPQC069433@repoman.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Thu, 20 Mar 2008 02:56:25 +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/contrib/bzip2 bzip2.c bzlib.c
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, 20 Mar 2008 02:56:25 -0000

delphij     2008-03-20 02:56:25 UTC

  FreeBSD src repository

  Modified files:
    contrib/bzip2        bzip2.c bzlib.c 
  Log:
  Resolve conflicts.
  
  Revision  Changes    Path
  1.4       +4 -4      src/contrib/bzip2/bzip2.c
  1.4       +5 -4      src/contrib/bzip2/bzlib.c