gshapiro
a0436b087f
Resolve conflicts from sendmail 8.14.2 import
2007-11-05 00:09:45 +00:00
gshapiro
99b99437f7
Follow the (good) trend of returning import files to vendor versions
...
where possible for easier future imports.
2003-02-23 21:58:16 +00:00
gshapiro
fd175e74b3
Move the $FreeBSD$ CVS labels far enough away from the $Id$ CVS labels so
...
I don't have to manually resolve conflicts on every import. Ironically,
most of these files have no changes from the vendor version except the
$FreeBSD$ line.
2002-08-28 18:12:33 +00:00
gshapiro
3c674fdc70
Resolve conflicts from sendmail 8.12.4 import
2002-06-11 21:16:51 +00:00
gshapiro
69b6924bee
Resolve conflicts from import of post-8.12.3 bug fixes.
2002-04-20 20:34:16 +00:00
gshapiro
abfa0083ec
Resolve conflicts from sendmail 8.12.2 import
2002-02-17 21:58:34 +00:00
gshapiro
fe77e70108
Resolve conflicts from 8.11.4 import
2001-05-28 17:10:35 +00:00
gshapiro
d670e0b9fb
Repair 8.11.3 merge conflicts
2001-02-28 00:22:47 +00:00
gshapiro
e804c25caf
Repair 8.11.2 merge conflicts
2001-01-21 22:21:43 +00:00
gshapiro
74c280481f
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
5b758ef6d8
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
d9ec7e26a2
Copy respective revisions from usr.sbin/sendmail/*/* - use -1 with getopt.
1998-08-04 12:53:30 +00:00
peter
3299490505
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
