Change license in index.html and package.json

This commit is contained in:
Lennart Kats 2012-09-08 11:44:22 +02:00
commit 931a5d21a4
2 changed files with 4 additions and 10 deletions

View file

@ -126,7 +126,7 @@
<h2>Getting the code</h2>
<div class="divider"></div>
<p>Ace is a community project. We actively encourage and support contributions. The Ace source code is <a href="http://github.com/ajaxorg/ace">hosted on GitHub</a>. It is released under the Mozilla tri-license (MPL/GPL/LGPL). This is the same license used by Firefox. This license is friendly to all kinds of projects, whether open source or not. Take charge of your editor and add your favorite language highlighting and keybindings!
<p>Ace is a community project. We actively encourage and support contributions. The Ace source code is <a href="http://github.com/ajaxorg/ace">hosted on GitHub</a>. Ace is a community project. We actively encourage and support contributions. The Ace source code is hosted on GitHub. It is released under the BSD License. This license is very simple, and is friendly to all kinds of projects, whether open source or not. Take charge of your editor and add your favorite language highlighting and keybindings!
<pre>git clone git://github.com/ajaxorg/ace.git</pre></p>
</div>

View file

@ -22,14 +22,8 @@
"ace": "."
},
"licenses": [{
"type": "MPL",
"url": "http://www.mozilla.org/MPL/"
}, {
"type": "GPL",
"url": "http://www.gnu.org/licenses/gpl.html"
}, {
"type": "LGPL",
"url": "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html"
"type": "BSD New",
"url": "http://opensource.org/licenses/BSD-3-Clause"
}],
"directories": {
"lib": "lib/ace"
@ -61,4 +55,4 @@
}
}
}
}
}