You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by mi...@apache.org on 2018/03/12 06:48:23 UTC
[9/9] incubator-weex git commit: Merge remote-tracking branch
'apache/master' into apache-master
Merge remote-tracking branch 'apache/master' into apache-master
# Conflicts:
# android/sdk/libs/armeabi/libweexjsc.so
# android/sdk/libs/armeabi/libweexjss.so
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/8128b4c1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8128b4c1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8128b4c1
Branch: refs/heads/master
Commit: 8128b4c14244840f155e3b9cdb1f43bd82d4edb7
Parents: b258ab1 42aa126
Author: misakuo <mi...@apache.org>
Authored: Mon Mar 12 14:47:49 2018 +0800
Committer: misakuo <mi...@apache.org>
Committed: Mon Mar 12 14:47:49 2018 +0800
----------------------------------------------------------------------
android/sdk/libs/armeabi/libweexjsc.so | Bin 276000 -> 275960 bytes
android/sdk/libs/armeabi/libweexjss.so | Bin 2965560 -> 2965392 bytes
.../Sources/Component/WXScrollerComponent.m | 11 +-
.../Sources/Component/WXVideoComponent.h | 2 +
.../Sources/Component/WXVideoComponent.m | 69 +++++++++++++
.../WeexSDK/Sources/Component/WXWebComponent.h | 2 +
.../WeexSDK/Sources/Component/WXWebComponent.m | 103 +++++++++++++++++--
.../WeexSDK/Sources/Module/WXWebViewModule.m | 8 ++
8 files changed, 181 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8128b4c1/android/sdk/libs/armeabi/libweexjsc.so
----------------------------------------------------------------------
diff --cc android/sdk/libs/armeabi/libweexjsc.so
index f45aee4,3c386f1..3c386f1
mode 100755,100644..100755
Binary files differ
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8128b4c1/android/sdk/libs/armeabi/libweexjss.so
----------------------------------------------------------------------
diff --cc android/sdk/libs/armeabi/libweexjss.so
index 51bbd4d,bdedcc5..bdedcc5
mode 100755,100644..100755
Binary files differ