From owner-cvs-all  Tue Jun 25 19:51:48 2002
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 44D5337B404; Tue, 25 Jun 2002 19:50:38 -0700 (PDT)
Received: (from gshapiro@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g5Q2ocE56025;
	Tue, 25 Jun 2002 19:50:38 -0700 (PDT)
	(envelope-from gshapiro)
Message-Id: <200206260250.g5Q2ocE56025@freefall.freebsd.org>
From: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
Date: Tue, 25 Jun 2002 19:50:38 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/contrib/sendmail/cf/m4 cfhead.m4 src/contrib/sendmail/src
         conf.c conf.h src/contrib/sendmail/vacation vacation.1
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
List-ID: <cvs-all.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20cvs-all>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20cvs-all>
X-Loop: FreeBSD.ORG

gshapiro    2002/06/25 19:50:38 PDT

  Modified files:
    contrib/sendmail/cf/m4 cfhead.m4 
    contrib/sendmail/src conf.c conf.h 
    contrib/sendmail/vacation vacation.1 
  Log:
  Resolve conflicts from import of sendmail 8.12.5
  
  Revision  Changes    Path
  1.12      +5 -3      src/contrib/sendmail/cf/m4/cfhead.m4
  1.16      +2 -2      src/contrib/sendmail/src/conf.c
  1.19      +1 -1      src/contrib/sendmail/src/conf.h
  1.9       +3 -3      src/contrib/sendmail/vacation/vacation.1

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