You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ky...@apache.org on 2018/04/28 06:54:14 UTC

[46/48] incubator-weex git commit: * [Core] Add flexbox-layout license

* [Core] Add flexbox-layout 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/e33a25fb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e33a25fb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e33a25fb

Branch: refs/heads/master
Commit: e33a25fb9249e0c6eac9ed3855db6a6aa20581c8
Parents: fa2fdb7
Author: miomin <69...@qq.com>
Authored: Thu Apr 26 12:15:06 2018 +0800
Committer: YorkShen <sh...@gmail.com>
Committed: Sat Apr 28 14:51:47 2018 +0800

----------------------------------------------------------------------
 LICENSE                       | 18 ++++++++++++++++++
 POSSIBLE-NOTICES-FOR-BIN-DIST |  5 ++++-
 2 files changed, 22 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e33a25fb/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index a459980..8330b73 100644
--- a/LICENSE
+++ b/LICENSE
@@ -324,3 +324,21 @@ android/sdk/src/main/java/com/taobao/weex/utils/WXDataStructureUtil.java
   * FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
   * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
   */
+
+ For flexbox-layout
+ weex_core/Source/core/layout
+ /*
+  * Copyright (C) 2016 The flexbox-layout Authors
+  *
+  * Licensed under the Apache License, Version 2.0 (the "License");
+  * you may not use this file except in compliance with the License.
+  * You may obtain a copy of the License at
+  *
+  * http://www.apache.org/licenses/LICENSE-2.0
+  *
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
+  */

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e33a25fb/POSSIBLE-NOTICES-FOR-BIN-DIST
----------------------------------------------------------------------
diff --git a/POSSIBLE-NOTICES-FOR-BIN-DIST b/POSSIBLE-NOTICES-FOR-BIN-DIST
index 78d1a06..5394fdf 100644
--- a/POSSIBLE-NOTICES-FOR-BIN-DIST
+++ b/POSSIBLE-NOTICES-FOR-BIN-DIST
@@ -80,4 +80,7 @@ This product contains shelljs Guava(https://github.com/shelljs/shelljs) develope
 by shelljs  , licensed under BSD 3-clause "New" or "Revised" License.
 
 This product contains software rapidjson(https://github.com/Tencent/rapidjson) developed
-by tencent , licensed under the MIT License.
+by tencent  , licensed under the MIT License.
+
+This product contains software flexbox-layout(https://github.com/google/flexbox-layout) developed
+by google  , licensed under the Apache License.