mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-19 21:50:39 -06:00
Code Issues Packages Projects Releases Wiki Activity
71,415 Commits 2 Branches 391 Tags
050f891d81f171a75d052d1f7ced5839913dffbc
Commit Graph

21 Commits

Author SHA1 Message Date
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
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
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
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
f9f5957884 Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2022-12-21 (c12fb3dd)
 2023-01-27 15:58:44 -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
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
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
6d423195d5 Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2020-06-30 (5a1fc8d3)
 2020-07-01 10:10:23 -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
d61c3bd505 Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2020-03-04 (b8d13668)
 2020-03-04 14:34:39 -05: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
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
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
91e8d35ab8 Merge branch 'curl-upstream' into update-curl 
Resolve conflicts by taking upstream side when possible and otherwise
integrating the changes from both sides.  Be carful in CMakeLists.txt
where the OPENSSL code block that we modified previously has moved, and
preserve our previous modifications in the new location.
 2015-08-12 15:43:52 -04:00
Brad King
392a318862 curl: Fix spelling errors reported by Lintian 
Re-apply change from commit v2.8.3~265^2~1 (Fix spelling errors
reported by Lintian, 2010-07-02) on updated upstream curl.
 2014-10-29 16:43:37 -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