Skip site navigation (1)Skip section navigation (2) 
Date:      Sat, 8 Feb 2003 12:35:51 -0800 (PST)
From:      Gregory Neil Shapiro <gshapiro@FreeBSD.org>
To:        src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org, legacy-committers@FreeBSD.org
Subject:   cvs commit: src/contrib/sendmail/cf/m4 cfhead.m4 src/contrib/sendmail/mail.local mail.local.c src/contrib/sendmail/smrsh smrsh.c src/contrib/sendmail/src conf.c conf.h headers.c mailq.1 mci.c savemail.c
Message-ID:  <200302082035.h18KZpeZ066568@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help 
gshapiro    2003/02/08 12:35:51 PST

  Modified files:
    contrib/sendmail/cf/m4 cfhead.m4 
    contrib/sendmail/mail.local mail.local.c 
    contrib/sendmail/smrsh smrsh.c 
    contrib/sendmail/src conf.c conf.h headers.c mailq.1 mci.c 
                         savemail.c 
  Log:
  Resolve conflicts from sendmail 8.12.7 import
  
  Revision  Changes    Path
  1.13      +3 -3      src/contrib/sendmail/cf/m4/cfhead.m4
  1.21      +28 -3     src/contrib/sendmail/mail.local/mail.local.c
  1.14      +9 -9      src/contrib/sendmail/smrsh/smrsh.c
  1.19      +52 -12    src/contrib/sendmail/src/conf.c
  1.21      +4 -1      src/contrib/sendmail/src/conf.h
  1.13      +3 -3      src/contrib/sendmail/src/headers.c
  1.12      +24 -2     src/contrib/sendmail/src/mailq.1
  1.13      +3 -1      src/contrib/sendmail/src/mci.c
  1.14      +2 -20     src/contrib/sendmail/src/savemail.c

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-src" in the body of the message

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200302082035.h18KZpeZ066568>