From owner-cvs-all Mon Sep 30 1:45:15 2002 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 84DF637B407; Mon, 30 Sep 2002 01:45:14 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 33D5A43E4A; Mon, 30 Sep 2002 01:45:14 -0700 (PDT) (envelope-from murray@FreeBSD.org) Received: from freefall.freebsd.org (murray@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8U8jECo094438; Mon, 30 Sep 2002 01:45:14 -0700 (PDT) (envelope-from murray@freefall.freebsd.org) Received: (from murray@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8U8jEt7094437; Mon, 30 Sep 2002 01:45:14 -0700 (PDT) Message-Id: <200209300845.g8U8jEt7094437@freefall.freebsd.org> From: Murray Stokely Date: Mon, 30 Sep 2002 01:45:14 -0700 (PDT) To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/contrib/isc-dhcp/client dhclient-script.8 dhclient.c dhclient.conf.5 X-FreeBSD-CVS-Branch: HEAD Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG murray 2002/09/30 01:45:13 PDT Modified files: contrib/isc-dhcp/client dhclient-script.8 dhclient.c dhclient.conf.5 Log: Resolve conflicts. Revision Changes Path 1.8 +1 -1 src/contrib/isc-dhcp/client/dhclient-script.8 1.22 +7 -4 src/contrib/isc-dhcp/client/dhclient.c 1.10 +1 -1 src/contrib/isc-dhcp/client/dhclient.conf.5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message