Commit Graph

9 Commits

Author SHA1 Message Date
Gregory Neil Shapiro
c0c4794d84 Resolve conflicts from 8.11.4 import 2001-05-28 17:10:35 +00:00
Gregory Neil Shapiro
b466200952 Repair 8.11.3 merge conflicts 2001-02-28 00:22:47 +00:00
Gregory Neil Shapiro
c46d91b759 Repair 8.11.2 merge conflicts 2001-01-21 22:21:43 +00:00
Gregory Neil Shapiro
d995d2ba6b Fix conflicts from merge of sendmail 8.11.1 2000-10-01 02:03:50 +00:00
Gregory Neil Shapiro
3299c2f123 Fix conflicts from merge of sendmail 8.11.0.
PR:		bin/11552 misc/18512 bin/15088
2000-08-12 22:19:16 +00:00
Peter Wemm
76b7bf7135 Merge sendmail 8.9.1 -> 8.9.2 changes into mainline. Some of our changes
were submitted back to sendmail.org (stage 1) and were incorporated.
1999-01-12 12:38:06 +00:00
Peter Wemm
829be59c37 Copy original rev 1.2 - immediate delivery rather than queueing and -Wall. 1998-08-04 13:07:03 +00:00
Peter Wemm
b2ee1660ba Copy respective revisions from usr.sbin/sendmail/*/* - use -1 with getopt. 1998-08-04 12:53:30 +00:00
Peter Wemm
c2aa98e247 Import sendmail-8.9.1 (slightly trimmed) onto a fresh branch under
src/contrib as per various discussions.  I will copy across our changes
and then point the Makefiles across once the dust has settled..
1998-08-03 05:56:20 +00:00