7d0fa4a943
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2020-08-19 (9d954e49)
2020-08-19 12:50:05 -04:00
6d423195d5
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2020-06-30 (5a1fc8d3)
2020-07-01 10:10:23 -04:00
0ef8fa5000
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2020-06-23 (e9db32a0)
2020-06-24 08:13:02 -04:00
d61c3bd505
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2020-03-04 (b8d13668)
2020-03-04 14:34:39 -05:00
3e913b819d
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2018-05-15 (cb013830)
2018-05-18 10:16:50 -04:00
9e3ef40edb
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2017-10-04 (3ea76790)
2017-10-10 11:15:16 -04:00
f53f4a8a2d
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2016-08-03 (f2cb3a01)
2016-08-03 14:26:53 -04:00
91e8d35ab8
Merge branch 'curl-upstream' into update-curl
...
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.
2015-08-12 15:43:52 -04:00
392a318862
curl: Fix spelling errors reported by Lintian
...
Re-apply change from commit v2.8.3~265^2~1 (Fix spelling errors
reported by Lintian, 2010-07-02) on updated upstream curl.
2014-10-29 16:43:37 -04:00
80c881f793
Merge branch 'curl-upstream' into update-curl
...
Resolve all conflicts in favor of the upstream side.
We can re-apply specific changes later.
2014-10-29 16:43:21 -04:00
9cf069f88b
curl: Move sources back into upstream layout
...
Update our build files as needed to compensate.
2014-10-29 16:41:10 -04:00
Brad King