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

Merge branch 'master' into es_17_01

Browse Source 
# Conflicts:
#	examples/demo/demo.ecf
#	modules/node/node-safe.ecf
This commit is contained in:
Jocelyn FIAT
2017-03-01 08:51:23 +01:00
parent 2cea3cf261 13d0927c58
commit 3d2770e759
38 changed files with 1188 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/node/node.ecf
View File

@@ -22,6 +22,7 @@
<library name="json" location="$ISE_LIBRARY\contrib\library\text\parser\json\library\json.ecf"/>
<library name="text_filter" location="$ISE_LIBRARY\unstable\library\text\text_filter\text_filter.ecf"/>
<library name="time" location="$ISE_LIBRARY\library\time\time.ecf"/>
<library name="uri" location="$ISE_LIBRARY\library\text\uri\uri.ecf"/>
<library name="wsf" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf.ecf"/>
<library name="wsf_extension" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf\wsf_extension.ecf" readonly="false"/>
<library name="wsf_html" location="$ISE_LIBRARY\contrib\library\web\framework\ewf\wsf_html\wsf_html.ecf" readonly="false"/>