Skip to content
This repository was archived by the owner on Jan 24, 2024. It is now read-only.

Commit fdca560

Browse files
committed
Update the license to The MIT License.
1 parent 486f605 commit fdca560

File tree

3 files changed

+24
-32
lines changed

3 files changed

+24
-32
lines changed

LICENSE

+17-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,21 @@
1-
Copyright 2013 wenzhixin
1+
(The MIT License)
22

3-
This software is licensed under the Apache License, Version 2.0 (the "Apache License") or the GNU General Public License version 2 (the "GPL License"). You may choose either license to govern your use of this software only upon the condition that you accept all of the terms of either the Apache License or the GPL License.
3+
Copyright (c) 2012-2014 Zhixin Wen <[email protected]>
44

5-
You may obtain a copy of the Apache License and the GPL License in the LICENSE file, or at:
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
611

7-
http://www.apache.org/licenses/LICENSE-2.0
12+
The above copyright notice and this permission notice shall be included in
13+
all copies or substantial portions of the Software.
814

9-
http://www.gnu.org/licenses/gpl-2.0.html
10-
11-
Unless required by applicable law or agreed to in writing, software distributed under the Apache License or the GPL Licesnse is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the Apache License and the GPL License for the specific language governing permissions and limitations under the Apache License and the GPL License.
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21+
THE SOFTWARE.

README.md

+4-19
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,11 @@ Multiple select is due to the excellent work of the following contributors:
1313
<tr><th align="left">文翼</th><td><a href="https://github.com/wenzhixin">GitHub/wenzhixin</a></td></tr>
1414
<tr><th align="left">Gaurav Jassal</th><td><a href="https://github.com/creativeaura">GitHub/creativeaura</a></td><</tr>
1515
<tr><th align="left">jwheadon</th><td><a href="https://github.com/jwheadon">GitHub/jwheadon</a></td></tr>
16-
<tr><th align="left">guli</th><td><a href="https://github.com/guli">GitHub/guli</a></td><</tr>
16+
<tr><th align="left">guli</th><td><a href="https://github.com/guli">GitHub/guli</a></td></tr>
17+
<tr><th align="left">Tobias Macey</th><td><a href="https://github.com/blarghmatey">GitHub/blarghmatey</a></td></tr>
1718
</tbody>
1819
</table>
1920

20-
## Copyright and License
21+
## LICENSE
2122

22-
Copyright 2013 wenzhixin
23-
24-
This software is licensed under the Apache License, Version 2.0 (the "Apache License") or the GNU
25-
General Public License version 2 (the "GPL License"). You may choose either license to govern your
26-
use of this software only upon the condition that you accept all of the terms of either the Apache
27-
License or the GPL License.
28-
29-
You may obtain a copy of the Apache License and the GPL License in the LICENSE file, or at:
30-
31-
http://www.apache.org/licenses/LICENSE-2.0
32-
33-
http://www.gnu.org/licenses/gpl-2.0.html
34-
35-
Unless required by applicable law or agreed to in writing, software distributed under the Apache License
36-
or the GPL Licesnse is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
37-
either express or implied. See the Apache License and the GPL License for the specific language governing
38-
permissions and limitations under the Apache License and the GPL License.
23+
[The MIT License](https://github.com/wenzhixin/multiple-select/blob/master/LICENSE)

multiple-select.jquery.json

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "multiple-select",
3-
"version": "1.0.7",
3+
"version": "1.0.8",
44
"title": "Multiple Select",
55
"description": "Multiple select is a jQuery plugin to select multiple elements with checkboxes :).",
66
"author": {
@@ -10,11 +10,8 @@
1010
},
1111
"licenses": [
1212
{
13-
"type": "Apache License",
14-
"url": "http://www.apache.org/licenses/LICENSE-2.0"
15-
}, {
16-
"type": "GPL",
17-
"url": "http://www.gnu.org/licenses/gpl-2.0.html"
13+
"type": "MIT License",
14+
"url": "http://opensource.org/licenses/MIT"
1815
}
1916
],
2017
"dependencies": {

0 commit comments

Comments
 (0)