From owner-cvs-src@FreeBSD.ORG  Mon Nov  5 00:09:45 2007
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ECE5916A474;
	Mon,  5 Nov 2007 00:09:45 +0000 (UTC)
	(envelope-from gshapiro@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C961C13C4BB;
	Mon,  5 Nov 2007 00:09:45 +0000 (UTC)
	(envelope-from gshapiro@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA509jem006301;
	Mon, 5 Nov 2007 00:09:45 GMT
	(envelope-from gshapiro@repoman.freebsd.org)
Received: (from gshapiro@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA509jeL006300;
	Mon, 5 Nov 2007 00:09:45 GMT (envelope-from gshapiro)
Message-Id: <200711050009.lA509jeL006300@repoman.freebsd.org>
From: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
Date: Mon, 5 Nov 2007 00:09:45 +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/makemap makemap.c
 src/contrib/sendmail/praliases
 praliases.c src/contrib/sendmail/src conf.c headers.c sendmail.8
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: Mon, 05 Nov 2007 00:09:46 -0000

gshapiro    2007-11-05 00:09:45 UTC

  FreeBSD src repository

  Modified files:
    contrib/sendmail/makemap makemap.c 
    contrib/sendmail/praliases praliases.c 
    contrib/sendmail/src conf.c headers.c sendmail.8 
  Log:
  Resolve conflicts from sendmail 8.14.2 import
  
  Revision  Changes    Path
  1.14      +2 -2      src/contrib/sendmail/makemap/makemap.c
  1.13      +2 -2      src/contrib/sendmail/praliases/praliases.c
  1.32      +31 -12    src/contrib/sendmail/src/conf.c
  1.25      +7 -5      src/contrib/sendmail/src/headers.c
  1.14      +4 -4      src/contrib/sendmail/src/sendmail.8