summaryrefslogtreecommitdiffstats
path: root/Utilities/cmcurl/lib/if2ip.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'curl-upstream' into update-curlBrad King2014-10-291-10/+17
| | | | | 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/+67
Update our build files as needed to compensate.