426ef61cc8
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2021-02-03 (2f33be81)
2021-02-03 11:55:06 -05:00
54931fdff0
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2020-12-09 (e0528597)
2020-12-09 11:45:25 -05: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
a39138ef9a
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2019-05-22 (885ce314)
2019-05-22 14:15:06 -04:00
636bcefeab
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2018-10-30 (19667715)
2018-10-31 09:46:23 -04:00
e9e8dcee6b
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2018-09-04 (432eb5f5)
2018-10-22 08:48:58 -04:00
cd8e31a1bf
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2018-01-23 (d6c21c8e)
2018-01-24 14:18:16 -05:00
1df9d5f919
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2016-12-22 (44b9b4d4)
2017-02-07 11:38:00 -05: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
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