From c4bdea43210addb462f1fbd73e70104cc56ed6f1 Mon Sep 17 00:00:00 2001 From: Yamagi Burmeister Date: Fri, 10 Aug 2018 10:28:02 +0200 Subject: [PATCH] Add miniz to the LICENSE file. --- LICENSE | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/LICENSE b/LICENSE index cb5412a8..5197f8a2 100644 --- a/LICENSE +++ b/LICENSE @@ -6,6 +6,7 @@ copys for each license: - Info-ZIP (unzip): Info-ZIP License - Cocoa SDL entry points - stb_image.h, stb_image_write.h, stb_vorbis.h +- miniz: MIT License Parts of other Quake II Clients were included into the source. They covered by the same GPLv2 license as Quake II itself: @@ -22,12 +23,8 @@ covered by the same GPLv2 license as Quake II itself: The following code is used in library form and thus not part of Yamagi Quake II: -- libogg +- libGL - libopenal -- libvorbis -- libz -- libX11 -- libXxf86vm - SDL =============================================================================== @@ -491,3 +488,27 @@ 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. =============================================================================== + +Copyright 2013-2014 RAD Game Tools and Valve Software +Copyright 2010-2014 Rich Geldreich and Tenacious Software LLC +All Rights Reserved. + +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. + +===============================================================================