echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
69,890 Commits 2 Branches 359 Tags 198 MiB
master
Commit Graph

19 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
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
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
8ecd95845c Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2021-09-14 (8e82f2a0)
 2021-09-15 15:28:38 -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
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
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
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
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
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
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