Date: Fri, 26 May 2000 00:24:15 -0700 (PDT) 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 commands.l main.c src/contrib/bind/port/freebsd/include port_after.h Message-ID: <200005260724.AAA92790@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
asmodai 2000/05/26 00:24:15 PDT
Modified files:
contrib/bind/bin/named Makefile
contrib/bind/bin/named-xfer named-xfer.c
contrib/bind/bin/nslookup commands.l main.c
contrib/bind/port/freebsd/include port_after.h
Log:
Resolve conflicts.
Revision Changes Path
1.4 +4 -4 src/contrib/bind/bin/named/Makefile
1.4 +432 -182 src/contrib/bind/bin/named-xfer/named-xfer.c
1.5 +2 -6 src/contrib/bind/bin/nslookup/commands.l
1.4 +3 -3 src/contrib/bind/bin/nslookup/main.c
1.7 +1 -2 src/contrib/bind/port/freebsd/include/port_after.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?200005260724.AAA92790>