Date: Sat, 26 Jun 2004 10:37:42 +0000 (UTC) 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 ANONCVS CHANGES COPYRIGHT FREEBSD-upgrade src/contrib/isc-dhcp/client clparse.c dhclient-script.8 dhclient.8 dhclient.c dhclient.conf.5 dhclient.leases.5 src/contrib/isc-dhcp/client/scripts freebsd ... Message-ID: <200406261037.i5QAbgUD058890@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
mbr 2004-06-26 10:37:42 UTC
FreeBSD src repository
Modified files:
contrib/isc-dhcp FREEBSD-upgrade
contrib/isc-dhcp/client clparse.c dhclient-script.8 dhclient.8
dhclient.c dhclient.conf.5
dhclient.leases.5
contrib/isc-dhcp/client/scripts freebsd
contrib/isc-dhcp/common dhcp-options.5 dispatch.c tables.c
contrib/isc-dhcp/includes dhcpd.h
contrib/isc-dhcp/includes/cf freebsd.h
Removed files:
contrib/isc-dhcp ANONCVS CHANGES COPYRIGHT
Log:
Resolve conflicts.
Revision Changes Path
1.2 +0 -129 src/contrib/isc-dhcp/ANONCVS (dead)
1.2 +0 -104 src/contrib/isc-dhcp/CHANGES (dead)
1.2 +0 -17 src/contrib/isc-dhcp/COPYRIGHT (dead)
1.20 +3 -3 src/contrib/isc-dhcp/FREEBSD-upgrade
1.12 +27 -34 src/contrib/isc-dhcp/client/clparse.c
1.11 +26 -33 src/contrib/isc-dhcp/client/dhclient-script.8
1.15 +22 -17 src/contrib/isc-dhcp/client/dhclient.8
1.37 +43 -37 src/contrib/isc-dhcp/client/dhclient.c
1.14 +25 -32 src/contrib/isc-dhcp/client/dhclient.conf.5
1.6 +25 -34 src/contrib/isc-dhcp/client/dhclient.leases.5
1.27 +1 -1 src/contrib/isc-dhcp/client/scripts/freebsd
1.7 +25 -32 src/contrib/isc-dhcp/common/dhcp-options.5
1.5 +20 -29 src/contrib/isc-dhcp/common/dispatch.c
1.11 +20 -29 src/contrib/isc-dhcp/common/tables.c
1.7 +19 -28 src/contrib/isc-dhcp/includes/cf/freebsd.h
1.9 +19 -28 src/contrib/isc-dhcp/includes/dhcpd.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200406261037.i5QAbgUD058890>