Merge branch 'v1' into es17.01

# Conflicts: # library/text/parser/uri_template/uri_template-safe.ecf # library/text/parser/uri_template/uri_template.ecf
2017-04-14 12:04:33 +02:00
parent 3590f8546f 273a55d93c
commit 94ba19920e
46 changed files with 12412 additions and 3635 deletions
--- a/examples/desktop_app/src/app_embedded_web_execution.e
+++ b/examples/desktop_app/src/app_embedded_web_execution.e
@@ -205,7 +205,7 @@ feature {NONE} -- Implementation
 					loop
 						s.append ("  - ")
 						s.append (c.item.url_encoded_name)
-						t := c.item.generating_type
+						t := c.item.generating_type.name
 						if t.same_string ("WSF_STRING") then
 						else
 							s.append_character (' ')