| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge conflicts; remove MacOS, Netware, OS/2, VMS and Windows build machinery. | miod | 2014-04-13 | 1 | -65/+0 |
| | | |||||
| * | openssl-1.0.0e: resolve conflicts | djm | 2011-11-03 | 1 | -4/+6 |
| | | |||||
| * | resolve conflicts, fix local changes | djm | 2010-10-01 | 1 | -22/+56 |
| | | |||||
| * | resolve conflicts | djm | 2006-06-27 | 1 | -7/+7 |
| | | |||||
| * | resolve conflicts | djm | 2005-04-29 | 1 | -3/+6 |
| | | |||||
| * | OpenSSL 0.9.4 merge | beck | 1999-09-29 | 1 | -0/+26 |
