Simon L. B. Nielsen
|
74608424ab
|
Resolve conflicts after import of OpenSSL 0.9.8d.
|
2006-10-01 07:46:16 +00:00 |
|
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
|
5fad2af4e3
|
Merge conflicts after import of OpenSSL 0.9.7c.
|
2003-10-01 12:37:51 +00:00 |
|
Mark Murray
|
bff3688511
|
Merge conflicts.
This is cunning doublespeak for "use vendor code".
|
2003-01-28 22:34:21 +00:00 |
|
Kris Kennaway
|
ae152dd3aa
|
Resolve conflicts, and garbage collect some local changes that are no
longer required
|
2000-11-13 02:20:29 +00:00 |
|
Mark Murray
|
3c6b6b90c7
|
Internat diff reducer.
|
2000-04-16 17:49:31 +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 |
|