Commit Graph

16 Commits

Author SHA1 Message Date
Brad King
8429b65f27 Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2025-11-05 (400fffa9)
2025-11-06 16:51:58 -05:00
Brad King
8145958e01 Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2025-09-10 (11b99123)
2025-09-10 17:13:04 -04:00
Brad King
c8f51c1d21 Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2025-07-16 (cfbfb650)
2025-07-21 13:41:04 -04:00
Brad King
cebb60188f Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2025-06-04 (fdb8a789)
2025-06-04 14:05:21 -04:00
Brad King
ba77812035 Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2025-02-13 (57495c64)
2025-02-13 11:17:59 -05:00
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
54ddc7023c Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2024-12-11 (75a2079d)
2024-12-12 10:00:24 -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
6badc712e1 Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2024-05-22 (fd567d4f)
2024-05-29 14:04:11 -04:00
Brad King
e28ea90c1b Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2024-01-31 (5ce164e0)
2024-01-31 10:02:45 -05:00
Brad King
548f0cfd1d Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2023-12-06 (7161cb17)
2023-12-11 20:33:07 -05: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
Brad King
a6c9b53273 Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2023-05-30 (7ab9d437)
2023-05-30 09:39:43 -04:00
Brad King
e3dc4df9b9 Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2023-03-20 (b16d1fa8)
2023-03-20 16:40:49 -04:00