relicense MIT/Expat --> ISC

waldyrious · Mar 16, 2015 · 04452e4 · 04452e4
1 parent d7bb576
commit 04452e4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 20 deletions.
diff --git a/LICENSE.md b/LICENSE.md
@@ -0,0 +1,18 @@
+## The [ISC License](http://opensource.org/licenses/ISC)
+
+Copyright (C) 2011-2015 Waldir Pimenta
+and [contributors](https://github.com/Browserpad/browserpad/contributors)
+
+Permission to use, copy, modify, and/or distribute this software
+for any purpose with or without fee is hereby granted,
+provided that the above copyright notice and this permission notice
+appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE
+INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDERS AND CONTRIBUTORS BE LIABLE
+FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES
+OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/LICENSE.txt b/LICENSE.txt