[3/3] incubator-weex git commit: Merge branch '0.16-dev' of https://github.com/kfeagle/incubator-weex into wip-us-0.16-dev

2017-08-28 Thread acton393
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/9684dcd7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9684dcd7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9684dcd7

Branch: refs/heads/0.16-dev
Commit: 9684dcd75c22f98a9a9ccea209149956e0d227f7
Parents: 88ae8eb 09fc591
Author: acton393 
Authored: Tue Aug 29 13:26:45 2017 +0800
Committer: acton393 
Committed: Tue Aug 29 13:26:45 2017 +0800

--
 .../Sources/Controller/WXBaseViewController.m   |  4 +-
 ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m   |  4 +-
 .../WeexSDK/Sources/Module/WXPrerenderManager.h | 15 +
 .../WeexSDK/Sources/Module/WXPrerenderManager.m | 62 
 4 files changed, 71 insertions(+), 14 deletions(-)
--




[3/3] incubator-weex git commit: Merge branch '0.16-dev' of https://github.com/kfeagle/incubator-weex into wip-us-0.16-dev

2017-08-24 Thread acton393
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 
Authored: Thu Aug 24 20:05:53 2017 +0800
Committer: acton393 
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(-)
--