Brad King a3ef36f153 Merge branch 'upstream-curl' into update-curl ...

* upstream-curl:
  curl 2017-06-14 (54b636f1)

Resolve a logical conflict in `Utilities/cmcurl/CMakeLists.txt`
by disabling CA bundle/path detection for build within CMake.
CMake already handles locating a CA bundle/path at runtime.

2017-06-14 11:10:22 -04:00

..

CMake

Merge branch 'upstream-curl' into update-curl

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

include/curl

Merge branch 'upstream-curl' into update-curl

2017-06-14 11:10:22 -04:00

lib

Merge branch 'upstream-curl' into update-curl

2017-06-14 11:10:22 -04:00

.gitattributes

curl: Disable all whitespace checks in third-party code

2014-10-29 16:41:05 -04:00

CMakeLists.txt

Merge branch 'upstream-curl' into update-curl

2017-06-14 11:10:22 -04:00

COPYING

Merge branch 'upstream-curl' into update-curl

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

curltest.c

curl: Drop unused testing code

2014-10-29 16:41:14 -04:00