summaryrefslogtreecommitdiffstats
path: root/Utilities/cmcurl/lib/socks.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-curl' into update-curlBrad King2017-02-071-3/+2
| | | | | * 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 King2014-10-291-6/+42
| | | | | Resolve all conflicts in favor of the upstream side. We can re-apply specific changes later.
* curl: Move sources back into upstream layoutBrad King2014-10-291-0/+41
Update our build files as needed to compensate.