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
188c065e5a
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2023-07-26 (50490c06)
2023-08-01 13:58:24 -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
30aba1ce8c
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2022-04-27 (1669b17d)
2022-04-28 15:21:23 -04:00
8ecd95845c
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2021-09-14 (8e82f2a0)
2021-09-15 15:28:38 -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
a39138ef9a
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2019-05-22 (885ce314)
2019-05-22 14:15:06 -04:00
9e3ef40edb
Merge branch 'upstream-curl' into update-curl
...
* upstream-curl:
curl 2017-10-04 (3ea76790)
2017-10-10 11:15:16 -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
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