merge from 1.7.3.5(r13153:r13167)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@13168 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2013-09-29 23:32:39 +00:00
parent cc47d2b247
commit 2d3f149b5a
2042 changed files with 129266 additions and 126243 deletions

View file

@ -19,7 +19,7 @@
<action name="procWidgetInsertDocument" type="controller" standalone="true" />
<action name="procWidgetCopyDocument" type="controller" standalone="true" />
<action name="procWidgetDeleteDocument" type="controller" standalone="true" />
<action name="procWidgetGenerateCodeInPage" type="controller" standalone="true" />
<action name="procWidgetGenerateCodeInPage" type="controller" standalone="true" ruleset="generateCodeInPage" />
<action name="procWidgetGetColorsetList" type="controller" standalone="true" />
<action name="procWidgetStyleExtraImageUpload" type="controller" standalone="true" />