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/05/09 08:35:03 UTC
[16/18] incubator-weex git commit: Merge branch '0.12-dev' into dev
Merge branch '0.12-dev' into 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/6808fd32
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/6808fd32
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/6808fd32
Branch: refs/heads/master
Commit: 6808fd32fb7714d0fb8786f8e4fef1c8527c2323
Parents: c854afd 58eaa9d
Author: sospartan <so...@apache.org>
Authored: Tue May 9 13:54:14 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Tue May 9 13:54:14 2017 +0800
----------------------------------------------------------------------
.../taobao/weex/dom/WXRecyclerDomObject.java | 2 +-
.../WeexDemo/Scanner/WXScannerHistoryVC.m | 25 ++++++++++++++++----
ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h | 1 +
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 3 ++-
4 files changed, 25 insertions(+), 6 deletions(-)
----------------------------------------------------------------------