Module Name:	basesrc
Committed By:	mellon
Date:		Thu Jul 20 05:59:21 UTC 2000

Modified Files:
	basesrc/usr.sbin/dhcp/client: clparse.c dhclient.c
	basesrc/usr.sbin/dhcp/common: dhcp-options.5
	basesrc/usr.sbin/dhcp/includes: dhcpd.h version.h
	basesrc/usr.sbin/dhcp/omapip: dispatch.c
	basesrc/usr.sbin/dhcp/relay: dhcrelay.c
	basesrc/usr.sbin/dhcp/server: dhcpd.c dhcpd.conf.5

Log Message:
Merge 20000719 changes


To generate a diff of this commit:
cvs rdiff -r1.6 -r1.7 basesrc/usr.sbin/dhcp/client/clparse.c
cvs rdiff -r1.27 -r1.28 basesrc/usr.sbin/dhcp/client/dhclient.c
cvs rdiff -r1.5 -r1.6 basesrc/usr.sbin/dhcp/common/dhcp-options.5
cvs rdiff -r1.14 -r1.15 basesrc/usr.sbin/dhcp/includes/dhcpd.h
cvs rdiff -r1.3 -r1.4 basesrc/usr.sbin/dhcp/includes/version.h
cvs rdiff -r1.3 -r1.4 basesrc/usr.sbin/dhcp/omapip/dispatch.c
cvs rdiff -r1.4 -r1.5 basesrc/usr.sbin/dhcp/relay/dhcrelay.c
cvs rdiff -r1.20 -r1.21 basesrc/usr.sbin/dhcp/server/dhcpd.c
cvs rdiff -r1.9 -r1.10 basesrc/usr.sbin/dhcp/server/dhcpd.conf.5

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.