Diffusion FreeBSD src repository c46d91b759c7

Repair 8.11.2 merge conflicts
c46d91b759c7
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Repair 8.11.2 merge conflicts

Details

Provenance

Authored on Jan 21 2001, 10:21 PM

Parents

rGc0e6e8f8f866: This commit was generated by cvs2svn to compensate for changes in r71345,

Branches

Unknown

Tags

Unknown

Event Timeline

Changes (15)

Path

Size

contrib/

sendmail/

mail.local/

makemap/

praliases/

rmail/

smrsh/

src/

rGc46d91b759c7

contrib/sendmail/mail.local/mail.local.8

Loading...

contrib/sendmail/mail.local/mail.local.c

Loading...

contrib/sendmail/makemap/makemap.c

Loading...

contrib/sendmail/praliases/praliases.c

Loading...

contrib/sendmail/rmail/rmail.c

Loading...

contrib/sendmail/smrsh/smrsh.8

Loading...

contrib/sendmail/smrsh/smrsh.c

Loading...

contrib/sendmail/src/aliases.5

Loading...

contrib/sendmail/src/conf.c

Loading...

contrib/sendmail/src/conf.h

Loading...

contrib/sendmail/src/headers.c

Loading...

contrib/sendmail/src/mailq.1

Loading...

contrib/sendmail/src/mci.c

Loading...

contrib/sendmail/src/savemail.c

Loading...

contrib/sendmail/src/sendmail.8

Loading...