Subject: CVS commit: src
To: None <source-changes@netbsd.org>
From: Ted Lemon <mellon@netbsd.org>
List: source-changes
Date: 04/09/1999 10:55:02
Module Name:	src
Committed By:	mellon
Date:		Fri Apr  9 17:55:02 UTC 1999

Modified Files:
	src/usr.sbin/dhcp: README RELNOTES
	src/usr.sbin/dhcp/client: dhclient.c
	src/usr.sbin/dhcp/common: dhcp-options.5
	src/usr.sbin/dhcp/includes: dhcpd.h
	src/usr.sbin/dhcp/server: bootp.c dhcp.c dhcpd.c dhcpd.conf.5
Log Message:
Resolve conflicts from Patchlevel 25 import.