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

This commit is contained in:
Alexander Yuzhin 2017-01-30 11:27:33 +03:00
commit 94831d1b85
3 changed files with 3 additions and 0 deletions

View file

@ -33,6 +33,7 @@ var sdk_dev_scrpipts = [
"../../../../sdkjs/common/Drawings/ColorArray.js", "../../../../sdkjs/common/Drawings/ColorArray.js",
"../../../../sdkjs/common/Drawings/CommonController.js", "../../../../sdkjs/common/Drawings/CommonController.js",
"../../../../sdkjs/word/Editor/GraphicObjects/DrawingStates.js", "../../../../sdkjs/word/Editor/GraphicObjects/DrawingStates.js",
"../../../../sdkjs/common/Drawings/DrawingsChanges.js",
"../../../../sdkjs/common/Drawings/Format/CreateGeometry.js", "../../../../sdkjs/common/Drawings/Format/CreateGeometry.js",
"../../../../sdkjs/common/Drawings/Format/Geometry.js", "../../../../sdkjs/common/Drawings/Format/Geometry.js",
"../../../../sdkjs/common/Drawings/Format/Format.js", "../../../../sdkjs/common/Drawings/Format/Format.js",

View file

@ -30,6 +30,7 @@ var sdk_dev_scrpipts = [
"../../../../sdkjs/common/Drawings/ColorArray.js", "../../../../sdkjs/common/Drawings/ColorArray.js",
"../../../../sdkjs/common/Drawings/CommonController.js", "../../../../sdkjs/common/Drawings/CommonController.js",
"../../../../sdkjs/common/Drawings/States.js", "../../../../sdkjs/common/Drawings/States.js",
"../../../../sdkjs/common/Drawings/DrawingsChanges.js",
"../../../../sdkjs/common/Drawings/Format/CreateGeometry.js", "../../../../sdkjs/common/Drawings/Format/CreateGeometry.js",
"../../../../sdkjs/common/Drawings/Format/Geometry.js", "../../../../sdkjs/common/Drawings/Format/Geometry.js",
"../../../../sdkjs/common/Drawings/Format/Format.js", "../../../../sdkjs/common/Drawings/Format/Format.js",

View file

@ -30,6 +30,7 @@ var sdk_dev_scrpipts = [
"../../../../sdkjs/common/Drawings/ColorArray.js", "../../../../sdkjs/common/Drawings/ColorArray.js",
"../../../../sdkjs/common/Drawings/CommonController.js", "../../../../sdkjs/common/Drawings/CommonController.js",
"../../../../sdkjs/common/Drawings/States.js", "../../../../sdkjs/common/Drawings/States.js",
"../../../../sdkjs/common/Drawings/DrawingsChanges.js",
"../../../../sdkjs/common/Drawings/Format/CreateGeometry.js", "../../../../sdkjs/common/Drawings/Format/CreateGeometry.js",
"../../../../sdkjs/common/Drawings/Format/Geometry.js", "../../../../sdkjs/common/Drawings/Format/Geometry.js",
"../../../../sdkjs/common/Drawings/Format/Format.js", "../../../../sdkjs/common/Drawings/Format/Format.js",