[Scummvm-git-logs] scummvm master -> 34f96756d649df719fa78572b4c650ed5b40ecb8

Sun Dec 26 18:02:51 UTC 2021

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

Summary:
aa25dd11cf NEWS: Mention license change
34f96756d6 ALL: Update license in ARM assembly files too


Commit: aa25dd11cf5e25854ff82c59f6b7f17dbb6fc385
    https://github.com/scummvm/scummvm/commit/aa25dd11cf5e25854ff82c59f6b7f17dbb6fc385
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-12-26T19:02:46+01:00

Commit Message:
NEWS: Mention license change

Changed paths:
    NEWS.md

diff --git a/NEWS.md b/NEWS.md
index 7ea36cbc051..39266462c5e 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -8,6 +8,7 @@ For a more comprehensive changelog of the latest experimental code, see:
    - Added support for Hades Challenge.
 
  General:
+   - The project licesne has been upgraded to GPLv3+.
    - Now ScummVM requires C++11 for building.
    - Implemented enhanced filtering in the Search box. See "Understanding
      the search box" in the documentation for details.


Commit: 34f96756d649df719fa78572b4c650ed5b40ecb8
    https://github.com/scummvm/scummvm/commit/34f96756d649df719fa78572b4c650ed5b40ecb8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-12-26T19:02:46+01:00

Commit Message:
ALL: Update license in ARM assembly files too

Changed paths:
    engines/scumm/gfxARM.s
    engines/scumm/proc3ARM.s
    engines/scumm/smush/codec47ARM.s
    graphics/scaler/Normal2xARM.s
    graphics/scaler/scale2xARM.s


diff --git a/engines/scumm/gfxARM.s b/engines/scumm/gfxARM.s
index 54ad81f7400..5ce634dced4 100644
--- a/engines/scumm/gfxARM.s
+++ b/engines/scumm/gfxARM.s
@@ -4,9 +4,9 @@
 @ are too numerous to list here. Please refer to the COPYRIGHT
 @ file distributed with this source distribution.
 @
-@ This program is free software@ you can redistribute it and/or
+@ This program is free software: you can redistribute it and/or modify
 @ it under the terms of the GNU General Public License as published by
-@ as published by the Free Software Foundation@ either version 2
+@ the Free Software Foundation, either version 3 of the License, or
 @ (at your option) any later version.
 @
 @ This program is distributed in the hope that it will be useful,
@@ -15,7 +15,7 @@
 @ GNU General Public License for more details.
 @
 @ You should have received a copy of the GNU General Public License
-@ along with this program@ if not, write to the Free Software
+@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 @
 @ @author Robin Watts (robin at wss.co.uk)
 
diff --git a/engines/scumm/proc3ARM.s b/engines/scumm/proc3ARM.s
index 581d134eb79..cb89f39626e 100644
--- a/engines/scumm/proc3ARM.s
+++ b/engines/scumm/proc3ARM.s
@@ -4,9 +4,9 @@
 @ are too numerous to list here. Please refer to the COPYRIGHT
 @ file distributed with this source distribution.
 @
-@ This program is free software@ you can redistribute it and/or
+@ This program is free software: you can redistribute it and/or modify
 @ it under the terms of the GNU General Public License as published by
-@ as published by the Free Software Foundation@ either version 2
+@ the Free Software Foundation, either version 3 of the License, or
 @ (at your option) any later version.
 @
 @ This program is distributed in the hope that it will be useful,
@@ -15,7 +15,7 @@
 @ GNU General Public License for more details.
 @
 @ You should have received a copy of the GNU General Public License
-@ along with this program@ if not, write to the Free Software
+@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 @
 @ @author Robin Watts (robin at wss.co.uk)
 
diff --git a/engines/scumm/smush/codec47ARM.s b/engines/scumm/smush/codec47ARM.s
index 8cd9067222b..5cd1ad1275e 100644
--- a/engines/scumm/smush/codec47ARM.s
+++ b/engines/scumm/smush/codec47ARM.s
@@ -4,18 +4,18 @@
 @ are too numerous to list here. Please refer to the COPYRIGHT
 @ file distributed with this source distribution.
 @
-@ This program is free software@ you can redistribute it and/or
+@ This program is free software: you can redistribute it and/or modify
 @ it under the terms of the GNU General Public License as published by
-@ as published by the Free Software Foundation@ either version 2
+@ the Free Software Foundation, either version 3 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
+@ but WITHOUT ANY WARRANTY; without even the implied warranty of
 @ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 @ GNU General Public License for more details.
 @
 @ You should have received a copy of the GNU General Public License
-@ along with this program@ if not, write to the Free Software
+@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 @
 @ @author Robin Watts (robin at wss.co.uk)
 @
diff --git a/graphics/scaler/Normal2xARM.s b/graphics/scaler/Normal2xARM.s
index d9979959542..4eaa0328160 100644
--- a/graphics/scaler/Normal2xARM.s
+++ b/graphics/scaler/Normal2xARM.s
@@ -4,18 +4,18 @@
 @ are too numerous to list here. Please refer to the COPYRIGHT
 @ file distributed with this source distribution.
 @
-@ This program is free software@ you can redistribute it and/or
+@ This program is free software: you can redistribute it and/or modify
 @ it under the terms of the GNU General Public License as published by
-@ as published by the Free Software Foundation@ either version 2
+@ the Free Software Foundation, either version 3 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
+@ but WITHOUT ANY WARRANTY; without even the implied warranty of
 @ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 @ GNU General Public License for more details.
 @
 @ You should have received a copy of the GNU General Public License
-@ along with this program@ if not, write to the Free Software
+@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 @
 @ @author Robin Watts (robin at wss.co.uk)
 
diff --git a/graphics/scaler/scale2xARM.s b/graphics/scaler/scale2xARM.s
index c57c04cc861..88ab35a7515 100644
--- a/graphics/scaler/scale2xARM.s
+++ b/graphics/scaler/scale2xARM.s
@@ -4,18 +4,18 @@
 @ are too numerous to list here. Please refer to the COPYRIGHT
 @ file distributed with this source distribution.
 @
-@ This program is free software@ you can redistribute it and/or
+@ This program is free software: you can redistribute it and/or modify
 @ it under the terms of the GNU General Public License as published by
-@ as published by the Free Software Foundation@ either version 2
+@ the Free Software Foundation, either version 3 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
+@ but WITHOUT ANY WARRANTY; without even the implied warranty of
 @ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 @ GNU General Public License for more details.
 @
 @ You should have received a copy of the GNU General Public License
-@ along with this program@ if not, write to the Free Software
+@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 @
 @ @author Robin Watts (robin at wss.co.uk)
 


