Brad King 299975908a Merge branch 'upstream-curl' into update-curl ...

* 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.

2017-05-11 11:27:21 -04:00

..

curl.h

Merge branch 'upstream-curl' into update-curl

2017-05-11 11:27:21 -04:00

curlbuild.h.cmake

Merge branch 'upstream-curl' into update-curl

2016-08-03 14:26:53 -04:00

curlrules.h

Merge branch 'upstream-curl' into update-curl

2017-05-11 11:27:21 -04:00

curlver.h

Merge branch 'upstream-curl' into update-curl

2017-05-11 11:27:21 -04:00

easy.h

Merge branch 'upstream-curl' into update-curl

2017-02-07 11:38:00 -05:00

mprintf.h

Merge branch 'upstream-curl' into update-curl

2016-08-03 14:26:53 -04:00

multi.h

Merge branch 'upstream-curl' into update-curl

2016-08-03 14:26:53 -04:00

stdcheaders.h

Merge branch 'upstream-curl' into update-curl

2017-02-07 11:38:00 -05:00

system.h

Merge branch 'upstream-curl' into update-curl

2017-05-11 11:27:21 -04:00

typecheck-gcc.h

Merge branch 'upstream-curl' into update-curl

2017-05-11 11:27:21 -04:00