Date: Tue, 2 Sep 2003 04:13:21 -0700 (PDT) From: Martin Blapp <mbr@FreeBSD.org> To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/contrib/isc-dhcp/client clparse.c dhclient.conf.5 src/contrib/isc-dhcp/common dhcp-options.5 tables.c src/contrib/isc-dhcp/includes dhcpd.h Message-ID: <200309021113.h82BDLB0057495@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
mbr 2003/09/02 04:13:21 PDT
FreeBSD src repository
Modified files:
contrib/isc-dhcp/client clparse.c dhclient.conf.5
contrib/isc-dhcp/common dhcp-options.5 tables.c
contrib/isc-dhcp/includes dhcpd.h
Log:
Resolve conflicts.
Revision Changes Path
1.11 +17 -10 src/contrib/isc-dhcp/client/clparse.c
1.13 +2 -2 src/contrib/isc-dhcp/client/dhclient.conf.5
1.6 +15 -15 src/contrib/isc-dhcp/common/dhcp-options.5
1.10 +660 -659 src/contrib/isc-dhcp/common/tables.c
1.8 +5 -0 src/contrib/isc-dhcp/includes/dhcpd.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200309021113.h82BDLB0057495>