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/26 09:26:53 UTC
[14/14] incubator-weex git commit: Merge branch '0.13-dev' of
github.com:acton393/incubator-weex into 0.13-dev
Merge branch '0.13-dev' of github.com:acton393/incubator-weex into 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/507cd7ca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/507cd7ca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/507cd7ca
Branch: refs/heads/0.13-dev
Commit: 507cd7ca3cc1af696c498b6b570e7cd73cb8ab84
Parents: 9b8709d 0f75fe1
Author: sospartan <so...@apache.org>
Authored: Wed Apr 26 17:26:04 2017 +0800
Committer: sospartan <so...@apache.org>
Committed: Wed Apr 26 17:26:04 2017 +0800
----------------------------------------------------------------------
WeexSDK.podspec | 2 +-
android/sdk/assets/main.js | 8 --------
android/sdk/build.gradle | 6 ++++++
dangerfile.js | 1 +
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 10 ++++------
ios/sdk/WeexSDK/Resources/main.js | 8 --------
ios/sdk/WeexSDK/Sources/Bridge/WXJSCoreBridge.m | 2 +-
ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m | 4 ++--
pre-build/native-bundle-main.js | 8 ++++++++
9 files changed, 23 insertions(+), 26 deletions(-)
----------------------------------------------------------------------