Date: Sun, 30 Jun 2002 18:20:28 -0700 (PDT) From: Doug Barton <dougb@FreeBSD.org> To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/contrib/bind/bin/named-xfer named-xfer.c src/contrib/bind/bin/nslookup commands.l getinfo.c main.c src/contrib/bind/doc/man dig.1 host.1 src/contrib/bind/port/freebsd/include port_before.h Message-ID: <200207010120.g611KTM4088911@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
dougb 2002/06/30 18:20:28 PDT
Modified files:
contrib/bind/bin/named-xfer named-xfer.c
contrib/bind/bin/nslookup commands.l getinfo.c main.c
contrib/bind/doc/man dig.1 host.1
contrib/bind/port/freebsd/include port_before.h
Log:
Resolve conflicts, generally in favor of the vendor version.
Revision Changes Path
1.9 +7 -1 src/contrib/bind/bin/named-xfer/named-xfer.c
1.10 +14 -14 src/contrib/bind/bin/nslookup/commands.l
1.11 +9 -14 src/contrib/bind/bin/nslookup/getinfo.c
1.8 +17 -6 src/contrib/bind/bin/nslookup/main.c
1.5 +11 -5 src/contrib/bind/doc/man/dig.1
1.6 +27 -39 src/contrib/bind/doc/man/host.1
1.3 +6 -0 src/contrib/bind/port/freebsd/include/port_before.h
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200207010120.g611KTM4088911>