From owner-cvs-all  Tue Oct 31  4:38:27 2000
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 2690537B479; Tue, 31 Oct 2000 04:38:24 -0800 (PST)
Received: (from asmodai@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id EAA16104;
	Tue, 31 Oct 2000 04:38:23 -0800 (PST)
	(envelope-from asmodai@FreeBSD.org)
Message-Id: <200010311238.EAA16104@freefall.freebsd.org>
From: Jeroen Ruigrok van der Werven <asmodai@FreeBSD.org>
Date: Tue, 31 Oct 2000 04:38:23 -0800 (PST)
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 debug.c getinfo.c
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

asmodai     2000/10/31 04:38:23 PST

  Modified files:
    contrib/bind/bin/named Makefile 
    contrib/bind/bin/named-xfer named-xfer.c 
    contrib/bind/bin/nslookup debug.c getinfo.c 
  Log:
  Resolve conflicts.
  
  Revision  Changes    Path
  1.5       +4 -3      src/contrib/bind/bin/named/Makefile
  1.5       +6 -3      src/contrib/bind/bin/named-xfer/named-xfer.c
  1.4       +10 -3     src/contrib/bind/bin/nslookup/debug.c
  1.4       +6 -6      src/contrib/bind/bin/nslookup/getinfo.c



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