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/07/29 02:56:10 UTC
[11/12] incubator-weex git commit: Merge remote-tracking branch
'wip-us/0.15-dev' into wip-us-0.16-dev
Merge remote-tracking branch 'wip-us/0.15-dev' into wip-us-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/2377bf68
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/2377bf68
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/2377bf68
Branch: refs/heads/0.16-dev
Commit: 2377bf685b6b112a21b655f4f22eeeda9b5cc502
Parents: 495fc6b eb48b94
Author: acton393 <zh...@gmail.com>
Authored: Sat Jul 29 10:52:50 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Sat Jul 29 10:52:50 2017 +0800
----------------------------------------------------------------------
.../src/main/java/com/taobao/weex/WXSDKInstance.java | 11 +++++++++--
.../weex/ui/component/list/BasicListComponent.java | 15 +++++++++++++--
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 4 ++++
ios/sdk/WeexSDK/Sources/Module/WXWebSocketModule.h | 1 -
ios/sdk/WeexSDK/Sources/Module/WXWebSocketModule.m | 1 +
5 files changed, 27 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2377bf68/android/sdk/src/main/java/com/taobao/weex/WXSDKInstance.java
----------------------------------------------------------------------