Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 30 Jul 2001 09:55:52 -0700 (PDT)
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-xfer named-xfer.c src/contrib/bind/bin/nslookup getinfo.c src/contrib/bind/port/freebsd/include port_after.h
Message-ID:  <200107301655.f6UGtqU83910@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help 

asmodai     2001/07/30 09:55:52 PDT

  Modified files:
    contrib/bind/bin/named-xfer named-xfer.c 
    contrib/bind/bin/nslookup getinfo.c 
    contrib/bind/port/freebsd/include port_after.h 
  Log:
  Resolve conflicts.
  
  Revision  Changes    Path
  1.7       +10 -6     src/contrib/bind/bin/named-xfer/named-xfer.c
  1.6       +3 -3      src/contrib/bind/bin/nslookup/getinfo.c
  1.10      +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?200107301655.f6UGtqU83910>