cvs commit: src/contrib/sendmail/makemap makemap.c src/contrib/sendmail/praliases praliases.c src/contrib/sendmail/src conf.c headers.c sendmail.8

[Gregory Neil Shapiro]

gshapiro    2007-11-05 00:09:45 UTC

  FreeBSD src repository

  Modified files:
    contrib/sendmail/makemap makemap.c 
    contrib/sendmail/praliases praliases.c 
    contrib/sendmail/src conf.c headers.c sendmail.8 
  Log:
  Resolve conflicts from sendmail 8.14.2 import
  
  Revision  Changes    Path
  1.14      +2 -2      src/contrib/sendmail/makemap/makemap.c
  1.13      +2 -2      src/contrib/sendmail/praliases/praliases.c
  1.32      +31 -12    src/contrib/sendmail/src/conf.c
  1.25      +7 -5      src/contrib/sendmail/src/headers.c
  1.14      +4 -4      src/contrib/sendmail/src/sendmail.8