Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'upstream-curl' into update-curl | Brad King | 2018-05-18 | 1 | -2/+0 |
| | | | | | * upstream-curl: curl 2018-05-15 (cb013830) | ||||
* | Merge branch 'upstream-curl' into update-curl | Brad King | 2018-01-24 | 1 | -1/+4 |
| | | | | | * upstream-curl: curl 2018-01-23 (d6c21c8e) | ||||
* | Merge branch 'upstream-curl' into update-curl | Brad King | 2017-10-10 | 1 | -7/+60 |
| | | | | | * upstream-curl: curl 2017-10-04 (3ea76790) | ||||
* | Merge branch 'upstream-curl' into update-curl | Brad King | 2017-02-07 | 1 | -2/+2 |
| | | | | | * 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 | -31/+54 |
| | | | | | 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/+165 |
Update our build files as needed to compensate. |