From owner-cvs-all  Tue Apr  9 20: 6:28 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 8DA6137B416; Tue,  9 Apr 2002 20:06:22 -0700 (PDT)
Received: (from gshapiro@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g3A36M531987;
	Tue, 9 Apr 2002 20:06:22 -0700 (PDT)
	(envelope-from gshapiro)
Message-Id: <200204100306.g3A36M531987@freefall.freebsd.org>
From: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
Date: Tue, 9 Apr 2002 20:06:22 -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 mci.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    2002/04/09 20:06:22 PDT

  Modified files:
    contrib/sendmail/mail.local mail.local.c 
    contrib/sendmail/src conf.c conf.h mci.c 
    contrib/sendmail/vacation vacation.1 
  Log:
  Fix conflicts from sendmail 8.12.3 import
  
  Revision  Changes    Path
  1.16      +2 -2      src/contrib/sendmail/mail.local/mail.local.c
  1.13      +63 -12    src/contrib/sendmail/src/conf.c
  1.16      +2 -2      src/contrib/sendmail/src/conf.h
  1.9       +5 -6      src/contrib/sendmail/src/mci.c
  1.6       +47 -20    src/contrib/sendmail/vacation/vacation.1

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