mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-04 04:40:56 -06:00
Code Issues Packages Projects Releases Wiki Activity
73,063 Commits 2 Branches 385 Tags
34c0c7754ffdbc03b94de64f55eb046b9bbaec0d
Commit Graph

16 Commits

Author SHA1 Message Date
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
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
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
ce1550f178 Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2023-02-20 (046209e5)
 2023-02-21 10:04:36 -05:00
Brad King
9ffe6b0969 Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2022-10-26 (cd95ee9f)
 2022-10-31 16:11:41 -04:00
Brad King
426ef61cc8 Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2021-02-03 (2f33be81)
 2021-02-03 11:55:06 -05:00
Brad King
54931fdff0 Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2020-12-09 (e0528597)
 2020-12-09 11:45:25 -05:00
Brad King
0ef8fa5000 Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2020-06-23 (e9db32a0)
 2020-06-24 08:13:02 -04:00
Brad King
a39138ef9a Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2019-05-22 (885ce314)
 2019-05-22 14:15:06 -04:00
Brad King
9e3ef40edb Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2017-10-04 (3ea76790)
 2017-10-10 11:15:16 -04:00
Brad King
1df9d5f919 Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2016-12-22 (44b9b4d4)
 2017-02-07 11:38:00 -05:00
Brad King
f8a1ba202f Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2016-11-02 (3c561c65)
 2016-12-05 11:50:43 -05:00
Brad King
f53f4a8a2d Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2016-08-03 (f2cb3a01)
 2016-08-03 14:26:53 -04:00
Brad King
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
9cf069f88b curl: Move sources back into upstream layout 
Update our build files as needed to compensate.
 2014-10-29 16:41:10 -04:00