Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'upstream-curl' into update-curl | Brad King | 2021-02-03 | 5 | -11/+24 |
| | | | | | * upstream-curl: curl 2021-02-03 (2f33be81) | ||||
* | Merge branch 'upstream-curl' into update-curl | Brad King | 2020-12-09 | 15 | -22/+21 |
| | | | | | * upstream-curl: curl 2020-12-09 (e0528597) | ||||
* | Merge branch 'upstream-curl' into update-curl | Brad King | 2020-08-19 | 1 | -0/+1 |
| | | | | | * upstream-curl: curl 2020-08-19 (9d954e49) | ||||
* | Merge branch 'upstream-curl' into update-curl | Brad King | 2020-06-24 | 9 | -29/+41 |
| | | | | | * upstream-curl: curl 2020-06-23 (e9db32a0) | ||||
* | Merge branch 'upstream-curl' into update-curl | Brad King | 2020-03-04 | 11 | -74/+124 |
| | | | | | * upstream-curl: curl 2020-03-04 (b8d13668) | ||||
* | Merge branch 'upstream-curl' into update-curl | Brad King | 2019-05-22 | 12 | -223/+349 |
| | | | | | * upstream-curl: curl 2019-05-22 (885ce314) | ||||
* | Merge branch 'upstream-curl' into update-curl | Brad King | 2018-10-31 | 10 | -18/+20 |
| | | | | | * upstream-curl: curl 2018-10-30 (19667715) | ||||
* | Merge branch 'upstream-curl' into update-curl | Brad King | 2018-10-22 | 1 | -3/+3 |
| | | | | | * upstream-curl: curl 2018-09-04 (432eb5f5) | ||||
* | Merge branch 'upstream-curl' into update-curl | Brad King | 2018-05-18 | 8 | -41/+41 |
| | | | | | * upstream-curl: curl 2018-05-15 (cb013830) | ||||
* | Merge branch 'upstream-curl' into update-curl | Brad King | 2018-01-24 | 3 | -45/+158 |
| | | | | | * upstream-curl: curl 2018-01-23 (d6c21c8e) | ||||
* | Merge branch 'upstream-curl' into update-curl | Brad King | 2017-10-10 | 5 | -13/+66 |
| | | | | | * upstream-curl: curl 2017-10-04 (3ea76790) | ||||
* | Merge branch 'upstream-curl' into update-curl | Brad King | 2017-06-14 | 2 | -21/+12 |
| | | | | | | | | | * 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-05-11 | 7 | -128/+205 |
| | | | | | | | | * 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 | 2017-02-07 | 5 | -21/+36 |
| | | | | | * upstream-curl: curl 2016-12-22 (44b9b4d4) | ||||
* | Merge branch 'upstream-curl' into update-curl | Brad King | 2016-12-05 | 11 | -22/+220 |
| | | | | | * upstream-curl: curl 2016-11-02 (3c561c65) | ||||
* | Merge branch 'upstream-curl' into update-curl | Brad King | 2016-08-03 | 15 | -0/+4874 |
* upstream-curl: curl 2016-08-03 (f2cb3a01) |