summaryrefslogtreecommitdiff
path: root/Utilities/cmcurl/lib/curl_ldap.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-curl' into update-curlBrad King2020-12-091-2/+2
| | | | | * upstream-curl: curl 2020-12-09 (e0528597)
* 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 King2018-10-311-1/+0
| | | | | * upstream-curl: curl 2018-10-30 (19667715)
* 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/+35
Resolve all conflicts in favor of the upstream side. We can re-apply specific changes later.