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

..

curl.h

Merge branch 'curl-upstream' into update-curl

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

curlbuild.h.cmake

Merge branch 'curl-upstream' into update-curl

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

curlrules.h

Merge branch 'curl-upstream' into update-curl

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

curlver.h

Merge branch 'curl-upstream' into update-curl

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

easy.h

Merge branch 'curl-upstream' into update-curl

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

mprintf.h

Merge branch 'curl-upstream' into update-curl

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

multi.h

Merge branch 'curl-upstream' into update-curl

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

stdcheaders.h

Merge branch 'curl-upstream' into update-curl

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

typecheck-gcc.h

Merge branch 'curl-upstream' into update-curl

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