diff options
| author | Brad King <brad.king@kitware.com> | 2014-10-08 19:09:22 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-10-29 20:41:46 (GMT) |
| commit | a636de1e2b12bcbc09f18c4a34c22c08cc54edaf (patch) | |
| tree | 4882bbf8a82677c74ae6ff24b50cb4b44266a4bd /Utilities/cmcurl/lib/hostip.h | |
| parent | 661fa7c917f64231200c8ae90b59fe9146dfa958 (diff) | |
| parent | f086cb372e41035260fcd9b4ed3d2cfb272f138f (diff) | |
| download | CMake-a636de1e2b12bcbc09f18c4a34c22c08cc54edaf.zip CMake-a636de1e2b12bcbc09f18c4a34c22c08cc54edaf.tar.gz CMake-a636de1e2b12bcbc09f18c4a34c22c08cc54edaf.tar.bz2 | |
Merge branch 'curl-upstream' into update-curl
Use the '-s ours' merge strategy to keep our side unchanged.
This merge brings in the upstream snapshot as of the version
of curl on which our source is based. This will allow new
snapshots to be merged with our changes.
Diffstat (limited to 'Utilities/cmcurl/lib/hostip.h')
0 files changed, 0 insertions, 0 deletions