Repository: couchdb Updated Branches: refs/heads/master f6224d6cd -> bb7ad626d
Fauxton: remove almond.js license was removed in couchdb-fauxton in #c7fbc1a Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/bb7ad626 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/bb7ad626 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/bb7ad626 Branch: refs/heads/master Commit: bb7ad626d1c79091649d2292b61c9ae107851fdf Parents: f6224d6 Author: Robert Kowalski <r...@kowalski.gd> Authored: Fri Sep 19 18:48:11 2014 +0200 Committer: Robert Kowalski <r...@kowalski.gd> Committed: Fri Sep 19 18:48:11 2014 +0200 ---------------------------------------------------------------------- LICENSE | 28 ---------------------------- NOTICE | 4 ---- 2 files changed, 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/bb7ad626/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index 21995cd..adbd792 100644 --- a/LICENSE +++ b/LICENSE @@ -627,34 +627,6 @@ For src/fauxton/apps/modules/pouchdb License for the specific language governing permissions and limitations under the License. -For src/fauxton/assets/js/libs/almond.js - - Copyright (c) 2010-2011, The Dojo Foundation - All rights reserved. - - 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 the Dojo Foundation nor the names of its 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 THE COPYRIGHT OWNER OR CONTRIBUTORS 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. - For src/fauxton/assets/js/libs/backbone.js Copyright (c) 2010-2013 Jeremy Ashkenas, DocumentCloud http://git-wip-us.apache.org/repos/asf/couchdb/blob/bb7ad626/NOTICE ---------------------------------------------------------------------- diff --git a/NOTICE b/NOTICE index 921eebf..85a05b1 100644 --- a/NOTICE +++ b/NOTICE @@ -86,10 +86,6 @@ This product also includes the following third-party components: Copyright 2012, Jeremy Ashkenas - * almond.js (http://github.com/jrburke/almond) - - Copyright 2011, The Dojo Foundation - * backbone.js (http://backbonejs.org/) Copyright 2012, Jeremy Ashkenas, DocumentCloud Inc.
