summaryrefslogtreecommitdiffstats
path: root/Utilities/cmcurl/lib/content_encoding.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-curl' into update-curlBrad King2022-10-311-32/+51
| | | | | * upstream-curl: curl 2022-10-26 (cd95ee9f)
* Build: Use imported target `ZLIB::ZLIB` instead of variablesAlex Turbov2022-09-221-1/+1
|
* Merge branch 'upstream-curl' into update-curlBrad King2022-01-071-1/+2
| | | | | * upstream-curl: curl 2022-01-05 (801bd513)
* Merge branch 'upstream-curl' into update-curlBrad King2021-05-271-4/+5
| | | | | * upstream-curl: curl 2021-05-26 (6b951a69)
* Merge branch 'upstream-curl' into update-curlBrad King2021-02-031-88/+84
| | | | | * upstream-curl: curl 2021-02-03 (2f33be81)
* Merge branch 'upstream-curl' into update-curlBrad King2020-12-091-5/+1
| | | | | * upstream-curl: curl 2020-12-09 (e0528597)
* Merge branch 'upstream-curl' into update-curlBrad King2020-08-191-0/+96
| | | | | * upstream-curl: curl 2020-08-19 (9d954e49)
* Merge branch 'upstream-curl' into update-curlBrad King2020-06-241-64/+66
| | | | | * upstream-curl: curl 2020-06-23 (e9db32a0)
* Merge branch 'upstream-curl' into update-curlBrad King2018-10-221-16/+24
| | | | | * upstream-curl: curl 2018-09-04 (432eb5f5)
* Merge branch 'upstream-curl' into update-curlBrad King2018-05-181-3/+2
| | | | | * upstream-curl: curl 2018-05-15 (cb013830)
* Merge branch 'upstream-curl' into update-curlBrad King2018-01-241-132/+714
| | | | | * upstream-curl: curl 2018-01-23 (d6c21c8e)
* Merge branch 'upstream-curl' into update-curlBrad King2017-10-101-3/+3
| | | | | * upstream-curl: curl 2017-10-04 (3ea76790)
* Merge branch 'upstream-curl' into update-curlBrad King2017-05-111-3/+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 King2017-02-071-13/+10
| | | | | * upstream-curl: curl 2016-12-22 (44b9b4d4)
* 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-86/+97
| | | | | 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/+424
Update our build files as needed to compensate.