You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by so...@apache.org on 2017/06/22 05:27:26 UTC
[21/50] [abbrv] incubator-weex git commit: Merge branch '0.14-dev' of
https://github.com/acton393/incubator-weex into wip-us-0.14-dev
Merge branch '0.14-dev' of https://github.com/acton393/incubator-weex into wip-us-0.14-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e19ea294
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e19ea294
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e19ea294
Branch: refs/heads/dev
Commit: e19ea2940dacf022153bdfa6ed86ca9fa00673b9
Parents: abf5022 53efdad
Author: acton393 <zh...@gmail.com>
Authored: Thu Jun 15 14:28:07 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Thu Jun 15 14:28:07 2017 +0800
----------------------------------------------------------------------
WeexSDK.podspec | 2 +-
.../Sources/Component/WXComponent_internal.h | 1 +
.../WeexSDK/Sources/Component/WXTextComponent.m | 16 +++++--
.../WeexSDK/Sources/Layout/WXComponent+Layout.m | 1 -
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 47 +++++++++++++++-----
5 files changed, 50 insertions(+), 17 deletions(-)
----------------------------------------------------------------------