Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'upstream-curl' into update-curl | Brad King | 2020-03-04 | 1 | -1/+7 |
| | | | | | * 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 | 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 | -5/+8 |
| | | | | | 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/+28 |
Update our build files as needed to compensate. |