You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ga...@apache.org on 2013/08/08 16:22:39 UTC

[2/2] git commit: updated refs/heads/master to 8e01509

Add spin.js to license and notice


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/8e01509b
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/8e01509b
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/8e01509b

Branch: refs/heads/master
Commit: 8e01509bb73ce80a6e368a5eee1c8ccebaea2603
Parents: 3e4754b
Author: Garren Smith <ga...@gmail.com>
Authored: Thu Aug 8 16:13:08 2013 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Thu Aug 8 16:13:08 2013 +0200

----------------------------------------------------------------------
 LICENSE | 22 ++++++++++++++++++++++
 NOTICE  |  4 ++++
 2 files changed, 26 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/8e01509b/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 2426853..9f9d856 100644
--- a/LICENSE
+++ b/LICENSE
@@ -957,3 +957,25 @@ for src/fauxton/test/mocha/sinon-chai.js
 
   0. You just DO WHAT THE FUCK YOU WANT TO.
 
+for src/fauxton/js/libs/spin.js
+  The MIT License
+
+  Copyright (c) 2011 Felix Gnass [fgnass at neteye dot de]
+
+  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.

http://git-wip-us.apache.org/repos/asf/couchdb/blob/8e01509b/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 21a6039..9b61ccb 100644
--- a/NOTICE
+++ b/NOTICE
@@ -157,3 +157,7 @@ This product also includes the following third-party components:
  * sinon-chai
 
    Copyright © 2012–2013 Domenic Denicola <do...@domenicdenicola.com>
+ 
+ * spin.js
+
+   Copyright (c) 2011 Felix Gnass [fgnass at neteye dot de]