cvs commit: src/contrib/sendmail/src conf.c mci.c

[Gregory Neil Shapiro]

gshapiro    2005-06-07 04:17:21 UTC

  FreeBSD src repository

  Modified files:
    contrib/sendmail/src conf.c mci.c 
  Log:
  Resolve conflicts from sendmail 8.13.4 import
  
  Revision  Changes    Path
  1.28      +36 -10    src/contrib/sendmail/src/conf.c
  1.20      +2 -2      src/contrib/sendmail/src/mci.c