Date: Mon, 14 Feb 2005 02:39:15 +0000 (UTC) From: Gregory Neil Shapiro <gshapiro@FreeBSD.org> To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/contrib/sendmail/libsm vsscanf.c src/contrib/sendmail/mail.local mail.local.c src/contrib/sendmail/makemap makemap.c src/contrib/sendmail/smrsh smrsh.8 smrsh.c src/contrib/sendmail/src conf.c headers.c mci.c savemail.c Message-ID: <200502140239.j1E2dFMx063513@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
gshapiro 2005-02-14 02:39:15 UTC
FreeBSD src repository
Modified files:
contrib/sendmail/mail.local mail.local.c
contrib/sendmail/makemap makemap.c
contrib/sendmail/smrsh smrsh.8 smrsh.c
contrib/sendmail/src conf.c headers.c mci.c savemail.c
Removed files:
contrib/sendmail/libsm vsscanf.c
Log:
Resolve conflicts from sendmail 8.13.3 import
MFC after: 4 days
Revision Changes Path
1.2 +0 -88 src/contrib/sendmail/libsm/vsscanf.c (dead)
1.26 +35 -18 src/contrib/sendmail/mail.local/mail.local.c
1.13 +5 -3 src/contrib/sendmail/makemap/makemap.c
1.13 +5 -5 src/contrib/sendmail/smrsh/smrsh.8
1.19 +7 -5 src/contrib/sendmail/smrsh/smrsh.c
1.27 +22 -8 src/contrib/sendmail/src/conf.c
1.21 +3 -3 src/contrib/sendmail/src/headers.c
1.18 +3 -3 src/contrib/sendmail/src/mci.c
1.17 +4 -1 src/contrib/sendmail/src/savemail.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200502140239.j1E2dFMx063513>