Skip to content

Commit

Permalink
version 0.2.2 - license changed to MIT
Browse files Browse the repository at this point in the history
  • Loading branch information
gabrielfalcao committed Apr 30, 2010
1 parent f8dcd2d commit 3745508
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 16 deletions.
31 changes: 19 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# jQuery YQL
> Version 0.2
> Version 0.2.2
# What is this ?

Expand Down Expand Up @@ -28,18 +28,25 @@ through JSONP, and calls success callback with the results.
# License

> Copyright (C) 2010 Gabriel Falcão <[email protected]>
>
> Copyright (C) 2010 Lincoln de Sousa <[email protected]>
>
> This program is free software: you can redistribute it and/or modify
> it under the terms of the GNU General Public License as published by
> the Free Software Foundation, either version 3 of the License, or
> (at your option) any later version.
> 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:
>
> This program 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.
> The above copyright notice and this permission notice shall be
> included in all copies or substantial portions of the Software.
>
> You should have received a copy of the GNU General Public License
> along with this program. If not, see <http://www.gnu.org/licenses/>.
> 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.
8 changes: 4 additions & 4 deletions jquery.yql.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
*
* Copyright (c) 2010 Gabriel Falcão
* Copyright (c) 2010 Lincoln de Sousa
* Dual licensed under GPL 3+ license.
* licensed under MIT license.
*
* http://www.gnu.org/copyleft/gpl.html
* http://github.com/gabrielfalcao/jquery-yql/raw/master/license.txt
*
* Version: 0.2.1
* Version: 0.2.2
*/

(function($){
Expand All @@ -30,7 +30,7 @@
var $self = this;
var successCallback = null;
var errorCallback = null;

if (typeof arguments[1] == 'object') {
query = $self._prepareYQLQuery(query, arguments[1]);
successCallback = arguments[2];
Expand Down
23 changes: 23 additions & 0 deletions license.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
Copyright (C) 2010 Gabriel Falcão <[email protected]>
Copyright (C) 2010 Lincoln de Sousa <[email protected]>

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.

0 comments on commit 3745508

Please sign in to comment.