From owner-cvs-src@FreeBSD.ORG  Tue Jun  7 04:17:22 2005
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3C1B916A41C;
	Tue,  7 Jun 2005 04:17:22 +0000 (GMT)
	(envelope-from gshapiro@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0359743D48;
	Tue,  7 Jun 2005 04:17:22 +0000 (GMT)
	(envelope-from gshapiro@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j574HL6S051954;
	Tue, 7 Jun 2005 04:17:21 GMT
	(envelope-from gshapiro@repoman.freebsd.org)
Received: (from gshapiro@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j574HLop051953;
	Tue, 7 Jun 2005 04:17:21 GMT (envelope-from gshapiro)
Message-Id: <200506070417.j574HLop051953@repoman.freebsd.org>
From: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
Date: Tue, 7 Jun 2005 04:17:21 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/contrib/sendmail/src conf.c mci.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Jun 2005 04:17:22 -0000

gshapiro    2005-06-07 04:17:21 UTC

  FreeBSD src repository

  Modified files:
    contrib/sendmail/src conf.c mci.c 
  Log:
  Resolve conflicts from sendmail 8.13.4 import
  
  Revision  Changes    Path
  1.28      +36 -10    src/contrib/sendmail/src/conf.c
  1.20      +2 -2      src/contrib/sendmail/src/mci.c