cvs commit: src/contrib/bind/bin/named-xfer named-xfer.c
src/contrib/bind/bin/nslookup
getinfo.c main.c src/contrib/bind/doc/man dig.1
src/contrib/bind/port/freebsd/include port_after.h
Doug Barton
dougb at FreeBSD.org
Tue Jun 17 01:32:45 PDT 2003
dougb 2003/06/17 01:32:41 PDT
FreeBSD src repository
Modified files:
contrib/bind/bin/named-xfer named-xfer.c
contrib/bind/bin/nslookup getinfo.c main.c
contrib/bind/doc/man dig.1
contrib/bind/port/freebsd/include port_after.h
Log:
Resolve conflicts in 8.3.6, generally in favor of the vendor code
Revision Changes Path
1.10 +44 -41 src/contrib/bind/bin/named-xfer/named-xfer.c
1.12 +16 -17 src/contrib/bind/bin/nslookup/getinfo.c
1.9 +2 -2 src/contrib/bind/bin/nslookup/main.c
1.6 +3 -3 src/contrib/bind/doc/man/dig.1
1.15 +19 -9 src/contrib/bind/port/freebsd/include/port_after.h
More information about the cvs-src
mailing list