cebb60188f
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2025-06-04 (fdb8a789)
2025-06-04 14:05:21 -04:00
7f2b2375ba
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2025-02-05 (34cf9d54)
2025-02-05 09:27:48 -05:00
ce908c42a3
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2024-09-18 (7eb8c048)
2024-09-18 11:51:18 -04:00
54c5367320
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2024-07-24 (5040f7e9)
2024-07-25 11:05:06 -04:00
6badc712e1
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2024-05-22 (fd567d4f)
2024-05-29 14:04:11 -04:00
548f0cfd1d
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2023-12-06 (7161cb17)
2023-12-11 20:33:07 -05:00
df4efb72e4
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2023-10-11 (d755a5f7)
Issue: #25329
2023-10-12 15:29:20 -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
e3dc4df9b9
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2023-03-20 (b16d1fa8)
2023-03-20 16:40:49 -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
f9f5957884
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2022-12-21 (c12fb3dd)
2023-01-27 15:58:44 -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
697e8871a1
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2022-01-05 (801bd513)
2022-01-07 11:41:57 -05:00
8ecd95845c
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2021-09-14 (8e82f2a0)
2021-09-15 15:28:38 -04:00
cd40922edb
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2021-05-26 (6b951a69)
2021-05-27 15:23:20 -04:00
426ef61cc8
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2021-02-03 (2f33be81)
2021-02-03 11:55:06 -05:00
54931fdff0
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2020-12-09 (e0528597)
2020-12-09 11:45:25 -05:00
0ef8fa5000
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2020-06-23 (e9db32a0)
2020-06-24 08:13:02 -04:00
d61c3bd505
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2020-03-04 (b8d13668)
2020-03-04 14:34:39 -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
636bcefeab
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2018-10-30 (19667715)
2018-10-31 09:46:23 -04:00
3e913b819d
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2018-05-15 (cb013830)
2018-05-18 10:16:50 -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
1df9d5f919
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2016-12-22 (44b9b4d4)
2017-02-07 11:38:00 -05: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
9cf069f88b
curl: Move sources back into upstream layout
...
Update our build files as needed to compensate.
2014-10-29 16:41:10 -04:00
Brad King