You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by so...@apache.org on 2017/04/24 09:33:54 UTC
[36/51] [abbrv] incubator-weex git commit: Merge branch '0.12-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.12-dev
Merge branch '0.12-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.12-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/8e120a93
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8e120a93
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8e120a93
Branch: refs/heads/0.13-dev
Commit: 8e120a9398d6e8de956aa360424204885a53d4a0
Parents: fb1325f 536beb0
Author: sospartan <so...@apache.org>
Authored: Sun Apr 23 11:46:42 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Sun Apr 23 11:46:42 2017 +0800
----------------------------------------------------------------------
WeexSDK.podspec | 1 +
ios/playground/Podfile | 2 +-
ios/sdk/WeexSDK/Sources/Component/WXListComponent.m | 5 ++++-
ios/sdk/WeexSDK/Sources/Loader/WXResourceLoader.m | 6 ++++++
ios/sdk/WeexSDK/Sources/Manager/WXComponentManager.m | 7 +++++--
ios/sdk/WeexSDK/Sources/Network/WXResourceRequestHandler.h | 3 +++
.../Sources/Network/WXResourceRequestHandlerDefaultImpl.m | 6 ++++++
ios/sdk/WeexSDK/Sources/Utility/WXUtility.h | 4 ++--
8 files changed, 28 insertions(+), 6 deletions(-)
----------------------------------------------------------------------