backup/EWF
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into es17.05

Browse Source 
# Conflicts:
#	library/network/http_client/http_client-safe.ecf
#	library/network/http_client/libcurl_http_client-safe.ecf
#	library/network/http_client/net_http_client-safe.ecf
This commit is contained in:
Jocelyn Fiat
2017-06-21 09:01:27 +02:00
parent 46a48625ac c7ef652322
commit 21adef6998
5 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
library/network/http_client/http_client.ecf
View File

@@ -33,6 +33,7 @@
<library name="uri" location="$ISE_LIBRARY\library\text\uri\uri.ecf"/> <library name="uri" location="$ISE_LIBRARY\library\text\uri\uri.ecf"/>
<cluster name="src" location=".\src\"> <cluster name="src" location=".\src\">
<cluster name="implementation" location="$|implementation" recursive="true" hidden="true"/> <cluster name="implementation" location="$|implementation" recursive="true" hidden="true"/>
<cluster name="parameters" location="$|parameters" recursive="true"/>
<cluster name="spec_null" location="$|spec\null\" recursive="true"/> <cluster name="spec_null" location="$|spec\null\" recursive="true"/>
<cluster name="spec_net" location="$|spec\net\"> <cluster name="spec_net" location="$|spec\net\">
<condition> <condition>

1
library/network/http_client/libcurl_http_client.ecf
View File

@@ -17,6 +17,7 @@
<library name="uri" location="$ISE_LIBRARY\library\text\uri\uri.ecf"/> <library name="uri" location="$ISE_LIBRARY\library\text\uri\uri.ecf"/>
<cluster name="src" location=".\src\"> <cluster name="src" location=".\src\">
<cluster name="implementation" location="$|implementation" recursive="true" hidden="true"/> <cluster name="implementation" location="$|implementation" recursive="true" hidden="true"/>
<cluster name="parameters" location="$|parameters" recursive="true"/>
<cluster name="spec_libcurl" location="$|spec\libcurl\" recursive="true"/> <cluster name="spec_libcurl" location="$|spec\libcurl\" recursive="true"/>
<cluster name="default_libcurl" location="$|default\libcurl\"/> <cluster name="default_libcurl" location="$|default\libcurl\"/>
</cluster> </cluster>

1
library/network/http_client/net_http_client.ecf
View File

@@ -26,6 +26,7 @@
<library name="uri" location="$ISE_LIBRARY\library\text\uri\uri.ecf"/> <library name="uri" location="$ISE_LIBRARY\library\text\uri\uri.ecf"/>
<cluster name="src" location=".\src\"> <cluster name="src" location=".\src\">
<cluster name="implementation" location="$|implementation" recursive="true" hidden="true"/> <cluster name="implementation" location="$|implementation" recursive="true" hidden="true"/>
<cluster name="parameters" location="$|parameters" recursive="true"/>
<cluster name="spec_net" location="$|spec\net\"> <cluster name="spec_net" location="$|spec\net\">
<cluster name="net_implementation" location="$|implementation\" hidden="true"/> <cluster name="net_implementation" location="$|implementation\" hidden="true"/>
</cluster> </cluster>

0
library/network/http_client/src/implementation/http_client_request_file_parameter.e → library/network/http_client/src/parameters/http_client_request_file_parameter.e
View File

0
library/network/http_client/src/implementation/http_client_request_string_parameter.e → library/network/http_client/src/parameters/http_client_request_string_parameter.e
View File