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

33 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
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
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
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
Alex Turbov
2be5a7de4e Build: Use imported target ZLIB::ZLIB instead of variables 2022-09-22 10:20:30 -04:00
Brad King
697e8871a1 Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2022-01-05 (801bd513)
 2022-01-07 11:41:57 -05:00
Brad King
cd40922edb Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2021-05-26 (6b951a69)
 2021-05-27 15:23:20 -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
7d0fa4a943 Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2020-08-19 (9d954e49)
 2020-08-19 12:50:05 -04: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
e9e8dcee6b Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2018-09-04 (432eb5f5)
 2018-10-22 08:48:58 -04:00
Brad King
3e913b819d Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2018-05-15 (cb013830)
 2018-05-18 10:16:50 -04:00
Brad King
cd8e31a1bf Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2018-01-23 (d6c21c8e)
 2018-01-24 14:18:16 -05: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
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
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
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