Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | resolve conflicts | djm | 2012-10-13 | 1 | -40/+1233 | |
| | ||||||
* | resolve conflicts, fix local changes | djm | 2010-10-01 | 1 | -16/+19 | |
| | ||||||
* | resolve conflicts | djm | 2009-01-09 | 1 | -19/+16 | |
| | ||||||
* | resolve conflicts | djm | 2008-09-06 | 1 | -10/+12 | |
| | ||||||
* | resolve conflicts | djm | 2006-06-27 | 1 | -3/+3 | |
| | ||||||
* | resolve conflicts | djm | 2005-04-29 | 1 | -7/+25 | |
| | ||||||
* | merge 0.9.7b with local changes; crank majors for libssl/libcrypto | markus | 2003-05-12 | 1 | -1/+0 | |
| | ||||||
* | Merge OpenSSL 0.9.7-stable-20020605, | beck | 2002-06-07 | 1 | -1/+3 | |
| | | | | correctly autogenerate obj_mac.h | |||||
* | OpenSSL 0.9.7 stable 2002 05 08 merge | beck | 2002-05-15 | 1 | -0/+99 | |