]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
Resolve conflicts.
authorasmodai <asmodai@FreeBSD.org>
Tue, 31 Oct 2000 12:38:22 +0000 (12:38 +0000)
committerasmodai <asmodai@FreeBSD.org>
Tue, 31 Oct 2000 12:38:22 +0000 (12:38 +0000)
commiteab5bada7501d3f89cca4d4ab173b64dd4ef4f5d
tree84bedae8d42d8eb34de3c24ae89ace90618dd15a
parentb5459c5b45e8d87dcdb3d5a0ddc31ca631a18480
Resolve conflicts.
contrib/bind/bin/named-xfer/named-xfer.c
contrib/bind/bin/named/Makefile
contrib/bind/bin/nslookup/debug.c
contrib/bind/bin/nslookup/getinfo.c