Permalink
Browse files

Revert "Temporarily remove MIT license"

This reverts commit f519a1e.
  • Loading branch information...
1 parent 7beff24 commit ae43222268bf5e3d376862a13a2316ef88ee6062 @marijnh marijnh committed Aug 30, 2015
Showing with 20 additions and 2 deletions.
  1. +19 −2 LICENSE
  2. +1 −0 package.json
View
@@ -1,2 +1,19 @@
-NOTE: Though Tern itself is licensed under an MIT license, this branch
-isn't yet. See https://www.bountysource.com/issues/1141202-support-es6-features for info.
+Copyright (C) 2013 by Marijn Haverbeke and others <marijnh@gmail.com>
+
+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.
View
@@ -1,5 +1,6 @@
{
"name": "tern",
+ "license": "MIT",
"version": "0.13.1",
"author": "Marijn Haverbeke <marijnh@gmail.com>",
"description": "A JavaScript code analyzer for deep, cross-editor language support",

3 comments on commit ae43222

@angelozerr
Contributor

@marijnh could you explain me your strategy about removing MIT license? I'm using ternjs with Eclipse in tern.java which is EPLI license. I would like to know if I can continue to integrate ternjs? Thanks for your answer!

@marijnh
Member

The code is still under the MIT license. I dropped the license on the ES6 branch during the crowd funder, and this patch reverts that change.

@angelozerr
Contributor

Cool! I can continue to use ternjs inside Eclipse and continue to contribute with my little PR to tern, cool!

Please sign in to comment.