From 3674ec5b781084b87ccaf970a36d4c7d5355ff32 Mon Sep 17 00:00:00 2001 From: Evan Sosenko Date: Sat, 24 Jun 2017 10:21:18 -0700 Subject: [PATCH] Update LICENSE --- LICENSE.txt | 21 ++++++++++++++++++++- README.md | 19 ++++++++++++++----- 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index c1e84b9..0c10844 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1 +1,20 @@ -Copyright © 2015-2016 Evan Sosenko +The MIT License (MIT) + +Copyright (c) 2015-2016 Evan Sosenko + +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/README.md b/README.md index 66d8555..4fcdb8a 100644 --- a/README.md +++ b/README.md @@ -47,11 +47,20 @@ $ make clean ## License -This code is Copyright © 2015-2016 Evan Sosenko. +This code is licensed under the MIT license. + +Any figures or other output generated to be identical or otherwise indistinguishable +to the figures submitted to APS are Copyright © 2017 by the American Physical Society. ## Warranty -This software is provided "as is" and without any express or -implied warranties, including, without limitation, the implied -warranties of merchantibility and fitness for a particular -purpose. +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 holder 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.