From owner-cvs-all@FreeBSD.ORG  Wed Mar 22 16:45:57 2006
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4B5E416A400;
	Wed, 22 Mar 2006 16:45:57 +0000 (UTC)
	(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 E0EA843D48;
	Wed, 22 Mar 2006 16:45:56 +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 k2MGjuUS070141;
	Wed, 22 Mar 2006 16:45:56 GMT
	(envelope-from gshapiro@repoman.freebsd.org)
Received: (from gshapiro@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2MGjuEk070140;
	Wed, 22 Mar 2006 16:45:56 GMT (envelope-from gshapiro)
Message-Id: <200603221645.k2MGjuEk070140@repoman.freebsd.org>
From: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
Date: Wed, 22 Mar 2006 16:45:56 +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 conf.h headers.c mci.c
 savemail.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 22 Mar 2006 16:45:57 -0000

gshapiro    2006-03-22 16:45:56 UTC

  FreeBSD src repository

  Modified files:
    contrib/sendmail/src conf.c conf.h headers.c mci.c savemail.c 
  Log:
  Resolve conflicts from sendmail 8.13.6 import
  
  Revision  Changes    Path
  1.29      +118 -22   src/contrib/sendmail/src/conf.c
  1.24      +34 -22    src/contrib/sendmail/src/conf.h
  1.22      +42 -29    src/contrib/sendmail/src/headers.c
  1.21      +7 -6      src/contrib/sendmail/src/mci.c
  1.18      +165 -98   src/contrib/sendmail/src/savemail.c