[Scummvm-git-logs] scummvm master -> 9963c246fb721dde0c83b3477d9d10f85da0f55c

aquadran noreply at scummvm.org
Sat Dec 18 21:43:26 UTC 2021


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9963c246fb LICENSE: Add NanoJpeg decoder entry


Commit: 9963c246fb721dde0c83b3477d9d10f85da0f55c
    https://github.com/scummvm/scummvm/commit/9963c246fb721dde0c83b3477d9d10f85da0f55c
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2021-12-18T22:43:21+01:00

Commit Message:
LICENSE: Add NanoJpeg decoder entry

Changed paths:
    COPYING.MIT


diff --git a/COPYING.MIT b/COPYING.MIT
index a315971079..29242217ba 100644
--- a/COPYING.MIT
+++ b/COPYING.MIT
@@ -29,3 +29,28 @@ 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.
+
+
+
+ScummVM uses NanoJPEG -- KeyJ's Tiny Baseline JPEG Decoder published under
+the terms of the MIT license.
+
+Copyright (c) 2009-2016 Martin J. Fiedler <martin.fiedler at gmx.net>
+
+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.




More information about the Scummvm-git-logs mailing list