summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Kowalski <rok@kowalski.gd>2014-09-19 18:48:11 +0200
committerRobert Kowalski <rok@kowalski.gd>2014-09-19 18:48:11 +0200
commitbb7ad626d1c79091649d2292b61c9ae107851fdf (patch)
treee916c24105a6031e8608b3a1c02acc4143e46365
parentf6224d6cdab9fc49e868a9766e13234413bfb11b (diff)
downloadcouchdb-bb7ad626d1c79091649d2292b61c9ae107851fdf.tar.gz
Fauxton: remove almond.js license
was removed in couchdb-fauxton in #c7fbc1a
-rw-r--r--LICENSE28
-rw-r--r--NOTICE4
2 files changed, 0 insertions, 32 deletions
diff --git a/LICENSE b/LICENSE
index 21995cd65..adbd7929d 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
diff --git a/NOTICE b/NOTICE
index 921eebf85..85a05b1fb 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.