You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@weex.apache.org by lu...@apache.org on 2019/08/26 07:12:52 UTC

[incubator-weex] 06/10: Merge branch 'master' into release/20190814

This is an automated email from the ASF dual-hosted git repository.

luckychen pushed a commit to branch feature/0.26.2.19-jit
in repository https://gitbox.apache.org/repos/asf/incubator-weex.git

commit a547aa55cacf8a622b03067e9656675a255fd3a8
Merge: af772ae fc20444
Author: YorkShen <sh...@gmail.com>
AuthorDate: Mon Aug 19 14:39:41 2019 +0800

    Merge branch 'master' into release/20190814

 ios/sdk/WeexSDK/Sources/Bridge/WXCoreBridge.mm         | 16 ++++++++--------
 ios/sdk/WeexSDK/Sources/Component/WXEditComponent.mm   |  3 ++-
 ios/sdk/WeexSDK/Sources/Performance/WXApmForInstance.h |  1 +
 ios/sdk/WeexSDK/Sources/Performance/WXApmForInstance.m |  6 ++++++
 weex_core/Source/android/wrap/wx_bridge.cpp            |  5 ++++-
 5 files changed, 21 insertions(+), 10 deletions(-)