Doug Barton 3329c8935f Resolve conflicts in 8.3.6, generally in favor of the vendor code

2003-06-17 08:32:40 +00:00

..

addr

…

dig

…

dnskeygen

…

dnsquery

…

host

…

irpd

…

mkservdb

…

named

This commit was generated by cvs2svn to compensate for changes in r116464,

2003-06-17 08:25:13 +00:00

named-bootconf

…

named-xfer

Resolve conflicts in 8.3.6, generally in favor of the vendor code

2003-06-17 08:32:40 +00:00

ndc

This commit was generated by cvs2svn to compensate for changes in r116464,

2003-06-17 08:25:13 +00:00

nslookup

Resolve conflicts in 8.3.6, generally in favor of the vendor code

2003-06-17 08:32:40 +00:00

nsupdate

…

Makefile

…