From owner-cvs-all  Sun Mar 31 23:59:54 2002
Delivered-To: cvs-all@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP
	id 39F0637B41A; Sun, 31 Mar 2002 23:59:50 -0800 (PST)
Received: (from murray@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g317xo354622;
	Sun, 31 Mar 2002 23:59:50 -0800 (PST)
	(envelope-from murray)
Message-Id: <200204010759.g317xo354622@freefall.freebsd.org>
From: Murray Stokely <murray@FreeBSD.org>
Date: Sun, 31 Mar 2002 23:59:50 -0800 (PST)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/contrib/isc-dhcp/client clparse.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      2002/03/31 23:59:50 PST

  Modified files:
    contrib/isc-dhcp/client clparse.c 
  Log:
  Resolve conflicts:
    * $FreeBSD$ line.
    * Prefer strlcpy to strcpy (r1.6).
    * dhclient-script pathname.
  
  Revision  Changes    Path
  1.8       +20 -2     src/contrib/isc-dhcp/client/clparse.c

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