Brad King
ce908c42a3
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2024-09-18 (7eb8c048)
2024-09-18 11:51:18 -04:00
Brad King
54c5367320
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2024-07-24 (5040f7e9)
2024-07-25 11:05:06 -04:00
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
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
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
299975908a
Merge branch 'upstream-curl' into update-curl
...
* 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.
2017-05-11 11:27:21 -04: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
