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/28 02:56:38 UTC
[04/21] incubator-weex git commit: Merge remote-tracking branch
'upstream/0.12-dev' into 0.12-dev
Merge remote-tracking branch 'upstream/0.12-dev' 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/c9b53a2d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c9b53a2d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c9b53a2d
Branch: refs/heads/dev
Commit: c9b53a2d7e17e25dc9b0c34c17708dd074dba091
Parents: 87228bf a1095ae
Author: yinfeng <cx...@apache.org>
Authored: Tue Apr 25 10:46:00 2017 +0800
Committer: yinfeng <cx...@apache.org>
Committed: Tue Apr 25 10:46:00 2017 +0800
----------------------------------------------------------------------
android/sdk/assets/main.js | 16 ++++++++--------
android/sdk/build.gradle | 2 +-
android/sdk/libs/x86/libweexjsc.so | Bin 0 -> 4545544 bytes
android/sdk/libs/x86/libweexv8.so | Bin 4545544 -> 0 bytes
ios/sdk/WeexSDK/Resources/main.js | 16 ++++++++--------
5 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------