From owner-cvs-all  Wed Jan 15  2:44: 7 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 86FED37B401; Wed, 15 Jan 2003 02:44:06 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 2FF0D43ED8; Wed, 15 Jan 2003 02:44:06 -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 h0FAi6fh019524;
	Wed, 15 Jan 2003 02:44:06 -0800 (PST)
	(envelope-from murray@repoman.freebsd.org)
Received: (from murray@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h0FAi5pQ019523;
	Wed, 15 Jan 2003 02:44:05 -0800 (PST)
Message-Id: <200301151044.h0FAi5pQ019523@repoman.freebsd.org>
From: Murray Stokely <murray@FreeBSD.org>
Date: Wed, 15 Jan 2003 02:44:05 -0800 (PST)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/contrib/isc-dhcp/client dhclient.c
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:44:05 PST

  Modified files:
    contrib/isc-dhcp/client dhclient.c 
  Log:
  Resolve conflicts.
  
  (import approved by: re)
  
  Revision  Changes    Path
  1.23      +15 -15    src/contrib/isc-dhcp/client/dhclient.c

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