Date: Tue, 11 Jun 2002 14:16:51 -0700 (PDT) From: Gregory Neil Shapiro <gshapiro@FreeBSD.org> 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 ... Message-ID: <200206112116.g5BLGpv52857@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
gshapiro 2002/06/11 14:16:51 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 sendmail 8.12.4 import
Revision Changes Path
1.11 +1 -1 src/contrib/sendmail/cf/m4/cfhead.m4
1.6 +1 -1 src/contrib/sendmail/cf/ostype/bsd4.4.m4
1.7 +1 -1 src/contrib/sendmail/cf/sh/makeinfo.sh
1.11 +1 -1 src/contrib/sendmail/mail.local/mail.local.8
1.18 +3 -3 src/contrib/sendmail/mail.local/mail.local.c
1.12 +16 -15 src/contrib/sendmail/mailstats/mailstats.c
1.9 +1 -1 src/contrib/sendmail/makemap/makemap.c
1.10 +1 -1 src/contrib/sendmail/praliases/praliases.c
1.12 +1 -1 src/contrib/sendmail/rmail/rmail.c
1.8 +2 -2 src/contrib/sendmail/smrsh/smrsh.8
1.11 +28 -14 src/contrib/sendmail/smrsh/smrsh.c
1.8 +1 -1 src/contrib/sendmail/src/aliases.5
1.15 +55 -4 src/contrib/sendmail/src/conf.c
1.18 +11 -1 src/contrib/sendmail/src/conf.h
1.10 +1 -1 src/contrib/sendmail/src/err.c
1.10 +2 -2 src/contrib/sendmail/src/mailq.1
1.11 +4 -4 src/contrib/sendmail/src/mci.c
1.12 +8 -7 src/contrib/sendmail/src/savemail.c
1.9 +3 -4 src/contrib/sendmail/src/sendmail.8
1.8 +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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200206112116.g5BLGpv52857>