summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul J. Davis <paul.joseph.davis@gmail.com>2013-03-15 13:00:18 -0500
committerPaul J. Davis <paul.joseph.davis@gmail.com>2013-03-15 13:00:18 -0500
commitc27bee917e3c646533fa1fbae491444fbe33a1f9 (patch)
treedfc09bfab911009dbd3613d9c26b0fce9d12ee6c
parent3fe1dbd3ecdd527a55bd380de3e4ab67d98379dd (diff)
downloadcouchdb-c27bee917e3c646533fa1fbae491444fbe33a1f9.tar.gz
Add LICENSE and NOTICE info for PouchDB files
-rw-r--r--LICENSE16
-rw-r--r--NOTICE6
2 files changed, 22 insertions, 0 deletions
diff --git a/LICENSE b/LICENSE
index be511b122..be8436ace 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.
diff --git a/NOTICE b/NOTICE
index 95307488e..7c370748f 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
+
+