kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
CMake/Utilities/cmcurl/lib
History
Brad King 91e8d35ab8 Merge branch 'curl-upstream' into update-curl 
Resolve conflicts by taking upstream side when possible and otherwise
integrating the changes from both sides.  Be carful in CMakeLists.txt
where the OPENSSL code block that we modified previously has moved, and
preserve our previous modifications in the new location.
 		2015-08-12 15:43:52 -04:00
..
vtls Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
CMakeLists.txt Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
Makefile.inc Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
amigaos.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
amigaos.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
arpa_telnet.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
asyn-ares.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
asyn-thread.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
asyn.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
base64.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
conncache.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
conncache.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
connect.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
connect.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
content_encoding.c Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
content_encoding.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
cookie.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
cookie.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
curl_addrinfo.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
curl_addrinfo.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
curl_base64.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
curl_config.h.cmake Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
curl_des.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
curl_des.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
curl_endian.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
curl_endian.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
curl_fnmatch.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
curl_fnmatch.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
curl_gethostname.c Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
curl_gethostname.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
curl_gssapi.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
curl_gssapi.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
curl_hmac.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
curl_ldap.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
curl_md4.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
curl_md5.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
curl_memory.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
curl_memrchr.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
curl_memrchr.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
curl_multibyte.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
curl_multibyte.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
curl_ntlm.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
curl_ntlm.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
curl_ntlm_core.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
curl_ntlm_core.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
curl_ntlm_msgs.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
curl_ntlm_msgs.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
curl_ntlm_wb.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
curl_ntlm_wb.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
curl_printf.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
curl_rtmp.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
curl_rtmp.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
curl_sasl.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
curl_sasl.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
curl_sasl_gssapi.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
curl_sasl_sspi.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
curl_sec.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
curl_setup.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
curl_setup_once.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
curl_sspi.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
curl_sspi.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
curl_threads.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
curl_threads.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
curlx.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
dict.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
dict.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
dotdot.c Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
dotdot.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
easy.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
easyif.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
escape.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
escape.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
file.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
file.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
fileinfo.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
fileinfo.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
formdata.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
formdata.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
ftp.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
ftp.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
ftplistparser.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
ftplistparser.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
getenv.c Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
getinfo.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
getinfo.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
gopher.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
gopher.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
hash.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
hash.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
hmac.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
hostasyn.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
hostcheck.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
hostcheck.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
hostip.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
hostip.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
hostip4.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
hostip6.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
hostsyn.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
http.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
http.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
http2.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
http2.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
http_chunks.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
http_chunks.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
http_digest.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
http_digest.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
http_negotiate.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
http_negotiate.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
http_negotiate_sspi.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
http_proxy.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
http_proxy.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
idn_win32.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
if2ip.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
if2ip.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
imap.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
imap.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
inet_ntop.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
inet_ntop.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
inet_pton.c Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
inet_pton.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
krb5.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
ldap.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
libcurl.rc Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
llist.c Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
llist.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
md4.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
md5.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
memdebug.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
memdebug.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
mprintf.c curl: Remove unused SIZEOF_LONG_DOUBLE 2014-10-29 16:43:27 -04:00
multi.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
multihandle.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
multiif.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
netrc.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
netrc.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
non-ascii.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
non-ascii.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
nonblock.c Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
nonblock.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
nwlib.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
nwos.c Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
openldap.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
parsedate.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
parsedate.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
pingpong.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
pingpong.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
pipeline.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
pipeline.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
pop3.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
pop3.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
progress.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
progress.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
rawstr.c Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
rawstr.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
rtsp.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
rtsp.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
security.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
select.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
select.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
sendf.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
sendf.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
setup-os400.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
setup-vms.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
share.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
share.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
sigpipe.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
slist.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
slist.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
smb.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
smb.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
smtp.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
smtp.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
sockaddr.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
socks.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
socks.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
socks_gssapi.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
socks_sspi.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
speedcheck.c Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
speedcheck.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
splay.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
splay.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
ssh.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
ssh.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
strdup.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
strdup.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
strequal.c Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
strequal.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
strerror.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
strerror.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
strtok.c Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
strtok.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
strtoofft.c Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
strtoofft.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
telnet.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
telnet.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
tftp.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
tftp.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
timeval.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
timeval.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
transfer.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
transfer.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
url.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
url.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
urldata.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
version.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
warnless.c Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
warnless.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
wildcard.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
wildcard.h Merge branch 'curl-upstream' into update-curl 2014-10-29 16:43:21 -04:00
x509asn1.c Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00
x509asn1.h Merge branch 'curl-upstream' into update-curl 2015-08-12 15:43:52 -04:00