| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
| |
* upstream-curl:
curl 2017-10-04 (3ea76790)
|
| |
|
|
|
| |
* upstream-curl:
curl 2016-12-22 (44b9b4d4)
|
| |
|
|
|
| |
* upstream-curl:
curl 2016-08-03 (f2cb3a01)
|
| |
|
|
|
|
|
| |
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.
|
|
|
Resolve all conflicts in favor of the upstream side.
We can re-apply specific changes later.
|
