Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'curl-upstream' into update-curl | Brad King | 2014-10-29 | 1 | -0/+142 |
Resolve all conflicts in favor of the upstream side. We can re-apply specific changes later. |
index : CMake.git | ||
CMake is a cross-platform, open-source build system generator. |
summaryrefslogtreecommitdiffstats |
Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'curl-upstream' into update-curl | Brad King | 2014-10-29 | 1 | -0/+142 |
Resolve all conflicts in favor of the upstream side. We can re-apply specific changes later. |