From owner-cvs-src@FreeBSD.ORG  Sun Aug 15 23:37:10 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 8080816A4CE; Sun, 15 Aug 2004 23:37:10 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 6055743D53; Sun, 15 Aug 2004 23:37:10 +0000 (GMT)
	(envelope-from mbr@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 i7FNbApl024145;
	Sun, 15 Aug 2004 23:37:10 GMT
	(envelope-from mbr@repoman.freebsd.org)
Received: (from mbr@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7FNbArN024144;
	Sun, 15 Aug 2004 23:37:10 GMT
	(envelope-from mbr)
Message-Id: <200408152337.i7FNbArN024144@repoman.freebsd.org>
From: Martin Blapp <mbr@FreeBSD.org>
Date: Sun, 15 Aug 2004 23:37:10 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/contrib/isc-dhcp FREEBSD-upgrade
 src/contrib/isc-dhcp/client         dhclient.c
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: Sun, 15 Aug 2004 23:37:10 -0000

mbr         2004-08-15 23:37:10 UTC

  FreeBSD src repository

  Modified files:
    contrib/isc-dhcp     FREEBSD-upgrade 
    contrib/isc-dhcp/client dhclient.c 
  Log:
  Resolve conflicts from dhclient 3.0.1 final import.
  
  No functional changes in this import.
  
  Revision  Changes    Path
  1.22      +3 -5      src/contrib/isc-dhcp/FREEBSD-upgrade
  1.39      +1 -1      src/contrib/isc-dhcp/client/dhclient.c