peter
|
a531c1a157
|
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 |
|
peter
|
91b3d1fef5
|
This commit was generated by cvs2svn to compensate for changes in r12571,
which included commits to RCS files with non-trunk default branches.
|
1995-12-02 17:30:23 +00:00 |
|
peter
|
88797ecc8d
|
Import Sendmail-8.7.2 as discussed on -current.
The conflict merge will happen shortly after.
|
1995-12-02 17:30:23 +00:00 |
|
rgrimes
|
4f960dd75f
|
Remove trailing whitespace.
|
1995-05-30 03:57:47 +00:00 |
|
rgrimes
|
babe0fd0e2
|
BSD 4.4 Lite usr.sbin Sources
|
1994-05-26 05:23:31 +00:00 |
|
rgrimes
|
0882205071
|
This commit was generated by cvs2svn to compensate for changes in r1553,
which included commits to RCS files with non-trunk default branches.
|
1994-05-26 05:23:31 +00:00 |
|
rgrimes
|
862fdf11a2
|
BSD 4.4 Lite usr.sbin Sources
|
1994-05-26 05:23:31 +00:00 |
|