From owner-cvs-all  Mon Aug 20 18:32:50 2001
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 A021A37B409; Mon, 20 Aug 2001 18:32:34 -0700 (PDT)
	(envelope-from gshapiro@FreeBSD.org)
Received: (from gshapiro@localhost)
	by freefall.freebsd.org (8.11.4/8.11.4) id f7L1WYc95972;
	Mon, 20 Aug 2001 18:32:34 -0700 (PDT)
	(envelope-from gshapiro)
Message-Id: <200108210132.f7L1WYc95972@freefall.freebsd.org>
From: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
Date: Mon, 20 Aug 2001 18:32:34 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/contrib/sendmail/src err.c
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    2001/08/20 18:32:34 PDT

  Modified files:
    contrib/sendmail/src err.c 
  Log:
  Resolve conflicts from sendmail 8.11.6 import
  
  Revision  Changes    Path
  1.7       +22 -5     src/contrib/sendmail/src/err.c


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