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/26 09:02:46 UTC

[5/5] incubator-weex git commit: Merge branches 'master' and '0.16-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into wip-us-master

Merge branches 'master' and '0.16-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into wip-us-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/c6d5ce57
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c6d5ce57
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c6d5ce57

Branch: refs/heads/master
Commit: c6d5ce57cfe8082152e4c22473ec080f1c4fa933
Parents: c5d1064 c76b938
Author: acton393 <zh...@gmail.com>
Authored: Tue Sep 26 17:02:11 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Tue Sep 26 17:02:11 2017 +0800

----------------------------------------------------------------------
 .../Sources/Component/RecycleList/WXComponent+DataBinding.h    | 2 +-
 .../Sources/Component/RecycleList/WXComponent+DataBinding.mm   | 2 ++
 .../Sources/Component/RecycleList/WXRecycleListComponent.m     | 3 +++
 .../WeexSDK/Sources/Component/Recycler/WXRecyclerComponent.m   | 3 +++
 ios/sdk/WeexSDK/Sources/Component/WXListComponent.m            | 3 +++
 ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m        | 3 +++
 ios/sdk/WeexSDK/Sources/Manager/WXTracingManager.m             | 6 +++---
 ios/sdk/WeexSDK/Sources/Module/WXNavigatorModule.h             | 3 ++-
 ios/sdk/WeexSDKTests/WXStreamModuleTests.m                     | 2 +-
 9 files changed, 21 insertions(+), 6 deletions(-)
----------------------------------------------------------------------