 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
|
636bcefeab
|
Merge branch 'upstream-curl' into update-curl
* upstream-curl:
curl 2018-10-30 (19667715)
|
2018-10-31 09:46:23 -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
|
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
|
f8a1ba202f
|
Merge branch 'upstream-curl' into update-curl
* upstream-curl:
curl 2016-11-02 (3c561c65)
|
2016-12-05 11:50:43 -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 |
|