From a35fa4ece30df0623591966185fb88e2dbc35103 Mon Sep 17 00:00:00 2001 From: sk89q Date: Sun, 2 Jan 2011 17:05:04 -0800 Subject: [PATCH] Updated license information. --- LICENSE.txt | 26 ++++++++++++++++++++++++++ NOTICE.txt | 4 +++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/LICENSE.txt b/LICENSE.txt index 4bb208699..b5eb8c954 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -202,3 +202,29 @@ 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. + + + +JOpt Simple License +------------------- + +Copyright (c) 2009 Paul R. Holser, Jr. + +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/NOTICE.txt b/NOTICE.txt index 5faae2dd3..3ff67b24f 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1,4 +1,6 @@ This product includes software from JNBT (http://jnbt.sourceforge.net/). This product includes software from WorldEdit -(http://www.sk89q.com), under GNU Lesser General Public License, version 3. \ No newline at end of file +(http://www.sk89q.com), under GNU Lesser General Public License, version 3. + +This product includes software from JOpt Simple, under the MIT license. \ No newline at end of file