diff options
author | suelockwood <deathbear@apache.org> | 2014-01-27 15:46:28 -0500 |
---|---|---|
committer | suelockwood <deathbear@apache.org> | 2014-01-27 15:46:28 -0500 |
commit | 8d2cafea07a61c6deb4679a62d12e3acacd63af2 (patch) | |
tree | 463415913538cbcf2f9aea8c003e5e4a258238a3 | |
parent | a361bb7e92ac16e5eb653a3fae88e1a44d5f08e2 (diff) | |
download | couchdb-8d2cafea07a61c6deb4679a62d12e3acacd63af2.tar.gz |
Added beautify to the license and makefile
-rw-r--r-- | LICENSE | 26 | ||||
-rw-r--r-- | src/Makefile.am | 1 |
2 files changed, 27 insertions, 0 deletions
@@ -1078,3 +1078,29 @@ 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/plugins/beautify.js +The MIT License (MIT) + +Copyright (c) 2007-2013 Einar Lielmanis and contributors. + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation files +(the "Software"), to deal in the Software without restriction, +including without limitation the rights to use, copy, modify, merge, +publish, distribute, sublicense, and/or sell copies of the Software, +and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 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. diff --git a/src/Makefile.am b/src/Makefile.am index 73e48b3ee..ba160b9cd 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -231,6 +231,7 @@ FAUXTON_FILES = \ fauxton/assets/js/plugins/backbone.layoutmanager.js \ fauxton/assets/js/plugins/jquery.form.js \ fauxton/assets/js/plugins/prettify.js \ + fauxton/assets/js/plugins/beautify.js\ fauxton/assets/less/bootstrap/accordion.less \ fauxton/assets/less/bootstrap/alerts.less \ fauxton/assets/less/bootstrap/bootstrap.less \ |