| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'upstream-curl' into update-curl | Brad King | 2018-05-18 | 1 | -4/+4 |
| | | | | | | * upstream-curl: curl 2018-05-15 (cb013830) | ||||
| * | Merge branch 'upstream-curl' into update-curl | Brad King | 2017-05-11 | 1 | -3/+6 |
| | | | | | | | | | * upstream-curl: curl 2017-04-19 (d957e218) Resolve conflicts in `CMakeLists.txt` in favor of the upstream version. We will re-apply our logic as needed in following commits. | ||||
| * | Merge branch 'upstream-curl' into update-curl | Brad King | 2016-08-03 | 1 | -2/+2 |
| | | | | | | * upstream-curl: curl 2016-08-03 (f2cb3a01) | ||||
| * | Merge branch 'curl-upstream' into update-curl | Brad King | 2014-10-29 | 1 | -0/+58 |
| 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 |