Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'upstream-curl' into update-curl | Brad King | 2023-02-21 | 1 | -1/+1 |
| | | | | | * upstream-curl: curl 2023-02-20 (046209e5) | ||||
* | Merge branch 'upstream-curl' into update-curl | Brad King | 2023-01-27 | 1 | -3/+0 |
| | | | | | * upstream-curl: curl 2022-12-21 (c12fb3dd) | ||||
* | Merge branch 'upstream-curl' into update-curl | Brad King | 2022-10-31 | 1 | -0/+2 |
| | | | | | * upstream-curl: curl 2022-10-26 (cd95ee9f) | ||||
* | Merge branch 'upstream-curl' into update-curl | Brad King | 2022-04-28 | 1 | -2/+2 |
| | | | | | * upstream-curl: curl 2022-04-27 (1669b17d) | ||||
* | Merge branch 'upstream-curl' into update-curl | Brad King | 2021-05-27 | 1 | -8/+2 |
| | | | | | * upstream-curl: curl 2021-05-26 (6b951a69) | ||||
* | Merge branch 'upstream-curl' into update-curl | Brad King | 2020-12-09 | 1 | -2/+2 |
| | | | | | * upstream-curl: curl 2020-12-09 (e0528597) | ||||
* | Merge branch 'upstream-curl' into update-curl | Brad King | 2020-03-04 | 1 | -1/+1 |
| | | | | | * upstream-curl: curl 2020-03-04 (b8d13668) | ||||
* | Merge branch 'upstream-curl' into update-curl | Brad King | 2018-10-31 | 1 | -1/+2 |
| | | | | | * upstream-curl: curl 2018-10-30 (19667715) | ||||
* | Merge branch 'upstream-curl' into update-curl | Brad King | 2017-05-11 | 1 | -2/+1 |
| | | | | | | | | * 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 | -3/+3 |
| | | | | | * upstream-curl: curl 2016-08-03 (f2cb3a01) | ||||
* | Merge branch 'curl-upstream' into update-curl | Brad King | 2014-10-29 | 1 | -0/+91 |
Resolve all conflicts in favor of the upstream side. We can re-apply specific changes later. |