Merge branch 'widget_grid' into widget
Conflicts: examples/widgetapp/widget.coffee examples/widgetapp/widget.js
This commit is contained in:
@@ -25,7 +25,7 @@
|
||||
<cluster name="grid" location=".\webcontrol\grid\"/>
|
||||
<cluster name="autocompletions" location=".\webcontrol\autocompletions\"/>
|
||||
<cluster name="navbar" location=".\webcontrol\navbar\"/>
|
||||
<cluster name="progressbar" location="\home\severin\Documents\EWF\EWF\library\server\wsf_html\webcontrol\progressbar\"/>
|
||||
<cluster name="progressbar" location=".\webcontrol\progressbar\"/>
|
||||
</cluster>
|
||||
<cluster name="widget" location=".\widget\" recursive="true"/>
|
||||
</target>
|
||||
|
||||
Reference in New Issue
Block a user