From owner-cvs-src Mon Mar 3 9:27:13 2003 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 0BA9237B6EC; Mon, 3 Mar 2003 09:26:34 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C24894426B; Mon, 3 Mar 2003 09:23:13 -0800 (PST) (envelope-from gshapiro@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h23HI10U006088; Mon, 3 Mar 2003 09:18:01 -0800 (PST) (envelope-from gshapiro@repoman.freebsd.org) Received: (from gshapiro@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h23HI1sH006087; Mon, 3 Mar 2003 09:18:01 -0800 (PST) Message-Id: <200303031718.h23HI1sH006087@repoman.freebsd.org> From: Gregory Neil Shapiro Date: Mon, 3 Mar 2003 09:18:01 -0800 (PST) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/contrib/sendmail/mail.local mail.local.c src/contrib/sendmail/src conf.c headers.c mci.c X-FreeBSD-CVS-Branch: HEAD Sender: owner-cvs-src@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG gshapiro 2003/03/03 09:18:01 PST FreeBSD src repository Modified files: contrib/sendmail/mail.local mail.local.c contrib/sendmail/src conf.c headers.c mci.c Log: Fix conflicts from sendmail 8.12.8 import Revision Changes Path 1.22 +9 -4 src/contrib/sendmail/mail.local/mail.local.c 1.21 +2 -2 src/contrib/sendmail/src/conf.c 1.15 +179 -101 src/contrib/sendmail/src/headers.c 1.15 +2 -4 src/contrib/sendmail/src/mci.c To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-src" in the body of the message