Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 28 Jan 2001 15:06:49 -0800 (PST)
From:      Jeroen Ruigrok van der Werven <asmodai@FreeBSD.org>
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
Message-ID:  <200101282306.f0SN6np50774@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help 
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

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200101282306.f0SN6np50774>