Date: Sun, 21 Jan 2001 14:21:43 -0800 (PST) From: Gregory Neil Shapiro <gshapiro@FreeBSD.org> 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 ... Message-ID: <200101212221.f0LMLhp15525@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200101212221.f0LMLhp15525>