[Scummvm-git-logs] scummvm master -> 5d10fae9ca20539d3e17c489e1550250c0c0a607

[bluegr]

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:
8eeed61c30 ASYLUM: generate credits
5d10fae9ca ASYLUM: update credits


Commit: 8eeed61c3042fdf10792573e822c67ecabc6e6f6
    https://github.com/scummvm/scummvm/commit/8eeed61c3042fdf10792573e822c67ecabc6e6f6
Author: Alex Bevilacqua (alex at alexbevi.com)
Date: 2021-05-18T21:17:38+03:00

Commit Message:
ASYLUM: generate credits

Changed paths:
    AUTHORS
    devtools/credits.pl
    doc/docportal/help/credits.rst
    gui/credits.h


diff --git a/AUTHORS b/AUTHORS
index 1fb5849d97..279b755a3a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -108,6 +108,16 @@ ScummVM Team
        rofl0r                         - AGS
        Berian Williams                - AgsCreditz
 
+    Asylum:
+       Alex Bevilacqua
+       Alex Fontoura
+       Alexander Panov
+       Benjamin Haisch
+       Deledrius
+       Filippos Karapetis
+       Joseph Davies
+       Julien Templier
+
     Avalanche:
        Peter Bozso
        Arnaud Boutonne
@@ -645,6 +655,7 @@ ScummVM Team
                                       (retired)
      Matthew Hoops                  - Numerous contributions to documentation
                                       (retired)
+     Cadi Howley                    - User documentation (GSOD 2020)
 
   Retired Team Members
   --------------------
diff --git a/devtools/credits.pl b/devtools/credits.pl
index e9d677f2c5..a6b630390b 100755
--- a/devtools/credits.pl
+++ b/devtools/credits.pl
@@ -672,6 +672,16 @@ begin_credits("Credits");
 				add_person("Berian Williams", "AGA", "AgsCreditz");
 			end_section();
 
+			begin_section("Asylum");
+				add_person("Alex Bevilacqua", "alexbevi", "");
+				add_person("Alex Fontoura", "xesf", "");
+				add_person("Alexander Panov", "alxpnv", "");
+				add_person("Benjamin Haisch", "john_doe", "");
+				add_person("", "Deledrius", "");
+				add_person("Filippos Karapetis", "bluegr", "");
+				add_person("Joseph Davies", "", "");
+				add_person("Julien Templier", "littleboy", "");
+			end_section();
 
 			begin_section("Avalanche");
 				add_person("Peter Bozsó", "uruk", "");
diff --git a/doc/docportal/help/credits.rst b/doc/docportal/help/credits.rst
index 43bfa47650..12b731bf5f 100644
--- a/doc/docportal/help/credits.rst
+++ b/doc/docportal/help/credits.rst
@@ -241,6 +241,29 @@ AGS
    * - Berian Williams
      - AgsCreditz
 
+Asylum
+^^^^^^
+
+.. list-table::
+   :widths: 35 65
+
+   * - Alex Bevilacqua
+     -
+   * - Alex Fontoura
+     -
+   * - Alexander Panov
+     -
+   * - Benjamin Haisch
+     -
+   * - Deledrius
+     -
+   * - Filippos Karapetis
+     -
+   * - Joseph Davies
+     -
+   * - Julien Templier
+     -
+
 Avalanche
 ^^^^^^^^^
 
@@ -1590,6 +1613,8 @@ Documentation
      - Numerous contributions to documentation (retired)
    * - Matthew Hoops
      - Numerous contributions to documentation (retired)
+   * - Cadi Howley
+     - User documentation (GSOD 2020)
 
 Retired Team Members
 ********************
diff --git a/gui/credits.h b/gui/credits.h
index ee94c8e351..5884a2d641 100644
--- a/gui/credits.h
+++ b/gui/credits.h
@@ -159,6 +159,16 @@ static const char *credits[] = {
 "C0""Berian Williams",
 "C2""AgsCreditz",
 "",
+"C1""Asylum",
+"C0""Alex Bevilacqua",
+"C0""Alex Fontoura",
+"C0""Alexander Panov",
+"C0""Benjamin Haisch",
+"C0""Deledrius",
+"C0""Filippos Karapetis",
+"C0""Joseph Davies",
+"C0""Julien Templier",
+"",
 "C1""Avalanche",
 "C0""Peter Bozs\303\263",
 "C0""Arnaud Boutonn\303\251",
@@ -782,6 +792,8 @@ static const char *credits[] = {
 "C2""Numerous contributions to documentation (retired)",
 "C0""Matthew Hoops",
 "C2""Numerous contributions to documentation (retired)",
+"C0""Cadi Howley",
+"C2""User documentation (GSOD 2020)",
 "",
 "C1""Retired Team Members",
 "C0""Chris Apers",


Commit: 5d10fae9ca20539d3e17c489e1550250c0c0a607
    https://github.com/scummvm/scummvm/commit/5d10fae9ca20539d3e17c489e1550250c0c0a607
Author: Alex Bevilacqua (alex at alexbevi.com)
Date: 2021-05-18T21:17:38+03:00

Commit Message:
ASYLUM: update credits

Changed paths:
    AUTHORS
    devtools/credits.pl
    doc/docportal/help/credits.rst
    gui/credits.h


diff --git a/AUTHORS b/AUTHORS
index 279b755a3a..dc650cc97a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -113,7 +113,6 @@ ScummVM Team
        Alex Fontoura
        Alexander Panov
        Benjamin Haisch
-       Deledrius
        Filippos Karapetis
        Joseph Davies
        Julien Templier
diff --git a/devtools/credits.pl b/devtools/credits.pl
index a6b630390b..f406b99e1f 100755
--- a/devtools/credits.pl
+++ b/devtools/credits.pl
@@ -677,9 +677,8 @@ begin_credits("Credits");
 				add_person("Alex Fontoura", "xesf", "");
 				add_person("Alexander Panov", "alxpnv", "");
 				add_person("Benjamin Haisch", "john_doe", "");
-				add_person("", "Deledrius", "");
 				add_person("Filippos Karapetis", "bluegr", "");
-				add_person("Joseph Davies", "", "");
+				add_person("Joseph Davies", "Deledrius", "");
 				add_person("Julien Templier", "littleboy", "");
 			end_section();
 
diff --git a/doc/docportal/help/credits.rst b/doc/docportal/help/credits.rst
index 12b731bf5f..e866446d7a 100644
--- a/doc/docportal/help/credits.rst
+++ b/doc/docportal/help/credits.rst
@@ -255,8 +255,6 @@ Asylum
      -
    * - Benjamin Haisch
      -
-   * - Deledrius
-     -
    * - Filippos Karapetis
      -
    * - Joseph Davies
diff --git a/gui/credits.h b/gui/credits.h
index 5884a2d641..01447ca313 100644
--- a/gui/credits.h
+++ b/gui/credits.h
@@ -164,7 +164,6 @@ static const char *credits[] = {
 "C0""Alex Fontoura",
 "C0""Alexander Panov",
 "C0""Benjamin Haisch",
-"C0""Deledrius",
 "C0""Filippos Karapetis",
 "C0""Joseph Davies",
 "C0""Julien Templier",