From owner-cvs-all  Wed Jan 15  2:47:34 2003
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 5245837B401; Wed, 15 Jan 2003 02:47:33 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id E6EA043EB2; Wed, 15 Jan 2003 02:47:32 -0800 (PST)
	(envelope-from murray@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h0FAlWfh019672;
	Wed, 15 Jan 2003 02:47:32 -0800 (PST)
	(envelope-from murray@repoman.freebsd.org)
Received: (from murray@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h0FAlW7f019671;
	Wed, 15 Jan 2003 02:47:32 -0800 (PST)
Message-Id: <200301151047.h0FAlW7f019671@repoman.freebsd.org>
From: Murray Stokely <murray@FreeBSD.org>
Date: Wed, 15 Jan 2003 02:47:32 -0800 (PST)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/contrib/isc-dhcp/client dhclient-script.8 dhclient.8
         dhclient.conf.5 dhclient.leases.5 src/contrib/isc-dhcp/client/scripts
         freebsd
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
List-ID: <cvs-all.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20cvs-all>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG

murray      2003/01/15 02:47:32 PST

  Modified files:
    contrib/isc-dhcp/client dhclient-script.8 dhclient.8 
                            dhclient.conf.5 dhclient.leases.5 
    contrib/isc-dhcp/client/scripts freebsd 
  Log:
  Resolve conflicts.
  
  Revision  Changes    Path
  1.9       +1 -0      src/contrib/isc-dhcp/client/dhclient-script.8
  1.11      +1 -1      src/contrib/isc-dhcp/client/dhclient.8
  1.11      +6 -5      src/contrib/isc-dhcp/client/dhclient.conf.5
  1.4       +1 -0      src/contrib/isc-dhcp/client/dhclient.leases.5
  1.21      +9 -3      src/contrib/isc-dhcp/client/scripts/freebsd

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message