You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ch...@apache.org on 2013/03/20 00:24:40 UTC

[26/50] git commit: Add LICENSE and NOTICE info for PouchDB files

Add LICENSE and NOTICE info for PouchDB files


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

Branch: refs/heads/master
Commit: c27bee917e3c646533fa1fbae491444fbe33a1f9
Parents: 3fe1dbd
Author: Paul J. Davis <pa...@gmail.com>
Authored: Fri Mar 15 13:00:18 2013 -0500
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Fri Mar 15 13:00:18 2013 -0500

----------------------------------------------------------------------
 LICENSE |   16 ++++++++++++++++
 NOTICE  |    6 ++++++
 2 files changed, 22 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/c27bee91/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index be511b1..be8436a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -503,3 +503,19 @@ For the share/server/coffee-script.js file
   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 src/fauxton/apps/modules/pouchdb
+
+  Copyright (c) 2012 Dale Harvey et al
+
+  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/couchdb/blob/c27bee91/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 9530748..7c37074 100644
--- a/NOTICE
+++ b/NOTICE
@@ -109,3 +109,9 @@ This product also includes the following third-party components:
  * prettify.js (http://code.google.com/p/google-code-prettify/)
 
   Copyright 2011, Mike Samuel et al
+
+ * PouchDB (https://github.com/daleharvey/pouchdb)
+
+  Copyright 2012, Dale Harvey et al
+
+