diff --git a/LICENSE b/LICENSE index c757d0f5..c3ebd2b5 100644 --- a/LICENSE +++ b/LICENSE @@ -1,11 +1,21 @@ -Copyright 2013 wenzhixin +(The MIT License) -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. +Copyright (c) 2012-2014 Zhixin Wen -You may obtain a copy of the Apache License and the GPL License in the LICENSE file, or at: +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: -http://www.apache.org/licenses/LICENSE-2.0 +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. -http://www.gnu.org/licenses/gpl-2.0.html - -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. \ No newline at end of file +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. \ No newline at end of file diff --git a/README.md b/README.md index 11545d9d..3021091f 100644 --- a/README.md +++ b/README.md @@ -13,26 +13,11 @@ Multiple select is due to the excellent work of the following contributors: 文翼GitHub/wenzhixin Gaurav JassalGitHub/creativeaura< jwheadonGitHub/jwheadon -guliGitHub/guli< +guliGitHub/guli +Tobias MaceyGitHub/blarghmatey -## Copyright and License +## LICENSE -Copyright 2013 wenzhixin - -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. - -You may obtain a copy of the Apache License and the GPL License in the LICENSE file, or at: - -http://www.apache.org/licenses/LICENSE-2.0 - -http://www.gnu.org/licenses/gpl-2.0.html - -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. \ No newline at end of file +[The MIT License](https://github.com/wenzhixin/multiple-select/blob/master/LICENSE) \ No newline at end of file diff --git a/multiple-select.jquery.json b/multiple-select.jquery.json index de268e80..32c4c6c6 100644 --- a/multiple-select.jquery.json +++ b/multiple-select.jquery.json @@ -1,6 +1,6 @@ { "name": "multiple-select", - "version": "1.0.7", + "version": "1.0.8", "title": "Multiple Select", "description": "Multiple select is a jQuery plugin to select multiple elements with checkboxes :).", "author": { @@ -10,11 +10,8 @@ }, "licenses": [ { - "type": "Apache License", - "url": "http://www.apache.org/licenses/LICENSE-2.0" - }, { - "type": "GPL", - "url": "http://www.gnu.org/licenses/gpl-2.0.html" + "type": "MIT License", + "url": "http://opensource.org/licenses/MIT" } ], "dependencies": {