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/07/26 07:14:29 UTC
[10/10] incubator-weex git commit: Merge commit
'ee9b1c7d2c5f6aabb3b2d9c6aa3be513dab44f87' into 0.16-dev
Merge commit 'ee9b1c7d2c5f6aabb3b2d9c6aa3be513dab44f87' into 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/e4e18192
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e4e18192
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e4e18192
Branch: refs/heads/0.16-dev
Commit: e4e18192253bc3337bdfd3ef6944037ff7bc1e3a
Parents: 3afacf1 ee9b1c7
Author: cxfeng <cx...@apache.org>
Authored: Wed Jul 26 15:13:59 2017 +0800
Committer: cxfeng <cx...@apache.org>
Committed: Wed Jul 26 15:13:59 2017 +0800
----------------------------------------------------------------------
ios/playground/WeexDemo/WXDemoViewController.m | 1 -
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 2 +-
.../WeexSDK/Sources/Bridge/WXBridgeContext.m | 22 ++++++++++++
ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 14 ++++++++
.../Sources/Manager/WXComponentManager.m | 1 +
.../WeexSDK/Sources/Manager/WXTracingManager.h | 35 ++++++++++----------
.../WeexSDK/Sources/Manager/WXTracingManager.m | 18 +++++-----
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 4 +--
.../WeexSDK/Sources/Protocol/WXBridgeProtocol.h | 5 +++
ios/sdk/WeexSDK/Sources/Utility/WXLog.m | 9 ++++-
ios/sdk/WeexSDK/Sources/WeexSDK.h | 2 +-
pre-build/native-bundle-main.js | 12 +++----
12 files changed, 88 insertions(+), 37 deletions(-)
----------------------------------------------------------------------