merge source

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@63636 954022d7-b5bf-4e40-9824-e11837661b57

merge source
git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@63636 954022d7-b5bf-4e40-9824-e11837661b57
8dc6b229 · Alexander.Trofimov · Alexander.Trofimov · 890bff65 · 8dc6b229 · 8dc6b229
Commit 8dc6b229 authored Jul 22, 2015 by Alexander.Trofimov Committed by Alexander.Trofimov May 18, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

Excel/app.js Excel/app.js +1 -0

PowerPoint/app.js PowerPoint/app.js +1 -0

Word/app.js Word/app.js +1 -0

No files found.
--- a/Excel/app.js
+++ b/Excel/app.js
@@ -128,6 +128,7 @@ require([
        'spreadsheeteditor/main/app/view/ImageSettings',
        'spreadsheeteditor/main/app/view/ChartSettings',
        'spreadsheeteditor/main/app/view/ShapeSettings',
+        'spreadsheeteditor/main/app/view/TextArtSettings',
        'common/main/lib/util/utils',
        'common/main/lib/controller/Fonts',
        'common/main/lib/controller/Comments',

--- a/PowerPoint/app.js
+++ b/PowerPoint/app.js
@@ -129,6 +129,7 @@ require([
        'presentationeditor/main/app/view/ShapeSettings',
        'presentationeditor/main/app/view/SlideSettings',
        'presentationeditor/main/app/view/TableSettings',
+        'presentationeditor/main/app/view/TextArtSettings',
        'common/main/lib/util/utils',
        'common/main/lib/controller/Fonts'
        /** coauthoring begin **/

--- a/Word/app.js
+++ b/Word/app.js
@@ -147,6 +147,7 @@ require([
        'documenteditor/main/app/view/ImageSettings',
        'documenteditor/main/app/view/TableSettings',
        'documenteditor/main/app/view/ShapeSettings',
+        'documenteditor/main/app/view/TextArtSettings',
        'common/main/lib/util/utils',
        'common/main/lib/controller/Fonts',
        'common/main/lib/controller/History'