Commit graph

10 commits

Author SHA1 Message Date
Peter Wemm
5818966ae4 Merge sendmail 8.8.8 changes onto mainline. (For all of CVS's warts, when
things like this turn out this easy (ie: it took 30 seconds), it's nice :-)
1997-11-10 02:05:23 +00:00
Peter Wemm
8e97f84637 Merge sendmail 8.8.7 changes from vendor branch 1997-08-04 05:06:42 +00:00
Peter Wemm
54d6a350e0 Merge in sendmail-8.8.5 -> 8.8.6 changes to those files that have left the
vendor branch.
1997-06-27 15:17:19 +00:00
Peter Wemm
589790e627 Merge 8.8.3->8.8.4 changes onto our mainline where we've edited the
file at some point in the past.

Obtained from: Eric Allman <eric@sendmail.org>
1996-12-03 06:15:52 +00:00
Peter Wemm
82c2534fd0 Fold sendmail-8.8.2 changes into files that have been touched.
(^!&@$#&^! delete !!@^@^ trailing !@^&#$!& whitespace!!!)
1996-10-24 05:07:25 +00:00
Peter Wemm
4a55d8c7ca Merge import conflicts 1996-09-19 03:12:11 +00:00
Peter Wemm
89f3506f1f Fold in changes to files no longer on the vendor branch from 8.7.3 update. 1995-12-03 17:51:40 +00:00
Peter Wemm
fb1869a787 Initial round of conflict resolutions.. I need to do another
pass over this and check it more closely, but my initial concern was
to get it to all compile again.  Some of the obsoleted files 'cvs rm'ed.
1995-12-02 18:17:40 +00:00
Rodney W. Grimes
709e8f9ae1 Remove trailing whitespace. 1995-05-30 03:57:47 +00:00
Rodney W. Grimes
dea673e932 BSD 4.4 Lite usr.sbin Sources 1994-05-26 05:23:31 +00:00