This is an automated email from the ASF dual-hosted git repository. sushuang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit cd08100d6b3e4fdead932a1166c4f9dfa1794b5f Merge: c34c678 56d7822 Author: sushuang <sushuang0...@gmail.com> AuthorDate: Tue May 29 22:44:26 2018 +0800 Merge branch 'master' of https://github.com/apache/incubator-echarts # Conflicts: # src/chart/graph/GraphView.js src/chart/tree.js | 2 +- src/chart/tree/TreeSeries.js | 19 ++++++- src/chart/tree/TreeView.js | 126 ++++++++++++++++++++++++++++++++++++++++- src/chart/tree/layoutHelper.js | 2 +- src/chart/tree/treeAction.js | 19 +++++++ test/tree-roam.html | 90 +++++++++++++++++++++++++++++ 6 files changed, 253 insertions(+), 5 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