summaryrefslogtreecommitdiffstats
path: root/Utilities/cmcurl/lib/curl_endian.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-curl' into update-curlBrad King2020-03-041-1/+1
| | | | | * upstream-curl: curl 2020-03-04 (b8d13668)
* Merge branch 'upstream-curl' into update-curlBrad King2019-05-221-5/+5
| | | | | * upstream-curl: curl 2019-05-22 (885ce314)
* Merge branch 'upstream-curl' into update-curlBrad King2017-06-141-113/+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 King2017-02-071-9/+9
| | | | | * upstream-curl: curl 2016-12-22 (44b9b4d4)
* 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 King2015-08-121-0/+236
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.