From owner-cvs-all  Fri May 26  0:24:18 2000
Delivered-To: cvs-all@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP
	id 8835C37B675; Fri, 26 May 2000 00:24:15 -0700 (PDT)
	(envelope-from asmodai@FreeBSD.org)
Received: (from asmodai@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id AAA92790;
	Fri, 26 May 2000 00:24:15 -0700 (PDT)
	(envelope-from asmodai@FreeBSD.org)
Message-Id: <200005260724.AAA92790@freefall.freebsd.org>
From: Jeroen Ruigrok van der Werven <asmodai@FreeBSD.org>
Date: Fri, 26 May 2000 00:24:15 -0700 (PDT)
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
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

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