You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by cx...@apache.org on 2017/03/27 16:41:36 UTC
[04/11] incubator-weex git commit: Merge remote-tracking branch
'upstream/0.11-dev' into 0.11-dev
Merge remote-tracking branch 'upstream/0.11-dev' into 0.11-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/08930c2c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/08930c2c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/08930c2c
Branch: refs/heads/0.11-dev
Commit: 08930c2c09fccb7fad4c30d77353d1bb8bd23522
Parents: b7835c1 373ae38
Author: \u9690\u98ce <cx...@apache.org>
Authored: Sat Mar 25 17:07:34 2017 +0800
Committer: \u9690\u98ce <cx...@apache.org>
Committed: Sat Mar 25 17:07:34 2017 +0800
----------------------------------------------------------------------
.../com/taobao/weex/ui/component/list/BasicListComponent.java | 2 +-
ios/sdk/WeexSDK/Sources/Bridge/WXBridgeMethod.h | 2 +-
ios/sdk/WeexSDK/Sources/Bridge/WXBridgeMethod.m | 2 +-
ios/sdk/WeexSDK/Sources/Component/WXListComponent.m | 4 ++++
ios/sdk/WeexSDK/Sources/Component/WXRefreshComponent.m | 2 +-
ios/sdk/WeexSDK/Sources/Component/WXSliderComponent.m | 6 +++---
6 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------