reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2025-01-20 18:34:22 +00:00
Code Issues Actions Packages Projects 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
amigaos.c
Merge branch 'curl-upstream' into update-curl
2015-08-12 15:43:52 -04:00
amigaos.h
…
arpa_telnet.h
…
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
…
base64.c
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
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
…
content_encoding.h
…
cookie.c
Merge branch 'curl-upstream' into update-curl
2015-08-12 15:43:52 -04:00
cookie.h
…
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
…
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
…
curl_gethostname.c
…
curl_gethostname.h
…
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
…
curl_ldap.h
…
curl_md4.h
Merge branch 'curl-upstream' into update-curl
2015-08-12 15:43:52 -04:00
curl_md5.h
…
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
…
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_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_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_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
…
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_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_sec.h
Merge branch 'curl-upstream' into update-curl
2015-08-12 15:43:52 -04:00
curl_setup_once.h
…
curl_setup.h
Merge branch 'curl-upstream' into update-curl
2015-08-12 15:43:52 -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
…
dotdot.c
…
dotdot.h
…
easy.c
Merge branch 'curl-upstream' into update-curl
2015-08-12 15:43:52 -04:00
easyif.h
…
escape.c
Merge branch 'curl-upstream' into update-curl
2015-08-12 15:43:52 -04:00
escape.h
…
file.c
Merge branch 'curl-upstream' into update-curl
2015-08-12 15:43:52 -04:00
file.h
…
fileinfo.c
Merge branch 'curl-upstream' into update-curl
2015-08-12 15:43:52 -04:00
fileinfo.h
…
formdata.c
Merge branch 'curl-upstream' into update-curl
2015-08-12 15:43:52 -04:00
formdata.h
…
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
…
getenv.c
…
getinfo.c
Merge branch 'curl-upstream' into update-curl
2015-08-12 15:43:52 -04:00
getinfo.h
…
gopher.c
Merge branch 'curl-upstream' into update-curl
2015-08-12 15:43:52 -04:00
gopher.h
…
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
…
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
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
hostsyn.c
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
…
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_sspi.c
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_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
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
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
…
inet_pton.h
…
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
…
llist.c
…
llist.h
…
Makefile.inc
Merge branch 'curl-upstream' into update-curl
2015-08-12 15:43:52 -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
…
non-ascii.c
Merge branch 'curl-upstream' into update-curl
2015-08-12 15:43:52 -04:00
non-ascii.h
…
nonblock.c
…
nonblock.h
…
nwlib.c
Merge branch 'curl-upstream' into update-curl
2015-08-12 15:43:52 -04:00
nwos.c
…
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
…
pingpong.c
Merge branch 'curl-upstream' into update-curl
2015-08-12 15:43:52 -04:00
pingpong.h
…
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
…
rawstr.c
…
rawstr.h
…
rtsp.c
Merge branch 'curl-upstream' into update-curl
2015-08-12 15:43:52 -04:00
rtsp.h
…
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
…
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
…
slist.c
Merge branch 'curl-upstream' into update-curl
2015-08-12 15:43:52 -04:00
slist.h
…
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
…
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
socks.c
Merge branch 'curl-upstream' into update-curl
2015-08-12 15:43:52 -04:00
socks.h
…
speedcheck.c
…
speedcheck.h
…
splay.c
Merge branch 'curl-upstream' into update-curl
2015-08-12 15:43:52 -04:00
splay.h
…
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
…
strequal.h
…
strerror.c
Merge branch 'curl-upstream' into update-curl
2015-08-12 15:43:52 -04:00
strerror.h
…
strtok.c
…
strtok.h
…
strtoofft.c
…
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
…
tftp.c
Merge branch 'curl-upstream' into update-curl
2015-08-12 15:43:52 -04:00
tftp.h
…
timeval.c
Merge branch 'curl-upstream' into update-curl
2015-08-12 15:43:52 -04:00
timeval.h
…
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
…
warnless.h
…
wildcard.c
Merge branch 'curl-upstream' into update-curl
2015-08-12 15:43:52 -04:00
wildcard.h
…
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