Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'upstream-curl' into update-curl | Brad King | 2021-09-24 | 1 | -11/+13 |
| | | | | | * upstream-curl: curl 2021-09-22 (c7aef0a9) | ||||
* | Merge branch 'upstream-curl' into update-curl | Brad King | 2021-09-15 | 1 | -0/+4 |
| | | | | | * upstream-curl: curl 2021-09-14 (8e82f2a0) | ||||
* | Merge branch 'upstream-curl' into update-curl | Brad King | 2021-02-03 | 1 | -7/+1 |
| | | | | | * upstream-curl: curl 2021-02-03 (2f33be81) | ||||
* | Merge branch 'upstream-curl' into update-curl | Brad King | 2020-12-09 | 1 | -3/+14 |
| | | | | | * upstream-curl: curl 2020-12-09 (e0528597) | ||||
* | Merge branch 'upstream-curl' into update-curl | Brad King | 2020-06-24 | 1 | -6/+12 |
| | | | | | * upstream-curl: curl 2020-06-23 (e9db32a0) | ||||
* | Merge branch 'upstream-curl' into update-curl | Brad King | 2020-03-04 | 1 | -12/+4 |
| | | | | | * upstream-curl: curl 2020-03-04 (b8d13668) | ||||
* | Merge branch 'upstream-curl' into update-curl | Brad King | 2018-10-31 | 1 | -1/+0 |
| | | | | | * upstream-curl: curl 2018-10-30 (19667715) | ||||
* | Merge branch 'upstream-curl' into update-curl | Brad King | 2017-10-10 | 1 | -2/+3 |
| | | | | | * upstream-curl: curl 2017-10-04 (3ea76790) | ||||
* | Merge branch 'upstream-curl' into update-curl | Brad King | 2017-05-11 | 1 | -3/+3 |
| | | | | | | | | * 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 | 1 | -1/+1 |
| | | | | | * upstream-curl: curl 2016-12-22 (44b9b4d4) | ||||
* | Merge branch 'upstream-curl' into update-curl | Brad King | 2016-12-05 | 1 | -4/+5 |
| | | | | | * upstream-curl: curl 2016-11-02 (3c561c65) | ||||
* | 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 | -10/+64 |
| | | | | | 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/+60 |
Update our build files as needed to compensate. |