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 | 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 | -8/+2 |
| | | | | | * upstream-curl: curl 2022-04-27 (1669b17d) | ||||
* | 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 | -5/+5 |
| | | | | | * upstream-curl: curl 2020-03-04 (b8d13668) | ||||
* | Merge branch 'upstream-curl' into update-curl | Brad King | 2019-05-22 | 1 | -1/+3 |
| | | | | | * upstream-curl: curl 2019-05-22 (885ce314) | ||||
* | Merge branch 'upstream-curl' into update-curl | Brad King | 2018-01-24 | 1 | -16/+11 |
| | | | | | * upstream-curl: curl 2018-01-23 (d6c21c8e) | ||||
* | Merge branch 'upstream-curl' into update-curl | Brad King | 2017-10-10 | 1 | -7/+12 |
| | | | | | * upstream-curl: curl 2017-10-04 (3ea76790) | ||||
* | Merge branch 'upstream-curl' into update-curl | Brad King | 2017-06-14 | 1 | -2/+0 |
| | | | | | | | | | * upstream-curl: curl 2017-06-14 (54b636f1) Resolve a logical conflict in `Utilities/cmcurl/CMakeLists.txt` by disabling CA bundle/path detection for build within CMake. CMake already handles locating a CA bundle/path at runtime. | ||||
* | Merge branch 'upstream-curl' into update-curl | Brad King | 2017-02-07 | 1 | -3/+3 |
| | | | | | * upstream-curl: curl 2016-12-22 (44b9b4d4) | ||||
* | Merge branch 'upstream-curl' into update-curl | Brad King | 2016-08-03 | 1 | -1/+1 |
| | | | | | * upstream-curl: curl 2016-08-03 (f2cb3a01) | ||||
* | Merge branch 'curl-upstream' into update-curl | Brad King | 2014-10-29 | 1 | -24/+6 |
| | | | | | Resolve all conflicts in favor of the upstream side. We can re-apply specific changes later. | ||||
* | curl: Move sources back into upstream layout | Brad King | 2014-10-29 | 1 | -0/+76 |
Update our build files as needed to compensate. |