]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
Resolve conflicts :
authorMurray Stokely <murray@FreeBSD.org>
Tue, 19 Feb 2002 11:55:09 +0000 (11:55 +0000)
committerMurray Stokely <murray@FreeBSD.org>
Tue, 19 Feb 2002 11:55:09 +0000 (11:55 +0000)
commitc31fe933fcdb600f2a026883492f5b0471e1e1f9
tree8bf9a4a1b3a16fdf96d8ce086fb4d767b89f2a92
parent4f806343453f0bd27c22dea5a2943a1c8e6d5715
Resolve conflicts :
  * $FreeBSD$ line.
  * Prefer strlcpy to strcpy (r1.6).
  * dhclient-script pathname.
contrib/isc-dhcp/client/clparse.c