You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by cx...@apache.org on 2017/04/24 08:57:35 UTC
[1/2] incubator-weex git commit: Merge branch
'0.12-dev-feature-jsfm0.20.5' of https://github.com/atomtong/incubator-weex
into 0.12-dev
Repository: incubator-weex
Updated Branches:
refs/heads/0.12-dev 73995da91 -> c2ab58191
Merge branch '0.12-dev-feature-jsfm0.20.5' of https://github.com/atomtong/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/64e93a11
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/64e93a11
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/64e93a11
Branch: refs/heads/0.12-dev
Commit: 64e93a1133c102aea3efc5dfbd87d63040e7e3f4
Parents: 6fcc81a 8a56e2f
Author: cxfeng <cx...@apache.org>
Authored: Mon Apr 24 16:57:21 2017 +0800
Committer: cxfeng <cx...@apache.org>
Committed: Mon Apr 24 16:57:21 2017 +0800
----------------------------------------------------------------------
android/sdk/assets/main.js | 16 ++++++++--------
android/sdk/libs/armeabi/libweexjsc.so | Bin 7816288 -> 7815820 bytes
.../taobao/weex/utils/WXSoInstallMgrSdk.java | 2 +-
ios/sdk/WeexSDK/Resources/main.js | 16 ++++++++--------
4 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
[2/2] incubator-weex git commit: Merge branch '0.12-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.12-dev
Posted by cx...@apache.org.
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/c2ab5819
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/c2ab5819
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/c2ab5819
Branch: refs/heads/0.12-dev
Commit: c2ab58191b6a7126e9a474885902632580cb38aa
Parents: 64e93a1 73995da
Author: cxfeng <cx...@apache.org>
Authored: Mon Apr 24 16:57:28 2017 +0800
Committer: cxfeng <cx...@apache.org>
Committed: Mon Apr 24 16:57:28 2017 +0800
----------------------------------------------------------------------
----------------------------------------------------------------------