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/08/24 12:05:11 UTC
[3/3] incubator-weex git commit: Merge branch '0.16-dev' of
https://github.com/kfeagle/incubator-weex into wip-us-0.16-dev
Merge branch '0.16-dev' of https://github.com/kfeagle/incubator-weex into wip-us-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/cba0e1a4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/cba0e1a4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/cba0e1a4
Branch: refs/heads/0.16-dev
Commit: cba0e1a480d93aba2017144c7ea666d809362761
Parents: 83eb274 df96a95
Author: acton393 <zh...@gmail.com>
Authored: Thu Aug 24 20:05:53 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Thu Aug 24 20:05:53 2017 +0800
----------------------------------------------------------------------
.../WeexDemo/WXConfigCenterDefaultImpl.m | 6 +-
.../Sources/Manager/WXComponentManager.m | 8 +--
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 7 ++-
.../WeexSDK/Sources/Module/WXPrerenderManager.h | 6 ++
.../WeexSDK/Sources/Module/WXPrerenderManager.m | 62 +++++++++++++-------
5 files changed, 59 insertions(+), 30 deletions(-)
----------------------------------------------------------------------