You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ch...@apache.org on 2012/10/12 18:36:56 UTC
git commit: CLOUDSTACK-331: Added legal docs for ui/lib/excanvas.js
Signed-off-by: Chip Childers
Updated Branches:
refs/heads/master ffb5c80a6 -> 24978eed5
CLOUDSTACK-331: Added legal docs for ui/lib/excanvas.js
Signed-off-by: Chip Childers <ch...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/24978eed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/24978eed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/24978eed
Branch: refs/heads/master
Commit: 24978eed5972caaf47dabacecbf0b1b590982839
Parents: ffb5c80
Author: Chip Childers <ch...@gmail.com>
Authored: Fri Oct 12 12:35:46 2012 -0400
Committer: Chip Childers <ch...@gmail.com>
Committed: Fri Oct 12 12:36:43 2012 -0400
----------------------------------------------------------------------
LICENSE | 5 +++++
tools/whisker/descriptor.xml | 8 ++++++++
2 files changed, 13 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/24978eed/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 607c5cf..3f01e10 100644
--- a/LICENSE
+++ b/LICENSE
@@ -3974,6 +3974,11 @@ Within the ui/lib directory
by Eric Meyer http://meyerweb.com/eric/
reset.css
+ licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt (as above)
+ Copyright (c) 2006 Google Inc.
+ from Google Inc. http://google.com
+ excanvas.js http://code.google.com/p/explorercanvas/
+
licensed under the BSD (2-clause) http://www.opensource.org/licenses/BSD-2-Clause (as follows)
Copyright (c) 2008 George McGinley Smith
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/24978eed/tools/whisker/descriptor.xml
----------------------------------------------------------------------
diff --git a/tools/whisker/descriptor.xml b/tools/whisker/descriptor.xml
index 04a3a85..0c573e3 100644
--- a/tools/whisker/descriptor.xml
+++ b/tools/whisker/descriptor.xml
@@ -2504,6 +2504,14 @@ Copyright (c) 2009, John Resig
</with-license>
</within>
<within dir='ui/lib'>
+ <with-license id='ApacheLicenseVersion2'>
+ <copyright-notice>
+Copyright (c) 2006 Google Inc.
+ </copyright-notice>
+ <by-organisation id='google.com'>
+ <resource name='excanvas.js' source='http://code.google.com/p/explorercanvas/' />
+ </by-organisation>
+ </with-license>
<with-license id='MIT'>
<copyright-notice>
Copyright (c) 2011, John Resig