You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by mi...@apache.org on 2018/02/08 07:38:33 UTC

[2/2] incubator-weex git commit: Merge remote-tracking branch 'upstream/pr1006' into apache-master

Merge remote-tracking branch 'upstream/pr1006' into apache-master


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/b6b2c24c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b6b2c24c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b6b2c24c

Branch: refs/heads/master
Commit: b6b2c24c2a39cbf208c91805d1250cec49bf595c
Parents: 1605d66 3976636
Author: misakuo <mi...@apache.org>
Authored: Thu Feb 8 15:38:15 2018 +0800
Committer: misakuo <mi...@apache.org>
Committed: Thu Feb 8 15:38:15 2018 +0800

----------------------------------------------------------------------
 .../java/com/taobao/weex/common/Constants.java  |  1 +
 .../main/java/com/taobao/weex/utils/FontDO.java | 23 +++++++++++++++++++-
 .../com/taobao/weex/utils/TypefaceUtil.java     |  7 +++---
 3 files changed, 27 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b6b2c24c/android/sdk/src/main/java/com/taobao/weex/utils/TypefaceUtil.java
----------------------------------------------------------------------