From 6f075d68937b7c136c597175ddae06bf8678b0f9 Mon Sep 17 00:00:00 2001 From: Tim Branyen Date: Wed, 26 Jun 2013 01:16:49 -0400 Subject: [PATCH] Updated LICENSE to MIT --- LICENSE | 35 +++++++++++++++-------------------- package.json | 2 +- 2 files changed, 16 insertions(+), 21 deletions(-) diff --git a/LICENSE b/LICENSE index 4782c6003..80bc57cb1 100644 --- a/LICENSE +++ b/LICENSE @@ -1,24 +1,19 @@ Copyright (c) 2013 Tim Branyen -This file is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License, version 2, -as published by the Free Software Foundation. +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: -In addition to the permissions in the GNU General Public License, -the authors give you unlimited permission to link the compiled -version of this file into combinations with other programs, -and to distribute those combinations without any restriction -coming from the use of this file. (The General Public License -restrictions do apply in other respects; for example, they cover -modification of the file, and distribution when not linked into -a combined executable.) +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. -This file is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; see the file COPYING. If not, write to -the Free Software Foundation, 51 Franklin Street, Fifth Floor, -Boston, MA 02110-1301, USA. +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/package.json b/package.json index 314dd6df0..2067587fc 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "git", "native" ], - "license": "GPLv2", + "license": "MIT", "author": "Tim Branyen (http://twitter.com/tbranyen)", "contributors": [ {