merge from 1.5.3 (~r10943)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10951 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-07-27 02:47:10 +00:00
parent 7aa4798373
commit 54e3a72065
334 changed files with 13011 additions and 5561 deletions

View file

@ -7,7 +7,7 @@
<action name="dispEditorComponentInfo" type="view" standalone="true" />
<action name="dispEditorAdminIndex" type="view" standalone="true" menu_name="editor" menu_index="true" admin_index="true" />
<action name="dispEditorAdminSetupComponent" type="view" standalone="true" />
<action name="dispEditorAdminSetupComponent" type="view" menu_name="editor" />
<action name="dispEditorAdminSkinColorset" type="view" standalone="true" />
<action name="dispEditorConfigPreview" type="view" />
<action name="dispEditorPreview" type="view" />