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

Posted to commits@weex.apache.org by mo...@apache.org on 2019/01/03 09:24:08 UTC

[incubator-weex] 01/01: Merge pull request #1991 from jianhan-he/master

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

moshen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-weex.git

commit 524c45506cad73fd6839ad218f33816da44e0339
Merge: 9434662 73c9a1b
Author: wqyfavor <wq...@gmail.com>
AuthorDate: Thu Jan 3 17:24:00 2019 +0800

    Merge pull request #1991 from jianhan-he/master
    
    merge release/20181220 to master

 ios/sdk/WeexSDK/Sources/Bridge/WXBridgeContext.m   |  3 +--
 .../Source/core/data_render/vnode/vcomponent.cc    |  6 ++++-
 weex_core/Source/core/data_render/vnode/vnode.cc   |  1 +
 weex_core/Source/core/data_render/vnode/vnode.h    |  5 +++-
 .../core/data_render/vnode/vnode_render_manager.cc | 31 ++++++++++++----------
 5 files changed, 28 insertions(+), 18 deletions(-)