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
636bcefeab
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2018-10-30 (19667715)
2018-10-31 09:46:23 -04:00
Brad King
e9e8dcee6b
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2018-09-04 (432eb5f5)
2018-10-22 08:48:58 -04:00
Brad King
3e913b819d
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2018-05-15 (cb013830)
2018-05-18 10:16:50 -04:00
Brad King
cd8e31a1bf
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2018-01-23 (d6c21c8e)
2018-01-24 14:18:16 -05:00
Brad King
9e3ef40edb
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2017-10-04 (3ea76790)
2017-10-10 11:15:16 -04:00
Brad King
a3ef36f153
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2017-06-14 (54b636f1)
Resolve a logical conflict in `Utilities/cmcurl/CMakeLists.txt`
by disabling CA bundle/path detection for build within CMake.
CMake already handles locating a CA bundle/path at runtime.
2017-06-14 11:10:22 -04:00
Brad King
299975908a
Merge branch 'upstream-curl' into update-curl
...
* 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.
2017-05-11 11:27:21 -04:00
Brad King
1df9d5f919
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2016-12-22 (44b9b4d4)
2017-02-07 11:38:00 -05:00
Brad King
f8a1ba202f
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2016-11-02 (3c561c65)
2016-12-05 11:50:43 -05: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