From owner-cvs-src@FreeBSD.ORG  Tue Jun 17 01:32:45 2003
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id E63C337B401; Tue, 17 Jun 2003 01:32:41 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 5678343F93; Tue, 17 Jun 2003 01:32:41 -0700 (PDT)
	(envelope-from dougb@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5H8Wf0U081063;
	Tue, 17 Jun 2003 01:32:41 -0700 (PDT)
	(envelope-from dougb@repoman.freebsd.org)
Received: (from dougb@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5H8WfxG081059;
	Tue, 17 Jun 2003 01:32:41 -0700 (PDT)
Message-Id: <200306170832.h5H8WfxG081059@repoman.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Tue, 17 Jun 2003 01:32:41 -0700 (PDT)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/contrib/bind/bin/named-xfer named-xfer.c
 src/contrib/bind/bin/nslookup
 getinfo.c main.c src/contrib/bind/doc/man dig.1
 src/contrib/bind/port/freebsd/include port_after.h
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Jun 2003 08:32:45 -0000

dougb       2003/06/17 01:32:41 PDT

  FreeBSD src repository

  Modified files:
    contrib/bind/bin/named-xfer named-xfer.c 
    contrib/bind/bin/nslookup getinfo.c main.c 
    contrib/bind/doc/man dig.1 
    contrib/bind/port/freebsd/include port_after.h 
  Log:
  Resolve conflicts in 8.3.6, generally in favor of the vendor code
  
  Revision  Changes    Path
  1.10      +44 -41    src/contrib/bind/bin/named-xfer/named-xfer.c
  1.12      +16 -17    src/contrib/bind/bin/nslookup/getinfo.c
  1.9       +2 -2      src/contrib/bind/bin/nslookup/main.c
  1.6       +3 -3      src/contrib/bind/doc/man/dig.1
  1.15      +19 -9     src/contrib/bind/port/freebsd/include/port_after.h