Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'upstream-curl' into update-curl | Brad King | 2017-10-10 | 1 | -5/+6 |
| | | | | | * 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/+11 |
| | | | | | * upstream-curl: curl 2016-12-22 (44b9b4d4) | ||||
* | Merge branch 'upstream-curl' into update-curl | Brad King | 2016-12-05 | 1 | -0/+166 |
* upstream-curl: curl 2016-11-02 (3c561c65) |