Repository: couchdb
Updated Branches:
  refs/heads/master 9484bdaff -> 46db1a2d7


add ZeroClipboard to LICENSE file


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/46db1a2d
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/46db1a2d
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/46db1a2d

Branch: refs/heads/master
Commit: 46db1a2d70c02bdca7c0c4a177404a554a3a6c1d
Parents: 9484bda
Author: Robert Kowalski <[email protected]>
Authored: Tue Jun 24 20:34:02 2014 +0100
Committer: Robert Kowalski <[email protected]>
Committed: Tue Jun 24 20:34:02 2014 +0100

----------------------------------------------------------------------
 LICENSE | 13 +++++++++++++
 1 file changed, 13 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/46db1a2d/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 193355e..67c84e6 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1054,6 +1054,19 @@ 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.
 
+
+for src/fauxton/assets/js/plugins/zeroclipboard/*
+
+The MIT License (MIT)
+Copyright (c) 2014 Jon Rohan, James M. Greene
+
+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.
+
+
 For share/doc/ext/httpdomain.py
 
 Copyright (c) 2010 by the contributors Hong Minhee <[email protected]>.

Reply via email to