Date: Mon, 28 May 2001 10:10:36 -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/mailstats mailstats.c src/contrib/sendmail/praliases praliases.c src/contrib/sendmail/rmail rmail.c src/contrib/sendmail/smrsh smrsh.c src/contrib/sendmail/src conf.c conf.h err.c headers.c ... Message-ID: <200105281710.f4SHAaP82622@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
gshapiro 2001/05/28 10:10:36 PDT
Modified files:
contrib/sendmail/cf/m4 cfhead.m4
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 err.c headers.c mci.c
savemail.c
Log:
Resolve conflicts from 8.11.4 import
Revision Changes Path
1.8 +2 -3 src/contrib/sendmail/cf/m4/cfhead.m4
1.9 +4 -4 src/contrib/sendmail/mailstats/mailstats.c
1.7 +13 -5 src/contrib/sendmail/praliases/praliases.c
1.9 +3 -3 src/contrib/sendmail/rmail/rmail.c
1.8 +4 -3 src/contrib/sendmail/smrsh/smrsh.c
1.10 +115 -47 src/contrib/sendmail/src/conf.c
1.13 +12 -6 src/contrib/sendmail/src/conf.h
1.5 +10 -10 src/contrib/sendmail/src/err.c
1.9 +3 -3 src/contrib/sendmail/src/headers.c
1.7 +10 -5 src/contrib/sendmail/src/mci.c
1.9 +4 -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200105281710.f4SHAaP82622>