From owner-cvs-all  Sun Jan 28 15: 7:11 2001
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 1E84F37B402; Sun, 28 Jan 2001 15:06:49 -0800 (PST)
Received: (from asmodai@localhost)
	by freefall.freebsd.org (8.11.1/8.11.1) id f0SN6np50774;
	Sun, 28 Jan 2001 15:06:49 -0800 (PST)
	(envelope-from asmodai)
Message-Id: <200101282306.f0SN6np50774@freefall.freebsd.org>
From: Jeroen Ruigrok van der Werven <asmodai@FreeBSD.org>
Date: Sun, 28 Jan 2001 15:06:49 -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 commands.l 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
X-Loop: FreeBSD.ORG

asmodai     2001/01/28 15:06:48 PST

  Modified files:
    contrib/bind/bin/named Makefile 
    contrib/bind/bin/named-xfer named-xfer.c 
    contrib/bind/bin/nslookup commands.l debug.c getinfo.c main.c 
    contrib/bind/port/freebsd/include port_after.h 
  Log:
  Resolve conflicts after import.
  
  Revision  Changes    Path
  1.6       +4 -4      src/contrib/bind/bin/named/Makefile
  1.6       +226 -62   src/contrib/bind/bin/named-xfer/named-xfer.c
  1.6       +2 -1      src/contrib/bind/bin/nslookup/commands.l
  1.5       +4 -2      src/contrib/bind/bin/nslookup/debug.c
  1.5       +3 -2      src/contrib/bind/bin/nslookup/getinfo.c
  1.5       +24 -20    src/contrib/bind/bin/nslookup/main.c
  1.8       +5 -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