You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ky...@apache.org on 2018/06/06 03:08:52 UTC
[2/2] incubator-weex git commit: Merge branch 'core-feature-rmjni' of
https://github.com/lucky-chen/incubator-weex
Merge branch 'core-feature-rmjni' of https://github.com/lucky-chen/incubator-weex
This closes #1238
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e70f2e0c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e70f2e0c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e70f2e0c
Branch: refs/heads/master
Commit: e70f2e0c53fbed7b44a0bc2b079c35275dbaae28
Parents: dba2104 4eb7c0e
Author: YorkShen <sh...@gmail.com>
Authored: Wed Jun 6 11:08:23 2018 +0800
Committer: YorkShen <sh...@gmail.com>
Committed: Wed Jun 6 11:08:23 2018 +0800
----------------------------------------------------------------------
weex_core/Source/CMakeLists.txt | 16 +++++++---------
.../native_render_object_utils_impl_android.cpp | 1 +
weex_core/Source/core/parser/dom_wson.cpp | 1 -
.../render_action_appendtree_createfinish.cpp | 4 ++--
weex_core/Source/core/render/node/render_appbar.h | 2 +-
weex_core/Source/core/render/node/render_list.h | 1 -
weex_core/Source/core/render/node/render_mask.h | 1 -
weex_core/Source/core/render/node/render_object.h | 2 --
weex_core/Source/core/render/node/render_scroller.h | 1 -
weex_core/Source/core/render/page/render_page.cpp | 1 -
weex_core/Source/core/render/page/render_page.h | 1 -
11 files changed, 11 insertions(+), 20 deletions(-)
----------------------------------------------------------------------