Merge branch 'release/4.0.1' into develop

Conflicts: common/commonDefines.js

Merge branch 'release/4.0.1' into develop
Conflicts: common/commonDefines.js
43375450 · Oleg Korshul · 27353cb1 · 15764928 · 43375450 · 43375450
Commit 43375450 authored Jul 11, 2016 by Oleg Korshul
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 842 additions and 806 deletions

common/commonDefines.js common/commonDefines.js +5 -6

slide/apiDefines.js slide/apiDefines.js +143 -134

word/apiDefines.js word/apiDefines.js +694 -666

No files found.
--- a/common/commonDefines.js
+++ b/common/commonDefines.js
@@ -669,12 +669,11 @@
 		TEXT_ALIGN_TOP    : 4  // Top
 	};
-	var c_oAscVertDrawingText =
+	var c_oAscVertDrawingText = {
-		{
+		normal  : 1,
-			normal  : 1,
+		vert    : 3,
-			vert    : 3,
+		vert270 : 4
-			vert270 : 4
+	};
-		};
 	var c_oAscLineJoinType    = {
 		Round : 1,
 		Bevel : 2,

--- a/slide/apiDefines.js
+++ b/slide/apiDefines.js
--- a/word/apiDefines.js
+++ b/word/apiDefines.js