Commit Graph

12 Commits

Author SHA1 Message Date
Brad King
ce1550f178 Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2023-02-20 (046209e5)
2023-02-21 10:04:36 -05:00
Brad King
f9f5957884 Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2022-12-21 (c12fb3dd)
2023-01-27 15:58:44 -05:00
Brad King
9ffe6b0969 Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2022-10-26 (cd95ee9f)
2022-10-31 16:11:41 -04:00
Brad King
54931fdff0 Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2020-12-09 (e0528597)
2020-12-09 11:45:25 -05:00
Brad King
d61c3bd505 Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2020-03-04 (b8d13668)
2020-03-04 14:34:39 -05:00
Brad King
3e913b819d Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2018-05-15 (cb013830)
2018-05-18 10:16:50 -04:00
Brad King
cd8e31a1bf Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2018-01-23 (d6c21c8e)
2018-01-24 14:18:16 -05:00
Brad King
9e3ef40edb Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2017-10-04 (3ea76790)
2017-10-10 11:15:16 -04:00
Brad King
1df9d5f919 Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2016-12-22 (44b9b4d4)
2017-02-07 11:38:00 -05:00
Brad King
f53f4a8a2d Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2016-08-03 (f2cb3a01)
2016-08-03 14:26:53 -04:00
Brad King
80c881f793 Merge branch 'curl-upstream' into update-curl
Resolve all conflicts in favor of the upstream side.
We can re-apply specific changes later.
2014-10-29 16:43:21 -04:00
Brad King
9cf069f88b curl: Move sources back into upstream layout
Update our build files as needed to compensate.
2014-10-29 16:41:10 -04:00