summaryrefslogtreecommitdiffstats
path: root/Utilities/cmcurl/lib/vtls/mbedtls.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-curl' into update-curlBrad King2017-05-111-5/+7
| | | | | | | | * 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.
* Merge branch 'upstream-curl' into update-curlBrad King2016-08-031-0/+80
* upstream-curl: curl 2016-08-03 (f2cb3a01)