From owner-cvs-all  Sat Apr 20 13:35:13 2002
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 400E737B41B; Sat, 20 Apr 2002 13:34:17 -0700 (PDT)
Received: (from gshapiro@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g3KKYGw58781;
	Sat, 20 Apr 2002 13:34:16 -0700 (PDT)
	(envelope-from gshapiro)
Message-Id: <200204202034.g3KKYGw58781@freefall.freebsd.org>
From: Gregory Neil Shapiro <gshapiro@FreeBSD.org>
Date: Sat, 20 Apr 2002 13:34:16 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/contrib/sendmail/cf/m4 cfhead.m4 src/contrib/sendmail/cf/ostype
         bsd4.4.m4 src/contrib/sendmail/cf/sh makeinfo.sh
         src/contrib/sendmail/mail.local mail.local.8 mail.local.c
         src/contrib/sendmail/mailstats mailstats.c src/contrib/sendmail/makemap ...
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    2002/04/20 13:34:16 PDT

  Modified files:
    contrib/sendmail/cf/m4 cfhead.m4 
    contrib/sendmail/cf/ostype bsd4.4.m4 
    contrib/sendmail/cf/sh makeinfo.sh 
    contrib/sendmail/mail.local mail.local.8 mail.local.c 
    contrib/sendmail/mailstats mailstats.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 err.c mailq.1 
                         mci.c savemail.c sendmail.8 
    contrib/sendmail/vacation vacation.1 
  Log:
  Resolve conflicts from import of post-8.12.3 bug fixes.
  
  Revision  Changes    Path
  1.10      +1 -1      src/contrib/sendmail/cf/m4/cfhead.m4
  1.5       +1 -1      src/contrib/sendmail/cf/ostype/bsd4.4.m4
  1.6       +2 -2      src/contrib/sendmail/cf/sh/makeinfo.sh
  1.10      +1 -1      src/contrib/sendmail/mail.local/mail.local.8
  1.17      +1 -1      src/contrib/sendmail/mail.local/mail.local.c
  1.11      +1 -1      src/contrib/sendmail/mailstats/mailstats.c
  1.8       +1 -1      src/contrib/sendmail/makemap/makemap.c
  1.9       +1 -1      src/contrib/sendmail/praliases/praliases.c
  1.11      +1 -1      src/contrib/sendmail/rmail/rmail.c
  1.7       +1 -1      src/contrib/sendmail/smrsh/smrsh.8
  1.10      +1 -1      src/contrib/sendmail/smrsh/smrsh.c
  1.7       +1 -1      src/contrib/sendmail/src/aliases.5
  1.14      +1 -1      src/contrib/sendmail/src/conf.c
  1.17      +1 -1      src/contrib/sendmail/src/conf.h
  1.9       +1 -1      src/contrib/sendmail/src/err.c
  1.9       +9 -2      src/contrib/sendmail/src/mailq.1
  1.10      +1 -1      src/contrib/sendmail/src/mci.c
  1.11      +1 -1      src/contrib/sendmail/src/savemail.c
  1.8       +1 -1      src/contrib/sendmail/src/sendmail.8
  1.7       +1 -1      src/contrib/sendmail/vacation/vacation.1

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