You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by su...@apache.org on 2019/04/09 09:06:32 UTC

[incubator-echarts] 01/01: Merge pull request #10243 from apache/fix/merge-release-to-master

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 94d206538a959d25dc9608545bea3e5ba21637aa
Merge: ac677a8 c2fcebd
Author: sushuang <su...@gmail.com>
AuthorDate: Tue Apr 9 17:06:13 2019 +0800

    Merge pull request #10243 from apache/fix/merge-release-to-master
    
    Fix/merge release to master

 dist/echarts-en.common.js     | 42 +++++++++++++++++++++++++++++++++++++++++-
 dist/echarts-en.common.min.js |  2 +-
 dist/echarts-en.js            | 42 +++++++++++++++++++++++++++++++++++++++++-
 dist/echarts-en.js.map        |  2 +-
 dist/echarts-en.min.js        |  2 +-
 dist/echarts-en.simple.js     | 23 +++++++++++++++++++++++
 dist/echarts-en.simple.min.js |  2 +-
 dist/echarts.common.js        | 42 +++++++++++++++++++++++++++++++++++++++++-
 dist/echarts.common.min.js    |  2 +-
 dist/echarts.js               | 42 +++++++++++++++++++++++++++++++++++++++++-
 dist/echarts.js.map           |  2 +-
 dist/echarts.min.js           |  2 +-
 dist/echarts.simple.js        | 23 +++++++++++++++++++++++
 dist/echarts.simple.min.js    |  2 +-
 package.json                  |  4 ++--
 src/model/mixin/textStyle.js  |  1 +
 src/util/format.js            | 40 +++++++++++++++++++++++++++++++++++++++-
 17 files changed, 260 insertions(+), 15 deletions(-)


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