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

..

axtls.c

Merge branch 'curl-upstream' into update-curl

2014-10-29 16:43:21 -04:00

axtls.h

Merge branch 'curl-upstream' into update-curl

2014-10-29 16:43:21 -04:00

curl_darwinssl.c

Merge branch 'curl-upstream' into update-curl

2014-10-29 16:43:21 -04:00

curl_darwinssl.h

Merge branch 'curl-upstream' into update-curl

2014-10-29 16:43:21 -04:00

curl_schannel.c

Merge branch 'curl-upstream' into update-curl

2014-10-29 16:43:21 -04:00

curl_schannel.h

Merge branch 'curl-upstream' into update-curl

2014-10-29 16:43:21 -04:00

cyassl.c

Merge branch 'curl-upstream' into update-curl

2014-10-29 16:43:21 -04:00

cyassl.h

Merge branch 'curl-upstream' into update-curl

2014-10-29 16:43:21 -04:00

gskit.c

Merge branch 'curl-upstream' into update-curl

2014-10-29 16:43:21 -04:00

gskit.h

Merge branch 'curl-upstream' into update-curl

2014-10-29 16:43:21 -04:00

gtls.c

Merge branch 'curl-upstream' into update-curl

2014-10-29 16:43:21 -04:00

gtls.h

Merge branch 'curl-upstream' into update-curl

2014-10-29 16:43:21 -04:00

nss.c

Merge branch 'curl-upstream' into update-curl

2014-10-29 16:43:21 -04:00

nssg.h

Merge branch 'curl-upstream' into update-curl

2014-10-29 16:43:21 -04:00

openssl.c

Merge branch 'curl-upstream' into update-curl

2014-10-29 16:43:21 -04:00

openssl.h

Merge branch 'curl-upstream' into update-curl

2014-10-29 16:43:21 -04:00

polarssl_threadlock.c

Merge branch 'curl-upstream' into update-curl

2014-10-29 16:43:21 -04:00

polarssl_threadlock.h

Merge branch 'curl-upstream' into update-curl

2014-10-29 16:43:21 -04:00

polarssl.c

Merge branch 'curl-upstream' into update-curl

2014-10-29 16:43:21 -04:00

polarssl.h

Merge branch 'curl-upstream' into update-curl

2014-10-29 16:43:21 -04:00

qssl.c

Merge branch 'curl-upstream' into update-curl

2014-10-29 16:43:21 -04:00

qssl.h

Merge branch 'curl-upstream' into update-curl

2014-10-29 16:43:21 -04:00

vtls.c

Merge branch 'curl-upstream' into update-curl

2014-10-29 16:43:21 -04:00

vtls.h

Merge branch 'curl-upstream' into update-curl

2014-10-29 16:43:21 -04:00