Date: Tue, 31 Oct 2000 04:38:23 -0800 (PST) From: Jeroen Ruigrok van der Werven <asmodai@FreeBSD.org> To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/contrib/bind/bin/named Makefile src/contrib/bind/bin/named-xfer named-xfer.c src/contrib/bind/bin/nslookup debug.c getinfo.c Message-ID: <200010311238.EAA16104@freefall.freebsd.org>
index | next in thread | raw e-mail
asmodai 2000/10/31 04:38:23 PST
Modified files:
contrib/bind/bin/named Makefile
contrib/bind/bin/named-xfer named-xfer.c
contrib/bind/bin/nslookup debug.c getinfo.c
Log:
Resolve conflicts.
Revision Changes Path
1.5 +4 -3 src/contrib/bind/bin/named/Makefile
1.5 +6 -3 src/contrib/bind/bin/named-xfer/named-xfer.c
1.4 +10 -3 src/contrib/bind/bin/nslookup/debug.c
1.4 +6 -6 src/contrib/bind/bin/nslookup/getinfo.c
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
home |
help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200010311238.EAA16104>
