diff options
Diffstat (limited to 'LICENSE')
| -rw-r--r-- | LICENSE | 27 |
1 files changed, 2 insertions, 25 deletions
@@ -1,7 +1,7 @@ -<<<<<<< HEAD MIT/X Consortium License -© 2006-2011 Anselm R Garbe <anselm@garbe.us> +© 2006-2014 Anselm R Garbe <anselm@garbe.us> +© 2010-2014 Hiltjo Posthuma <hiltjo@codemadness.org> © 2007-2011 Peter Hartlich <sgkkr at hartlich dot com> © 2010-2011 Connor Lane Smith <cls@lubutu.com> © 2006-2009 Jukka Salmi <jukka at salmi dot ch> @@ -31,26 +31,3 @@ 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 MIT License (MIT) - -Copyright (c) 2014 FreeArtMan - -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. ->>>>>>> 41fe4babc896a28ea5e08230762cdecd9772de73 |