From owner-cvs-all  Mon May 13 12:33:57 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 50D1737B406; Mon, 13 May 2002 12:33:24 -0700 (PDT)
Received: (from nectar@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g4DJXOt76724;
	Mon, 13 May 2002 12:33:24 -0700 (PDT)
	(envelope-from nectar)
Message-Id: <200205131933.g4DJXOt76724@freefall.freebsd.org>
From: Jacques Vidrine <nectar@FreeBSD.org>
Date: Mon, 13 May 2002 12:33:24 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/contrib/bind/bin/nslookup commands.l 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/05/13 12:33:24 PDT

  Modified files:
    contrib/bind/bin/nslookup commands.l getinfo.c main.c 
    contrib/bind/port/freebsd/include port_after.h 
  Log:
  Resolve conflicts after import of ISC BIND 8.3.2-T1B.
  
  Revision  Changes    Path
  1.9       +5 -4      src/contrib/bind/bin/nslookup/commands.l
  1.8       +329 -89   src/contrib/bind/bin/nslookup/getinfo.c
  1.7       +170 -69   src/contrib/bind/bin/nslookup/main.c
  1.13      +34 -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