8429b65f27
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2025-11-05 (400fffa9)
2025-11-06 16:51:58 -05:00
8145958e01
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2025-09-10 (11b99123)
2025-09-10 17:13:04 -04:00
c8f51c1d21
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2025-07-16 (cfbfb650)
2025-07-21 13:41:04 -04:00
cebb60188f
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2025-06-04 (fdb8a789)
2025-06-04 14:05:21 -04:00
54ddc7023c
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2024-12-11 (75a2079d)
2024-12-12 10:00:24 -05:00
548f0cfd1d
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2023-12-06 (7161cb17)
2023-12-11 20:33:07 -05:00
188c065e5a
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2023-07-26 (50490c06)
2023-08-01 13:58:24 -04:00
a6c9b53273
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2023-05-30 (7ab9d437)
2023-05-30 09:39:43 -04:00
ce1550f178
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2023-02-20 (046209e5)
2023-02-21 10:04:36 -05:00
9ffe6b0969
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2022-10-26 (cd95ee9f)
2022-10-31 16:11:41 -04:00
54931fdff0
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2020-12-09 (e0528597)
2020-12-09 11:45:25 -05:00
a39138ef9a
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2019-05-22 (885ce314)
2019-05-22 14:15:06 -04:00
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
f53f4a8a2d
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2016-08-03 (f2cb3a01)
2016-08-03 14:26:53 -04:00
91e8d35ab8
Merge branch 'curl-upstream' into update-curl
...
Resolve conflicts by taking upstream side when possible and otherwise
integrating the changes from both sides. Be carful in CMakeLists.txt
where the OPENSSL code block that we modified previously has moved, and
preserve our previous modifications in the new location.
2015-08-12 15:43:52 -04:00
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