From owner-cvs-all  Tue Jul 31 18:35: 1 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 B2DCE37B401; Tue, 31 Jul 2001 18:34:52 -0700 (PDT)
	(envelope-from gshapiro@FreeBSD.org)
Received: (from gshapiro@localhost)
	by freefall.freebsd.org (8.11.4/8.11.4) id f711Yqm30025;
	Tue, 31 Jul 2001 18:34:52 -0700 (PDT)
	(envelope-from gshapiro)
Message-Id: <200108010134.f711Yqm30025@freefall.freebsd.org>
From: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
Date: Tue, 31 Jul 2001 18:34:52 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/contrib/sendmail/mail.local mail.local.c src/contrib/sendmail/src
         conf.c conf.h err.c 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    2001/07/31 18:34:52 PDT

  Modified files:
    contrib/sendmail/mail.local mail.local.c 
    contrib/sendmail/src conf.c conf.h err.c 
    contrib/sendmail/vacation vacation.1 
  Log:
  Resolve conflicts from import of sendmail 8.11.5
  
  Revision  Changes    Path
  1.13      +2 -2      src/contrib/sendmail/mail.local/mail.local.c
  1.11      +3 -5      src/contrib/sendmail/src/conf.c
  1.14      +13 -2     src/contrib/sendmail/src/conf.h
  1.6       +2 -4      src/contrib/sendmail/src/err.c
  1.4       +4 -4      src/contrib/sendmail/vacation/vacation.1


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