summaryrefslogtreecommitdiffstats
path: root/Utilities/cmcurl/lib/splay.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-curl' into update-curlBrad King2023-02-211-1/+1
| | | | | * upstream-curl: curl 2023-02-20 (046209e5)
* Merge branch 'upstream-curl' into update-curlBrad King2022-10-311-1/+3
| | | | | * upstream-curl: curl 2022-10-26 (cd95ee9f)
* Merge branch 'upstream-curl' into update-curlBrad King2020-12-091-11/+5
| | | | | * upstream-curl: curl 2020-12-09 (e0528597)
* Merge branch 'upstream-curl' into update-curlBrad King2020-03-041-7/+1
| | | | | * upstream-curl: curl 2020-03-04 (b8d13668)
* Merge branch 'upstream-curl' into update-curlBrad King2017-10-101-8/+9
| | | | | * upstream-curl: curl 2017-10-04 (3ea76790)
* Merge branch 'upstream-curl' into update-curlBrad King2017-05-111-1/+2
| | | | | | | | * 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.
* Merge branch 'upstream-curl' into update-curlBrad King2016-08-031-3/+3
| | | | | * upstream-curl: curl 2016-08-03 (f2cb3a01)
* Merge branch 'curl-upstream' into update-curlBrad King2014-10-291-13/+25
| | | | | Resolve all conflicts in favor of the upstream side. We can re-apply specific changes later.
* curl: Move sources back into upstream layoutBrad King2014-10-291-0/+54
Update our build files as needed to compensate.