Commit Graph

5 Commits

Author SHA1 Message Date
Brad King
7f2b2375ba Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2025-02-05 (34cf9d54)
2025-02-05 09:27:48 -05:00
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
c1f76e6c21 Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2023-09-13 (6fa1d817)

Upstream significantly refactored `lib/CMakeLists.txt`, so take the
upstream version of everything except the code added by commit
54cb23c657 (curl: Restore installation of OpenSSL DLLs, 2014-11-03,
v3.2.0-rc1~418^2~4).  We will apply our customizations again in a
follow-up commit.
2023-09-22 10:55:37 -04:00
Brad King
188c065e5a Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2023-07-26 (50490c06)
2023-08-01 13:58:24 -04:00