summaryrefslogtreecommitdiffstats
path: root/Utilities/cmcurl/lib/curl_setup_once.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-curl' into update-curlBrad King2020-12-091-1/+1
| | | | | * upstream-curl: curl 2020-12-09 (e0528597)
* Merge branch 'upstream-curl' into update-curlBrad King2020-06-241-1/+3
| | | | | * upstream-curl: curl 2020-06-23 (e9db32a0)
* Merge branch 'upstream-curl' into update-curlBrad King2020-03-041-24/+4
| | | | | * upstream-curl: curl 2020-03-04 (b8d13668)
* Merge branch 'upstream-curl' into update-curlBrad King2018-10-311-1/+0
| | | | | * upstream-curl: curl 2018-10-30 (19667715)
* Merge branch 'upstream-curl' into update-curlBrad King2018-05-181-21/+2
| | | | | * upstream-curl: curl 2018-05-15 (cb013830)
* Merge branch 'upstream-curl' into update-curlBrad King2017-10-101-14/+0
| | | | | * upstream-curl: curl 2017-10-04 (3ea76790)
* Merge branch 'upstream-curl' into update-curlBrad King2017-06-141-1/+1
| | | | | | | | | * 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.
* Merge branch 'upstream-curl' into update-curlBrad King2016-08-031-1/+1
| | | | | * upstream-curl: curl 2016-08-03 (f2cb3a01)
* Merge branch 'curl-upstream' into update-curlBrad King2014-10-291-0/+551
Resolve all conflicts in favor of the upstream side. We can re-apply specific changes later.