From owner-cvs-all  Mon Apr  1  0: 2:25 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 1B28937B400; Mon,  1 Apr 2002 00:02:19 -0800 (PST)
Received: (from murray@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g3182Ju55184;
	Mon, 1 Apr 2002 00:02:19 -0800 (PST)
	(envelope-from murray)
Message-Id: <200204010802.g3182Ju55184@freefall.freebsd.org>
From: Murray Stokely <murray@FreeBSD.org>
Date: Mon, 1 Apr 2002 00:02:18 -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      2002/04/01 00:02:18 PST

  Modified files:
    contrib/isc-dhcp/client dhclient.c 
  Log:
  Resolve conflicts:
    * $FreeBSD$
    * connect std{in,out,err} (r1.19).
    * prefer strlcpy to strpy (r1.13).
    * quiet by default (r1.6).
    * document -D option.
  
  Revision  Changes    Path
  1.21      +41 -13    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