cvs commit: src/contrib/isc-dhcp FREEBSD-upgrade src/contrib/isc-dhcp/client dhclient.c

[Martin Blapp]

mbr         2004-08-15 23:37:10 UTC

  FreeBSD src repository

  Modified files:
    contrib/isc-dhcp     FREEBSD-upgrade 
    contrib/isc-dhcp/client dhclient.c 
  Log:
  Resolve conflicts from dhclient 3.0.1 final import.
  
  No functional changes in this import.
  
  Revision  Changes    Path
  1.22      +3 -5      src/contrib/isc-dhcp/FREEBSD-upgrade
  1.39      +1 -1      src/contrib/isc-dhcp/client/dhclient.c