[incubator-echarts] 01/01: Merge branch 'master' into dev

[sushuang]

This is an automated email from the ASF dual-hosted git repository.

sushuang pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git

commit c33d59e2916c966b65b819be19557f1e73f16160
Merge: 8f2399c 838cc39
Author: sushuang 
AuthorDate: Tue May 22 05:14:49 2018 +0800

Merge branch 'master' into dev

 build/addHeader.js   | 48 +---
 build/pre-publish.js |  6 ++--
 extension/bmap/BMapCoordSys.js   | 20 +
 extension/bmap/BMapModel.js  | 20 +
 extension/bmap/BMapView.js   | 20 +
 extension/bmap/bmap.js   | 20 +
 extension/dataTool/gexf.js   | 20 +
 extension/dataTool/index.js  | 20 +
 extension/dataTool/prepareBoxplotData.js | 20 +
 extension/dataTool/quantile.js   | 20 +
 src/chart/helper/treeHelper.js   |  5 
 11 files changed, 201 insertions(+), 18 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
sushu...@apache.org.

-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org

[incubator-echarts] 01/01: Merge branch 'master' into dev

[sushuang]

This is an automated email from the ASF dual-hosted git repository.

sushuang pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git

commit e9ed98080d27feb40f809e65a86d2e1122501a11
Merge: 6241ebf 0679d2c
Author: sushuang 
AuthorDate: Mon May 7 00:03:58 2018 +0800

Merge branch 'master' into dev

 .gitignore |   3 +
 .rat-excludes  |  70 +++--
 build/addHeader.js |  27 +
 build/preamble.js  |  31 +-
 build/{ => rat}/apache-rat-0.12.jar| Bin
 build/{rat.sh => rat/build-run-rat.sh} |   9 +-
 build/rat/javassist.jar| Bin 0 -> 759215 bytes
 build/rat/rat.sh   |  63 +++
 build/rat/runrat.jar   | Bin 0 -> 2561 bytes
 build/rat/src/MANIFEST.txt |   2 +
 build/rat/src/RunRat.class | Bin 0 -> 3914 bytes
 build/rat/src/RunRat.java  | 184 +
 build/rat/src/report.xsl   |  88 
 13 files changed, 418 insertions(+), 59 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
sushu...@apache.org.

-
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org