Merge branch 'master' of https://github.com/ecomfe/echarts

apache · Jun 30, 2016 · 0d4361c · 0d4361c
2 parents 79f1961 + 0910d23
commit 0d4361c
Show file tree

Hide file tree

Showing 8 changed files with 8,787 additions and 3,833 deletions.
diff --git a/dist/echarts.common.js b/dist/echarts.common.js
diff --git a/dist/echarts.common.min.js b/dist/echarts.common.min.js
diff --git a/dist/echarts.js b/dist/echarts.js
diff --git a/dist/echarts.min.js b/dist/echarts.min.js
diff --git a/dist/echarts.simple.js b/dist/echarts.simple.js
diff --git a/dist/echarts.simple.min.js b/dist/echarts.simple.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "echarts",
-  "version": "3.1.10",
+  "version": "3.2.0",
   "description": "A powerful charting and visualization library for browser",
   "keywords": [
     "visualization",
@@ -35,7 +35,7 @@
     "prepublish": "node build/amd2common.js"
   },
   "dependencies": {
-    "zrender": "^3.1.0"
+    "zrender": "^3.1.1"
   },
   "devDependencies": {
     "coordtransform": "^2.0.2",
@@ -45,6 +45,6 @@
     "fs-extra": "^0.26.5",
     "glob": "^7.0.0",
     "webpack": "^1.12.13",
-    "zrender": "^3.1.0"
+    "zrender": "^3.1.1"
   }
 }
diff --git a/src/echarts.js b/src/echarts.js
@@ -1151,9 +1151,9 @@ define(function (require) {
         /**
          * @type {number}
          */
-        version: '3.1.10',
+        version: '3.2.0',
         dependencies: {
-            zrender: '3.1.0'
+            zrender: '3.1.1'
         }
     };