Merge branch 'master' of https://github.com/Whitebeard86/Gibbo2D

LICENSE.txt

@@ -1,20 +1,7 @@
-Gibbo2D - Copyright - 2013 Gibbo2D Team
-Founders - Joao Alves <[email protected]> and Luis Fernandes <[email protected]>
+Gibbo2D License - Version 1.0
+Copyright (c) 2013 - Gibbo2D Team
+Founders João Alves <[email protected]> & Luis Fernandes <[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:
+Permission is granted to use this software and associated documentation files (the "Software") free of charge, to any person or company. The code can be used, modified and merged without restrictions, but you cannot sell the software itself and parts where this license applies. Still, permission is granted for anyone to sell applications made using this software (for example, a game). This software cannot be claimed as your own, except for copyright holders. This license notes should also be available on any of the changed or added files.
 
-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. 
+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 non-infrigement. In no event shall the authors or copyright holders be liable for any claim, damages or other liability.

README.md

@@ -30,6 +30,6 @@ It's supported by MonoGame, also an open source project.
 
 ## License
 
-Gibbo2D is released under the MIT License (see LICENSE.txt for more info)
+Gibbo2D is released under the Gibbo2D License v1.0 (see LICENSE.txt for more info)