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 03:03:54 UTC

[7/7] 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/86c555e7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/86c555e7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/86c555e7

Branch: refs/heads/0.13-dev
Commit: 86c555e7484281221c95f647471cec8d206964f1
Parents: 626282d cb527b0
Author: MrRaindrop <te...@gmail.com>
Authored: Tue Apr 25 15:53:21 2017 +0800
Committer: MrRaindrop <te...@gmail.com>
Committed: Tue Apr 25 15:53:21 2017 +0800

----------------------------------------------------------------------
 .travis.yml                                     |  25 -------------------
 android/sdk/assets/main.js                      |  16 ++++++------
 android/sdk/build.gradle                        |   2 +-
 android/sdk/libs/armeabi/libweexjsc.so          | Bin 7816288 -> 7815820 bytes
 android/sdk/libs/x86/libweexjsc.so              | Bin 0 -> 4545544 bytes
 android/sdk/libs/x86/libweexv8.so               | Bin 4545544 -> 0 bytes
 .../taobao/weex/utils/WXSoInstallMgrSdk.java    |   2 +-
 ios/sdk/WeexSDK/Resources/main.js               |  16 ++++++------
 8 files changed, 18 insertions(+), 43 deletions(-)
----------------------------------------------------------------------