Simon L. B. Nielsen
|
09bf29a41f
|
Resolve conflicts after import of OpenSSL 0.9.8b.
|
2006-07-29 19:14:51 +00:00 |
|
Jacques Vidrine
|
5203f6dc3a
|
Resolve conflicts after import of OpenSSL 0.9.7e.
|
2005-02-25 05:49:44 +00:00 |
|
Jacques Vidrine
|
902aa2e784
|
Resolve conflicts after import of OpenSSL 0.9.7d.
|
2004-03-17 17:44:39 +00:00 |
|
Jacques Vidrine
|
ede6693b54
|
Re-add the FreeBSD RCS keyword for the benefit of mergemaster.
PR: conf/50040
Requested by: Dimitry Andric <dim@xs4all.nl>
|
2004-01-09 14:46:11 +00:00 |
|
Mark Murray
|
bff3688511
|
Merge conflicts.
This is cunning doublespeak for "use vendor code".
|
2003-01-28 22:34:21 +00:00 |
|
Doug Barton
|
ea8f54b543
|
Add a CVS Id tag
|
2000-10-29 10:00:58 +00:00 |
|
Kris Kennaway
|
f579bf8ec7
|
Initial import of OpenSSL 0.9.5a
|
2000-04-13 06:33:22 +00:00 |
|
Kris Kennaway
|
7466462628
|
Initial import of OpenSSL 0.9.4, sans IDEA and RSA code for patent
infringement reasons.
|
2000-01-10 06:22:05 +00:00 |
|