Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 93F27E686 for ; Fri, 15 Mar 2013 21:50:09 +0000 (UTC) Received: (qmail 11441 invoked by uid 500); 15 Mar 2013 21:50:08 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 11152 invoked by uid 500); 15 Mar 2013 21:50:08 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 11115 invoked by uid 99); 15 Mar 2013 21:50:08 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Mar 2013 21:50:08 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 06A9E351B1; Fri, 15 Mar 2013 21:50:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: chewbranca@apache.org To: commits@couchdb.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [50/50] git commit: Add LICENSE and NOTICE info for PouchDB files Message-Id: <20130315215008.06A9E351B1@tyr.zones.apache.org> Date: Fri, 15 Mar 2013 21:50:08 +0000 (UTC) Updated Branches: refs/heads/fauxton-rebase [created] 017167c6b 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/1a73be46 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/1a73be46 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/1a73be46 Branch: refs/heads/fauxton-rebase Commit: 1a73be463343e08ac9035685a804a11af0dadeab Parents: 09f261e Author: Paul J. Davis Authored: Fri Mar 15 13:00:18 2013 -0500 Committer: Russell Branca Committed: Fri Mar 15 14:37:35 2013 -0700 ---------------------------------------------------------------------- LICENSE | 16 ++++++++++++++++ NOTICE | 6 ++++++ 2 files changed, 22 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/1a73be46/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index 7d9d0ce..9bbf1ac 100644 --- a/LICENSE +++ b/LICENSE @@ -603,3 +603,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/1a73be46/NOTICE ---------------------------------------------------------------------- diff --git a/NOTICE b/NOTICE index 6176138..fc3a5a5 100644 --- a/NOTICE +++ b/NOTICE @@ -121,3 +121,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 + +