From owner-cvs-all  Sun Jan 21 14:22: 8 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 E924D37B401; Sun, 21 Jan 2001 14:21:43 -0800 (PST)
Received: (from gshapiro@localhost)
	by freefall.freebsd.org (8.11.1/8.11.1) id f0LMLhp15525;
	Sun, 21 Jan 2001 14:21:43 -0800 (PST)
	(envelope-from gshapiro)
Message-Id: <200101212221.f0LMLhp15525@freefall.freebsd.org>
From: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
Date: Sun, 21 Jan 2001 14:21:43 -0800 (PST)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/contrib/sendmail/mail.local mail.local.8 mail.local.c
         src/contrib/sendmail/makemap makemap.c src/contrib/sendmail/praliases
         praliases.c src/contrib/sendmail/rmail rmail.c
         src/contrib/sendmail/smrsh smrsh.8 smrsh.c ...
X-FreeBSD-CVS-Branch: HEAD
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

gshapiro    2001/01/21 14:21:43 PST

  Modified files:
    contrib/sendmail/mail.local mail.local.8 mail.local.c 
    contrib/sendmail/makemap makemap.c 
    contrib/sendmail/praliases praliases.c 
    contrib/sendmail/rmail rmail.c 
    contrib/sendmail/smrsh smrsh.8 smrsh.c 
    contrib/sendmail/src aliases.5 conf.c conf.h headers.c mailq.1 
                         mci.c savemail.c sendmail.8 
  Log:
  Repair 8.11.2 merge conflicts
  
  Revision  Changes    Path
  1.8       +6 -4      src/contrib/sendmail/mail.local/mail.local.8
  1.11      +4 -4      src/contrib/sendmail/mail.local/mail.local.c
  1.6       +21 -24    src/contrib/sendmail/makemap/makemap.c
  1.5       +24 -21    src/contrib/sendmail/praliases/praliases.c
  1.7       +3 -4      src/contrib/sendmail/rmail/rmail.c
  1.5       +7 -6      src/contrib/sendmail/smrsh/smrsh.8
  1.6       +7 -3      src/contrib/sendmail/smrsh/smrsh.c
  1.5       +4 -4      src/contrib/sendmail/src/aliases.5
  1.8       +77 -39    src/contrib/sendmail/src/conf.c
  1.11      +14 -4     src/contrib/sendmail/src/conf.h
  1.7       +44 -27    src/contrib/sendmail/src/headers.c
  1.7       +4 -4      src/contrib/sendmail/src/mailq.1
  1.5       +10 -8     src/contrib/sendmail/src/mci.c
  1.7       +11 -3     src/contrib/sendmail/src/savemail.c
  1.6       +4 -4      src/contrib/sendmail/src/sendmail.8



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