Permalink
Browse files

Update LICENSE

  • Loading branch information...
1 parent 3c03dc6 commit 444bda34c16354ed05c233f58a9f35461334a616 @tiff tiff committed Mar 21, 2012
Showing with 6 additions and 4 deletions.
  1. +6 −4 LICENSE
View
10 LICENSE
@@ -1,7 +1,9 @@
-Copyright (C) 2011 XING AG
+The MIT License (MIT)
-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 any later version.
+Copyright (c) 2012 XING AG
-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.
+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:
-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 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.

4 comments on commit 444bda3

Contributor

Stereobit replied Mar 21, 2012

Don't know what legally counts but the files are still "Licensed under GNU General Public License"

Collaborator

tiff replied Mar 21, 2012

What do you mean?

Collaborator

tiff replied Mar 21, 2012

Fixed :) thanks

Please sign in to comment.