From 66c7c768e2b5f76cd0ce3b53888f95eeee40fe0f Mon Sep 17 00:00:00 2001 From: nashmuhandes Date: Thu, 15 Sep 2016 13:14:36 +0800 Subject: [PATCH] Updated licensing information to reflect GZDoom's OpenGL renderer licensing (LGPLv3) --- Readme.md | 2 +- docs/GZDoom License.md | 36 +++++++++++------------------------- 2 files changed, 12 insertions(+), 26 deletions(-) diff --git a/Readme.md b/Readme.md index ba8b27d3f..d7ee1acff 100644 --- a/Readme.md +++ b/Readme.md @@ -14,7 +14,7 @@ Licenses * foo_DUMB * **[General Public License version 2 (or later)](https://www.gnu.org/licenses/old-licenses/gpl-2.0.html "GNU General Public License v2.0 - GNU Project - Free Software Foundation")** * Doom -* **[GZDoom License](https://github.com/nashmuhandes/GZDoom-GPL/blob/master/docs/GZDoom%20License.md "GZDoom License")** +* **[GZDoom License (LGPLv3)](https://github.com/nashmuhandes/GZDoom-GPL/blob/master/docs/GZDoom%20License.md "GZDoom License")** * OpenGL renderer * **[Lesser General Public License version 2.1](https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html "GNU Lesser General Public License v2.1 - GNU Project - Free Software Foundation")** * Timidity diff --git a/docs/GZDoom License.md b/docs/GZDoom License.md index 7d0d8c901..5899d006c 100644 --- a/docs/GZDoom License.md +++ b/docs/GZDoom License.md @@ -1,32 +1,18 @@ GZDoom License ============== -Copyright 2004-2009 Christoph Oelckers +Copyright(C) 2002-2016 Christoph Oelckers All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU Lesser General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -3. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. -4. When not used as part of GZDoom or a GZDoom derivative, this code will be - covered by the terms of the GNU Lesser General Public License as published - by the Free Software Foundation; either version 2.1 of the License, or (at - your option) any later version. +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 Lesser General Public License for more details. -THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +You should have received a copy of the GNU Lesser General Public License +along with this program. If not, see http://www.gnu.org/licenses/