| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'upstream-curl' into update-curl | Brad King | 2016-08-03 | 1 | -3/+3 |
| | | | | | | * upstream-curl: curl 2016-08-03 (f2cb3a01) | ||||
| * | Merge branch 'curl-upstream' into update-curl | Brad King | 2015-08-12 | 1 | -19/+4 |
| | | | | | | | | Resolve conflicts by taking upstream side when possible and otherwise integrating the changes from both sides. Be carful in CMakeLists.txt where the OPENSSL code block that we modified previously has moved, and preserve our previous modifications in the new location. | ||||
| * | Merge branch 'curl-upstream' into update-curl | Brad King | 2014-10-29 | 1 | -0/+110 |
| 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 |