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:01 UTC
[1/4] incubator-weex git commit: Update LICENSE
Repository: incubator-weex
Updated Branches:
refs/heads/release f8200f530 -> 06e87f6e4
Update 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/d896e8f5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d896e8f5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d896e8f5
Branch: refs/heads/release
Commit: d896e8f504960a0bc12b605a4d0eb258b2371124
Parents: 99041a2
Author: 莫绪旻 <mi...@foxmail.com>
Authored: Thu Jul 12 17:50:03 2018 +0800
Committer: GitHub <no...@github.com>
Committed: Thu Jul 12 17:50:03 2018 +0800
----------------------------------------------------------------------
LICENSE | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/d896e8f5/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index e3b6382..556898a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -223,7 +223,17 @@ This product bundles Guava v20.0, which is available under a "Apache" license. F
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
[4/4] incubator-weex git commit: Merge branch 'release' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into release
Posted by cx...@apache.org.
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
++
++
[2/4] incubator-weex git commit: Update LICENSE
Posted by cx...@apache.org.
Update 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/2190ef07
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/2190ef07
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/2190ef07
Branch: refs/heads/release
Commit: 2190ef078eb7e8a528741320ae2b33268ee27bde
Parents: d896e8f
Author: 莫绪旻 <mi...@foxmail.com>
Authored: Thu Jul 12 17:50:33 2018 +0800
Committer: GitHub <no...@github.com>
Committed: Thu Jul 12 17:50:33 2018 +0800
----------------------------------------------------------------------
LICENSE | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2190ef07/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 556898a..c86fc08 100644
--- a/LICENSE
+++ b/LICENSE
@@ -223,7 +223,6 @@ This product bundles Guava v20.0, which is available under a "Apache" license. F
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/base/base64/base64.cpp
weex_core/Source/android/base/base64/base64.h
weex_core/Source/android/base/base64/modp_base64/modp_b64_data.h
[3/4] incubator-weex git commit: [RELEASE] Formatting LICENSE file
Posted by cx...@apache.org.
[RELEASE] Formatting LICENSE file
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/4149c6b3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/4149c6b3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/4149c6b3
Branch: refs/heads/release
Commit: 4149c6b34e1761c431e21f45299352b55f6b24a4
Parents: 2190ef0
Author: Adam Feng <cx...@gmail.com>
Authored: Thu Jul 12 14:10:27 2018 +0800
Committer: Adam Feng <cx...@gmail.com>
Committed: Thu Jul 12 17:56:34 2018 +0800
----------------------------------------------------------------------
LICENSE | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4149c6b3/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index c86fc08..53bdbac 100644
--- a/LICENSE
+++ b/LICENSE
@@ -219,20 +219,20 @@ This product bundles vuejs v1.0.12, which is available under a
runtime/frameworks/legacy/core/state.js
runtime/frameworks/legacy/core/watcher.js
-This product bundles Guava v20.0, which is available under a "Apache" license. For details, see https://github.com/google/guava/blob/v20.0/COPYING and following files:
-android_sdk/src/main/java/org/apache/taobao/weex/utils/WXDataStructureUtil.java
+This product bundles Guava v20.0, which is available under a "Apache" license. For details, see https://github.com/google/guava/blob/v20.0/COPYING and following files:
+ 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/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
+ 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