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/05/05 11:35:09 UTC
[22/25] incubator-weex git commit: Merge remote-tracking branch
'apache/0.12-dev' into apache-0.13-dev
Merge remote-tracking branch 'apache/0.12-dev' into apache-0.13-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/3b305999
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/3b305999
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/3b305999
Branch: refs/heads/0.13-dev
Commit: 3b30599950ff635084ed0fdd0ae5deb56fe886d0
Parents: a044ec8 58eaa9d
Author: acton393 <zh...@gmail.com>
Authored: Fri May 5 17:51:22 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Fri May 5 17:51:22 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Engine/WXSDKError.h | 1 +
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3b305999/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
----------------------------------------------------------------------