Merge branch 'develop' of https://github.com/ONLYOFFICE/web-apps into develop

This commit is contained in:
Julia Radzhabova 2016-04-28 13:52:31 +03:00
commit 00edd5d736
3 changed files with 3 additions and 4 deletions

View file

@ -264,6 +264,7 @@
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/WorkEvents.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/History.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/editor/documentContent.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Shapes/EditorSettings.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Shapes/Serialize.js"></script>
@ -354,7 +355,6 @@
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Document.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Common.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Numbering.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/DocumentContent.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Table.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Table/TableRecalculate.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Table/TableDraw.js"></script>

View file

@ -261,6 +261,7 @@
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/WorkEvents.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/History.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/editor/documentContent.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Shapes/EditorSettings.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Shapes/Serialize.js"></script>
@ -392,7 +393,6 @@
<script src="../../../../sdkjs/word/Editor/Paragraph.js"></script>
<script src="../../../../sdkjs/word/Editor/Paragraph_Recalculate.js"></script>
<script src="../../../../sdkjs/word/Editor/Document.js"></script>
<script src="../../../../sdkjs/word/Editor/DocumentContent.js"></script>
<script src="../../../../sdkjs/word/Editor/HeaderFooter.js"></script>
<script src="../../../../sdkjs/word/Editor/Math.js"></script>
<script src="../../../../sdkjs/word/Editor/Spelling.js"></script>

View file

@ -264,6 +264,7 @@
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/WorkEvents.js"></script>
<script type="text/javascript" src="../../../../sdkjs/cell/model/History.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/editor/documentContent.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Shapes/EditorSettings.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Shapes/Serialize.js"></script>
@ -304,7 +305,6 @@
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/TrackObjects/Spline.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/DrawingObjectsHandlers.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/TextDrawer.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/Drawings/Externals.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/GlobalLoaders.js"></script>
<script type="text/javascript" src="../../../../sdkjs/common/CollaborativeEditingBase.js"></script>
@ -384,7 +384,6 @@
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Numbering.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/HeaderFooter.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Document.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/DocumentContent.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Table.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Table/TableRecalculate.js"></script>
<script type="text/javascript" src="../../../../sdkjs/word/Editor/Table/TableDraw.js"></script>