| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
| |
* upstream-curl:
curl 2020-12-09 (e0528597)
|
| |
|
|
|
| |
* upstream-curl:
curl 2020-06-23 (e9db32a0)
|
| |
|
|
|
| |
* upstream-curl:
curl 2020-03-04 (b8d13668)
|
| |
|
|
|
| |
* upstream-curl:
curl 2019-05-22 (885ce314)
|
| |
|
|
|
| |
* upstream-curl:
curl 2018-09-04 (432eb5f5)
|
| |
|
|
|
|
|
|
| |
* upstream-curl:
curl 2017-04-19 (d957e218)
Resolve conflicts in `CMakeLists.txt` in favor of the upstream version.
We will re-apply our logic as needed in following commits.
|
|
|
Resolve conflicts by taking upstream side when possible and otherwise
integrating the changes from both sides. Be carful in CMakeLists.txt
where the OPENSSL code block that we modified previously has moved, and
preserve our previous modifications in the new location.
|
