From owner-cvs-contrib  Wed Jun 10 22:10:17 1998
Return-Path: <owner-cvs-contrib>
Received: (from daemon@localhost)
          by hub.freebsd.org (8.8.8/8.8.8) id WAA21211
          for cvs-contrib-outgoing; Wed, 10 Jun 1998 22:10:17 -0700 (PDT)
          (envelope-from owner-cvs-contrib)
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
          by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id WAA21152;
          Wed, 10 Jun 1998 22:10:08 -0700 (PDT)
          (envelope-from peter@FreeBSD.org)
From: Peter Wemm <peter@FreeBSD.ORG>
Received: (from peter@localhost)
	by freefall.freebsd.org (8.8.8/8.8.5) id WAA13407;
	Wed, 10 Jun 1998 22:09:55 -0700 (PDT)
Date: Wed, 10 Jun 1998 22:09:55 -0700 (PDT)
Message-Id: <199806110509.WAA13407@freefall.freebsd.org>
To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-contrib@FreeBSD.ORG
Subject: cvs commit: src/contrib/bind/port/freebsd/include port_after.h
Sender: owner-cvs-contrib@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

peter       1998/06/10 22:09:54 PDT

  Modified files:
    contrib/bind/port/freebsd/include port_after.h 
  Log:
  Merge conflicting changes (all 1 line! :-) from 8.1.2.
  
  Revision  Changes    Path
  1.3       +1 -0      src/contrib/bind/port/freebsd/include/port_after.h