Repository: zest-qi4j
Updated Branches:
  refs/heads/develop 22e2008da -> 2a673fd4f


LICENSE add MIT licensed bundled bits - ZEST-15


Project: http://git-wip-us.apache.org/repos/asf/zest-qi4j/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-qi4j/commit/2a673fd4
Tree: http://git-wip-us.apache.org/repos/asf/zest-qi4j/tree/2a673fd4
Diff: http://git-wip-us.apache.org/repos/asf/zest-qi4j/diff/2a673fd4

Branch: refs/heads/develop
Commit: 2a673fd4fa1b07f43366b9b81f3446c4d488fd29
Parents: 22e2008
Author: Paul Merlin <[email protected]>
Authored: Sun Jun 14 11:48:24 2015 +0200
Committer: Paul Merlin <[email protected]>
Committed: Sun Jun 14 11:48:24 2015 +0200

----------------------------------------------------------------------
 LICENSE.txt | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/2a673fd4/LICENSE.txt
----------------------------------------------------------------------
diff --git a/LICENSE.txt b/LICENSE.txt
index f433b1a..2b67416 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -175,3 +175,45 @@
       of your accepting any such warranty or additional liability.
 
    END OF TERMS AND CONDITIONS
+
+=======================================================================
+
+Apache Zest Qi4j subcomponents:
+
+The Apache Zest Qi4j project contains subcomponents with separate copyright
+notices and license terms. Your use of the source code for the these
+subcomponents is subject to the terms and conditions of the following
+licenses.
+
+-----------------------------------------------------------------------
+ The MIT License
+-----------------------------------------------------------------------
+
+The Apache Zest Qi4j project bundles the following files under the MIT License:
+
+- jQuery v1.6.4 (https://jquery.com/)
+  Copyright 2014 jQuery Foundation and other contributors
+- jQuery.ScrollTo v1.4.2 (https://github.com/flesler/jquery.scrollTo)
+  Copyright (c) 2007-2009 Ariel Flesler
+- SyntaxHighlighter v3.0.83 (http://alexgorbatchev.com/SyntaxHighlighter/)
+  Copyright (C) 2004-2010 Alex Gorbatchev.
+
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE 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.

Reply via email to