Simon L. B. Nielsen 09bf29a41f Resolve conflicts after import of OpenSSL 0.9.8b.		2006-07-29 19:14:51 +00:00
..
alpha.c	Initial import of OpenSSL 0.9.4, sans IDEA and RSA code for patent	2000-01-10 06:22:05 +00:00
dggccbug.c	Initial import of OpenSSL 0.9.4, sans IDEA and RSA code for patent	2000-01-10 06:22:05 +00:00
MS	Initial import of OpenSSL 0.9.4, sans IDEA and RSA code for patent	2000-01-10 06:22:05 +00:00
sgiccbug.c	Initial import of OpenSSL 0.9.4, sans IDEA and RSA code for patent	2000-01-10 06:22:05 +00:00
sslref.dif	Initial import of OpenSSL 0.9.4, sans IDEA and RSA code for patent	2000-01-10 06:22:05 +00:00
SSLv3	Vendor import of OpenSSL 0.9.7c	2003-10-01 12:32:41 +00:00
stream.c	Vendor import of OpenSSL release 0.9.7. This release includes	2003-01-28 21:43:22 +00:00
ultrixcc.c	Initial import of OpenSSL 0.9.4, sans IDEA and RSA code for patent	2000-01-10 06:22:05 +00:00