[Scummvm-git-logs] scummvm master -> 3201546fb12980cdd921b18269e3279d7bee052c

sev- noreply at scummvm.org
Wed Aug 21 14:53:43 UTC 2024


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:
3201546fb1 VIDEO: Added second license to coktel_decoder.cpp as part of gob engine dual licensing


Commit: 3201546fb12980cdd921b18269e3279d7bee052c
    https://github.com/scummvm/scummvm/commit/3201546fb12980cdd921b18269e3279d7bee052c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-08-21T16:53:35+02:00

Commit Message:
VIDEO: Added second license to coktel_decoder.cpp as part of gob engine dual licensing

Changed paths:
    video/coktel_decoder.cpp
    video/coktel_decoder.h


diff --git a/video/coktel_decoder.cpp b/video/coktel_decoder.cpp
index 74779fcc7ba..4b4bddb079a 100644
--- a/video/coktel_decoder.cpp
+++ b/video/coktel_decoder.cpp
@@ -17,6 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ *
+ * This file is dual-licensed.
+ * In addition to the GPLv3 license mentioned above, this code is also
+ * licensed under LGPL 2.1. See LICENSES/COPYING.LGPL file for the
+ * full text of the license.
+ *
  */
 
 #include "common/scummsys.h"
diff --git a/video/coktel_decoder.h b/video/coktel_decoder.h
index af2e9435b38..27486a580fe 100644
--- a/video/coktel_decoder.h
+++ b/video/coktel_decoder.h
@@ -17,6 +17,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ *
+ * This file is dual-licensed.
+ * In addition to the GPLv3 license mentioned above, this code is also
+ * licensed under LGPL 2.1. See LICENSES/COPYING.LGPL file for the
+ * full text of the license.
+ *
  */
 
 // Currently, only GOB and SCI32 games play IMDs and VMDs, so skip compiling if GOB and SCI32 is disabled.




More information about the Scummvm-git-logs mailing list