cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agri...@apache.org
Subject [2/2] ios commit: Update LICENSE to include shelljs's license
Date Wed, 09 Jul 2014 20:02:15 GMT
Update LICENSE to include shelljs's license


Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/24efe2e5
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/24efe2e5
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/24efe2e5

Branch: refs/heads/master
Commit: 24efe2e59768c362d926999fef1d3edbfc5c5080
Parents: ea65b40
Author: Andrew Grieve <agrieve@chromium.org>
Authored: Wed Jul 9 16:01:49 2014 -0400
Committer: Andrew Grieve <agrieve@chromium.org>
Committed: Wed Jul 9 16:01:49 2014 -0400

----------------------------------------------------------------------
 LICENSE | 37 ++++++++++++++++++++++++++++++++++---
 1 file changed, 34 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/24efe2e5/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index faa9c3e..8b80fb5 100644
--- a/LICENSE
+++ b/LICENSE
@@ -203,9 +203,10 @@
 
  ADDITIONAL LICENSES:
 
-//
-//  CordovaLib/classes/NSData+Base64.*
-//  base64
+================================================================================
+CordovaLib/classes/NSData+Base64.*
+================================================================================
+
 //
 //  Created by Matt Gallagher on 2009/06/03.
 //  Copyright 2009 Matt Gallagher. All rights reserved.
@@ -216,3 +217,33 @@
 //  this copyright and permission notice. Attribution in compiled projects is
 //  appreciated but not required.
 //
+
+================================================================================
+bin/node_modules/shelljs:
+================================================================================
+Copyright (c) 2012, Artur Adib <aadib@mozilla.com>
+All rights reserved.
+
+You may use this project under the terms of the New BSD license as follows:
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of Artur Adib nor the
+      names of the contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL ARTUR ADIB BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.


Mime
View raw message