From owner-cvs-all  Mon Feb  4 11:16:10 2002
Delivered-To: cvs-all@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP
	id 9EA4D37B425; Mon,  4 Feb 2002 11:15:34 -0800 (PST)
Received: (from nectar@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g14JFYV38662;
	Mon, 4 Feb 2002 11:15:34 -0800 (PST)
	(envelope-from nectar)
Message-Id: <200202041915.g14JFYV38662@freefall.freebsd.org>
From: Jacques Vidrine <nectar@FreeBSD.org>
Date: Mon, 4 Feb 2002 11:15:34 -0800 (PST)
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
         debug.c getinfo.c main.c src/contrib/bind/port/freebsd/include
         port_after.h
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
List-ID: <cvs-all.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20cvs-all>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG

nectar      2002/02/04 11:15:34 PST

  Modified files:
    contrib/bind/bin/named-xfer named-xfer.c 
    contrib/bind/bin/nslookup debug.c getinfo.c main.c 
    contrib/bind/port/freebsd/include port_after.h 
  Log:
  Resolve conflicts after import of ISC BIND 8.3.1-REL.
  
  Revision  Changes    Path
  1.8       +522 -642  src/contrib/bind/bin/named-xfer/named-xfer.c
  1.6       +21 -21    src/contrib/bind/bin/nslookup/debug.c
  1.7       +17 -18    src/contrib/bind/bin/nslookup/getinfo.c
  1.6       +16 -15    src/contrib/bind/bin/nslookup/main.c
  1.12      +93 -1     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