commit 1cfe48c8e11520173251860184f309bf64a57b5c
parent 6b11a17cece477cec588800873ad9c7e1de7083c
Author: Andy Herbert <andy.herbert@gmail.com>
Date: Mon, 12 Jan 2015 19:08:36 +0000
Relicensed under the BSD 3-Clause license
Diffstat:
2 files changed, 24 insertions(+), 27 deletions(-)
diff --git a/LICENSE b/LICENSE
@@ -1,32 +1,30 @@
-Copyright (C) 2013 Andrew Herbert and Frederic Cambus.
-
+Copyright (C) 2013-2015 Andrew Herbert and Frederic Cambus.
AnsiLove.js™ is a trademark of Frederic Cambus, used with permission.
-https://github.com/andyherbert/ansilove.js
+https://github.com/ansilove/ansilove.js
All rights reserved.
-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 except as noted below, including without
-limitation the rights to use, copy, modify, merge, publish, distribute, and/or
-sublicense, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-- The Software and/or source code cannot be copied in whole and sold without
- meaningful modification for a profit.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
-- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
-- 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.
-- 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 Ansilove nor the names of its contributors may be
+ used to endorse or promote products derived from this software
+ without specific prior written permission.
-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.-
\ No newline at end of file
+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 REGENTS 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.
diff --git a/README.md b/README.md
@@ -197,7 +197,7 @@ It is also possible to retrieve a record for a file without generating an image
## License
-AnsiLove.js is released under a MIT-style license. See `LICENSE` file for details.
+AnsiLove.js is released under the BSD 3-Clause license. See `LICENSE` file for details.
## Author
