Resolve conflicts :

* $FreeBSD$ line.
  * Prefer strlcpy to strcpy (r1.6).
  * dhclient-script pathname.
This commit is contained in:
Murray Stokely 2002-02-19 11:55:09 +00:00
parent 4f80634345
commit c31fe933fc

File diff suppressed because it is too large Load Diff