You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ac...@apache.org on 2017/09/01 07:23:56 UTC

[13/25] incubator-weex git commit: Merge branch '0.16-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into ios-feature-0.16-dev

Merge branch '0.16-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into ios-feature-0.16-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/9e35bb4c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9e35bb4c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9e35bb4c

Branch: refs/heads/0.16-dev
Commit: 9e35bb4c790654a89155ee9f4c31101d79bdaf48
Parents: e0ccb71 b7fa654
Author: acton393 <zh...@gmail.com>
Authored: Thu Aug 24 22:15:23 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Thu Aug 24 22:15:23 2017 +0800

----------------------------------------------------------------------
 ios/sdk/WeexSDK/Sources/Component/WXAComponent.m        | 5 ++++-
 ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m    | 4 +++-
 ios/sdk/WeexSDK/Sources/Component/WXSwitchComponent.m   | 5 ++++-
 ios/sdk/WeexSDK/Sources/Component/WXTextAreaComponent.m | 5 ++++-
 ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m     | 6 ++++--
 ios/sdk/WeexSDK/Sources/Module/WXPrerenderManager.m     | 1 -
 6 files changed, 19 insertions(+), 7 deletions(-)
----------------------------------------------------------------------