Brad King
30aba1ce8c
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2022-04-27 (1669b17d)
2022-04-28 15:21:23 -04:00
Brad King
8ecd95845c
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2021-09-14 (8e82f2a0)
2021-09-15 15:28:38 -04:00
Brad King
cd40922edb
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2021-05-26 (6b951a69)
2021-05-27 15:23:20 -04:00
Brad King
54931fdff0
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2020-12-09 (e0528597)
2020-12-09 11:45:25 -05:00
Brad King
0ef8fa5000
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2020-06-23 (e9db32a0)
2020-06-24 08:13:02 -04:00
Brad King
d61c3bd505
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2020-03-04 (b8d13668)
2020-03-04 14:34:39 -05:00
Brad King
a39138ef9a
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2019-05-22 (885ce314)
2019-05-22 14:15:06 -04:00
Brad King
f53f4a8a2d
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2016-08-03 (f2cb3a01)
2016-08-03 14:26:53 -04:00
Brad King
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
Brad King
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
