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/26 07:27:47 UTC
[3/3] incubator-weex git commit: Merge remote-tracking branch
'upstream/0.16-dev' into 0.16-dev
Merge remote-tracking branch 'upstream/0.16-dev' 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/e01d0e7c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e01d0e7c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e01d0e7c
Branch: refs/heads/0.16-dev
Commit: e01d0e7c473f13150049bb947021e625be1090a3
Parents: a1819d5 e4e1819
Author: yinfeng <cx...@apache.org>
Authored: Wed Jul 26 15:14:38 2017 +0800
Committer: yinfeng <cx...@apache.org>
Committed: Wed Jul 26 15:14:38 2017 +0800
----------------------------------------------------------------------
ios/playground/WeexDemo/WXDemoViewController.m | 1 -
.../WeexSDK/Sources/Bridge/WXBridgeContext.m | 22 ++++++++++++++++++++
ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 14 +++++++++++++
.../Sources/Manager/WXComponentManager.m | 1 +
.../WeexSDK/Sources/Manager/WXTracingManager.h | 15 ++++++-------
.../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 +++++++-
9 files changed, 70 insertions(+), 19 deletions(-)
----------------------------------------------------------------------