| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'upstream-curl' into update-curl | Brad King | 2020-06-24 | 1 | -0/+21 |
| | | | | | | * upstream-curl: curl 2020-06-23 (e9db32a0) | ||||
| * | Merge branch 'upstream-curl' into update-curl | Brad King | 2020-03-04 | 1 | -21/+8 |
| | | | | | | * upstream-curl: curl 2020-03-04 (b8d13668) | ||||
| * | Merge branch 'upstream-curl' into update-curl | Brad King | 2018-10-22 | 1 | -7/+7 |
| | | | | | | * upstream-curl: curl 2018-09-04 (432eb5f5) | ||||
| * | Merge branch 'curl-upstream' into update-curl | Brad King | 2014-10-29 | 1 | -0/+35 |
| 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 |