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 2018/07/12 10:02:04 UTC
[4/4] incubator-weex git commit: Merge branch 'release' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into release
Merge branch 'release' of https://git-wip-us.apache.org/repos/asf/incubator-weex into release
# Conflicts:
# LICENSE
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/06e87f6e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/06e87f6e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/06e87f6e
Branch: refs/heads/release
Commit: 06e87f6e4345065dc0fc236a0a12910f561cc2c1
Parents: 4149c6b f8200f5
Author: Adam Feng <cx...@gmail.com>
Authored: Thu Jul 12 18:01:32 2018 +0800
Committer: Adam Feng <cx...@gmail.com>
Committed: Thu Jul 12 18:01:32 2018 +0800
----------------------------------------------------------------------
LICENSE | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/06e87f6e/LICENSE
----------------------------------------------------------------------
diff --cc LICENSE
index 53bdbac,d28f4d2..fda183d
--- a/LICENSE
+++ b/LICENSE
@@@ -223,16 -223,7 +223,18 @@@ This product bundles Guava v20.0, whic
android_sdk/src/main/java/org/apache/taobao/weex/utils/WXDataStructureUtil.java
This product bundles chromium, which is available under a "BSD-style" license. For details, see https://github.com/chromium/chromium/blob/master/LICENSE and following files:
- weex_core/Source/android/jniprebuild/jniheader
- weex_core/Source/android/base/base64
+ weex_core/Source/android/base/base64/base64.cpp
+ weex_core/Source/android/base/base64/base64.h
+ weex_core/Source/android/base/base64/modp_base64/modp_b64_data.h
+ weex_core/Source/android/base/base64/modp_base64/modp_b64.cc
+ weex_core/Source/android/base/base64/modp_base64/modp_b64.h
+ weex_core/Source/android/jniprebuild/jniheader/ContentBoxMeasurement_jni.h
+ weex_core/Source/android/jniprebuild/jniheader/MeasureMode_jni.h
+ weex_core/Source/android/jniprebuild/jniheader/NativeRenderObjectUtils_jni.h
+ weex_core/Source/android/jniprebuild/jniheader/SystemMessageHandler_jni.h
+ weex_core/Source/android/jniprebuild/jniheader/WXBridge_jni.h
+ weex_core/Source/android/jniprebuild/jniheader/WXJsFunctions_jni.h
weex_core/Source/android/jniprebuild/jni_generator.py
++
++