From owner-cvs-all  Sun Jun 30 18:20:35 2002
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id E4EB237B400; Sun, 30 Jun 2002 18:20:29 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id A35CF43E09; Sun, 30 Jun 2002 18:20:29 -0700 (PDT)
	(envelope-from dougb@FreeBSD.org)
Received: from freefall.freebsd.org (dougb@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g611KTJU088912;
	Sun, 30 Jun 2002 18:20:29 -0700 (PDT)
	(envelope-from dougb@freefall.freebsd.org)
Received: (from dougb@localhost)
	by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g611KTM4088911;
	Sun, 30 Jun 2002 18:20:29 -0700 (PDT)
Message-Id: <200207010120.g611KTM4088911@freefall.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Sun, 30 Jun 2002 18:20:28 -0700 (PDT)
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
         commands.l getinfo.c main.c src/contrib/bind/doc/man dig.1 host.1
         src/contrib/bind/port/freebsd/include port_before.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

dougb       2002/06/30 18:20:28 PDT

  Modified files:
    contrib/bind/bin/named-xfer named-xfer.c 
    contrib/bind/bin/nslookup commands.l getinfo.c main.c 
    contrib/bind/doc/man dig.1 host.1 
    contrib/bind/port/freebsd/include port_before.h 
  Log:
  Resolve conflicts, generally in favor of the vendor version.
  
  Revision  Changes    Path
  1.9       +7 -1      src/contrib/bind/bin/named-xfer/named-xfer.c
  1.10      +14 -14    src/contrib/bind/bin/nslookup/commands.l
  1.11      +9 -14     src/contrib/bind/bin/nslookup/getinfo.c
  1.8       +17 -6     src/contrib/bind/bin/nslookup/main.c
  1.5       +11 -5     src/contrib/bind/doc/man/dig.1
  1.6       +27 -39    src/contrib/bind/doc/man/host.1
  1.3       +6 -0      src/contrib/bind/port/freebsd/include/port_before.h

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message