Date: Sat, 30 Sep 2000 19:03: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/mail.local mail.local.8 mail.local.c src/contrib/sendmail/mailstats mailstats.c src/contrib/sendmail/makemap makemap.c src/contrib/sendmail/rmail rmail.c src/contrib/sendmail/smrsh ... Message-ID: <200010010203.TAA90578@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
gshapiro 2000/09/30 19:03:51 PDT
Modified files:
contrib/sendmail/cf/m4 cfhead.m4
contrib/sendmail/mail.local mail.local.8 mail.local.c
contrib/sendmail/mailstats mailstats.c
contrib/sendmail/makemap makemap.c
contrib/sendmail/rmail rmail.c
contrib/sendmail/smrsh smrsh.c
contrib/sendmail/src conf.c conf.h headers.c mailq.1
savemail.c sendmail.8
Log:
Fix conflicts from merge of sendmail 8.11.1
Revision Changes Path
1.6 +4 -2 src/contrib/sendmail/cf/m4/cfhead.m4
1.7 +11 -5 src/contrib/sendmail/mail.local/mail.local.8
1.8 +245 -218 src/contrib/sendmail/mail.local/mail.local.c
1.7 +3 -3 src/contrib/sendmail/mailstats/mailstats.c
1.5 +3 -3 src/contrib/sendmail/makemap/makemap.c
1.6 +18 -8 src/contrib/sendmail/rmail/rmail.c
1.5 +3 -3 src/contrib/sendmail/smrsh/smrsh.c
1.7 +13 -6 src/contrib/sendmail/src/conf.c
1.10 +14 -7 src/contrib/sendmail/src/conf.h
1.6 +4 -6 src/contrib/sendmail/src/headers.c
1.5 +4 -4 src/contrib/sendmail/src/mailq.1
1.6 +5 -3 src/contrib/sendmail/src/savemail.c
1.5 +10 -5 src/contrib/sendmail/src/sendmail.8
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?200010010203.TAA90578>