From owner-cvs-all  Tue Feb 27 16:22:57 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 72BBC37B719; Tue, 27 Feb 2001 16:22:48 -0800 (PST)
	(envelope-from gshapiro@FreeBSD.org)
Received: (from gshapiro@localhost)
	by freefall.freebsd.org (8.11.1/8.11.1) id f1S0Mmk70969;
	Tue, 27 Feb 2001 16:22:48 -0800 (PST)
	(envelope-from gshapiro)
Message-Id: <200102280022.f1S0Mmk70969@freefall.freebsd.org>
From: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
Date: Tue, 27 Feb 2001 16:22:48 -0800 (PST)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/contrib/sendmail/cf/m4 cfhead.m4 src/contrib/sendmail/mail.local
         mail.local.c src/contrib/sendmail/mailstats mailstats.c
         src/contrib/sendmail/praliases praliases.c src/contrib/sendmail/rmail
         rmail.c src/contrib/sendmail/smrsh smrsh.c ...
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

gshapiro    2001/02/27 16:22:48 PST

  Modified files:
    contrib/sendmail/cf/m4 cfhead.m4 
    contrib/sendmail/mail.local mail.local.c 
    contrib/sendmail/mailstats mailstats.c 
    contrib/sendmail/praliases praliases.c 
    contrib/sendmail/rmail rmail.c 
    contrib/sendmail/smrsh smrsh.c 
    contrib/sendmail/src conf.c conf.h headers.c savemail.c 
  Log:
  Repair 8.11.3 merge conflicts
  
  Revision  Changes    Path
  1.7       +14 -14    src/contrib/sendmail/cf/m4/cfhead.m4
  1.12      +179 -197  src/contrib/sendmail/mail.local/mail.local.c
  1.8       +2 -2      src/contrib/sendmail/mailstats/mailstats.c
  1.6       +19 -4     src/contrib/sendmail/praliases/praliases.c
  1.8       +5 -5      src/contrib/sendmail/rmail/rmail.c
  1.7       +6 -6      src/contrib/sendmail/smrsh/smrsh.c
  1.9       +64 -29    src/contrib/sendmail/src/conf.c
  1.12      +19 -3     src/contrib/sendmail/src/conf.h
  1.8       +5 -5      src/contrib/sendmail/src/headers.c
  1.8       +5 -4      src/contrib/sendmail/src/savemail.c


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