Merge branch 'master' of https://github.com/scummvm/scummvm into mortevielle

Conflicts:
	engines/engines.mk

1 files changed, 51 insertions, 0 deletions

diff --git a/gui/credits.h b/gui/credits.h
index 37c5a7bd95..81d46b2b73 100644
--- a/gui/credits.h
+++ b/gui/credits.h
@@ -6,6 +6,7 @@ static const char *credits[] = {
 "C0""Eugene Sandulenko",
 "",
 "C1""PR Office",
+"A0""Arnaud Boutonne",
 "C0""Arnaud Boutonn\351",
 "C2""Public Relations Officer, Project Administrator",
 "C0""Eugene Sandulenko",
@@ -26,6 +27,7 @@ static const char *credits[] = {
 "",
 "C1""Engine Teams",
 "C1""SCUMM",
+"A0""Torbjorn Andersson",
 "C0""Torbj\366rn Andersson",
 "C0""James Brown",
 "C2""(retired)",
@@ -66,6 +68,7 @@ static const char *credits[] = {
 "C2""(retired)",
 "",
 "C1""AGOS",
+"A0""Torbjorn Andersson",
 "C0""Torbj\366rn Andersson",
 "C0""Paul Gilbert",
 "C0""Travis Howell",
@@ -75,6 +78,7 @@ static const char *credits[] = {
 "C2""(retired)",
 "",
 "C1""CGE",
+"A0""Arnaud Boutonne",
 "C0""Arnaud Boutonn\351",
 "C0""Paul Gilbert",
 "",
@@ -104,6 +108,7 @@ static const char *credits[] = {
 "C0""Pawel Kolodziejski",
 "",
 "C1""DreamWeb",
+"A0""Torbjorn Andersson",
 "C0""Torbj\366rn Andersson",
 "C0""Bertrand Augereau",
 "C0""Filippos Karapetis",
@@ -112,7 +117,9 @@ static const char *credits[] = {
 "C0""Willem Jan Palenstijn",
 "",
 "C1""Gob",
+"A0""Torbjorn Andersson",
 "C0""Torbj\366rn Andersson",
+"A0""Arnaud Boutonne",
 "C0""Arnaud Boutonn\351",
 "C0""Sven Hesse",
 "C0""Eugene Sandulenko",
@@ -122,12 +129,19 @@ static const char *credits[] = {
 "C0""Scott Thomas",
 "C0""Jordi Vilalta Prat",
 "",
+"C1""Hopkins",
+"A0""Arnaud Boutonne",
+"C0""Arnaud Boutonn\351",
+"C0""Paul Gilbert",
+"",
 "C1""Hugo",
+"A0""Arnaud Boutonne",
 "C0""Arnaud Boutonn\351",
 "C0""Oystein Eftevaag",
 "C0""Eugene Sandulenko",
 "",
 "C1""Kyra",
+"A0""Torbjorn Andersson",
 "C0""Torbj\366rn Andersson",
 "C2""VQA Player",
 "C0""Oystein Eftevaag",
@@ -170,6 +184,7 @@ static const char *credits[] = {
 "C0""Joost Peters",
 "",
 "C1""SAGA",
+"A0""Torbjorn Andersson",
 "C0""Torbj\366rn Andersson",
 "C0""Daniel Balsom",
 "C2""Original engine reimplementation author (retired)",
@@ -191,6 +206,7 @@ static const char *credits[] = {
 "C0""Lars Skovlund",
 "",
 "C1""Sky",
+"A0""Robert Goeffringmann",
 "C0""Robert G\366ffringmann",
 "C2""(retired)",
 "C0""Oliver Kiehl",
@@ -202,10 +218,12 @@ static const char *credits[] = {
 "C2""PSX version support",
 "C0""Thierry Crozat",
 "C2""Mac version support",
+"A0""Robert Goeffringmann",
 "C0""Robert G\366ffringmann",
 "C2""(retired)",
 "",
 "C1""Sword2",
+"A0""Torbjorn Andersson",
 "C0""Torbj\366rn Andersson",
 "C0""Fabio Battaglia",
 "C2""PSX version support",
@@ -213,6 +231,7 @@ static const char *credits[] = {
 "C2""(retired)",
 "",
 "C1""Sword25",
+"A0""Torbjorn Andersson",
 "C0""Torbj\366rn Andersson",
 "C0""Paul Gilbert",
 "C0""Max Horn",
@@ -227,6 +246,7 @@ static const char *credits[] = {
 "C2""(retired)",
 "",
 "C1""Tinsel",
+"A0""Torbjorn Andersson",
 "C0""Torbj\366rn Andersson",
 "C0""Fabio Battaglia",
 "C2""PSX version support",
@@ -237,7 +257,12 @@ static const char *credits[] = {
 "C0""Filippos Karapetis",
 "C0""Joost Peters",
 "",
+"C1""Toltecs",
+"C0""Benjamin Haisch",
+"C0""Filippos Karapetis",
+"",
 "C1""Tony",
+"A0""Arnaud Boutonne",
 "C0""Arnaud Boutonn\351",
 "C0""Paul Gilbert",
 "C0""Alyssa Milburn",
@@ -245,11 +270,13 @@ static const char *credits[] = {
 "C1""Toon",
 "C0""Sylvain Dupont",
 "",
+"A1""Touche",
 "C1""Touch\351",
 "C0""Gregory Montoir",
 "C2""(retired)",
 "",
 "C1""TsAGE",
+"A0""Arnaud Boutonne",
 "C0""Arnaud Boutonn\351",
 "C0""Paul Gilbert",
 "",
@@ -258,6 +285,7 @@ static const char *credits[] = {
 "C2""(retired)",
 "",
 "C1""Wintermute",
+"A0""Einar Johan T. Somaaen",
 "C0""Einar Johan T. S\370m\345en",
 "",
 "",
@@ -305,6 +333,7 @@ static const char *credits[] = {
 "C2""(retired)",
 "",
 "C1""PlayStation 2",
+"A0""Robert Goeffringmann",
 "C0""Robert G\366ffringmann",
 "C2""(retired)",
 "C0""Max Lingua",
@@ -351,6 +380,9 @@ static const char *credits[] = {
 "C2""Heavily improved de-/encoder for DXA videos",
 "C0""Jochen Hoenicke",
 "C2""Speaker & PCjr sound support, AdLib work (retired)",
+"A0""Daniel ter Laan",
+"C0""Dani\353l ter Laan",
+"C2""Restoring original Drascula tracks, and writing convert_dxa.bat",
 "C0""Chris Page",
 "C2""Return to launcher, savestate improvements, leak fixes, ... (GSoC 2008 task) (retired)",
 "C0""Robin Watts",
@@ -413,9 +445,11 @@ static const char *credits[] = {
 "",
 "C1""Packages",
 "C1""AmigaOS 4",
+"A0""Hans-Joerg Frieden",
 "C0""Hans-J\366rg Frieden",
 "C2""(retired)",
 "C0""Hubert Maier",
+"A0""Juha Niemimaki",
 "C0""Juha Niemim\344ki",
 "C2""(retired)",
 "",
@@ -445,6 +479,7 @@ static const char *credits[] = {
 "",
 "C1""MorphOS",
 "C0""Fabien Coeurjoly",
+"A0""Ruediger Hanke",
 "C0""R\374diger Hanke",
 "C2""(retired)",
 "",
@@ -475,15 +510,22 @@ static const char *credits[] = {
 "C1""Basque",
 "C0""Mikel Iturbe Urretxa",
 "",
+"C1""Belarusian",
+"C0""Ivan Lukyanov",
+"",
 "C1""Catalan",
 "C0""Jordi Vilalta Prat",
 "",
 "C1""Czech",
+"A0""Zbynik Schwarz",
 "C0""Zbyn\354k Schwarz",
 "",
 "C1""Danish",
 "C0""Steffen Nyeland",
 "",
+"C1""Finnish",
+"C0""Toni Saarela",
+"",
 "C1""French",
 "C0""Thierry Crozat",
 "",
@@ -502,10 +544,13 @@ static const char *credits[] = {
 "C1""Italian",
 "C0""Matteo Angelino",
 "",
+"A1""Norwegian (Bokmaal)",
 "C1""Norwegian (Bokm\345l)",
+"A0""Einar Johan Somaaen",
 "C0""Einar Johan S\370m\345en",
 "",
 "C1""Norwegian (Nynorsk)",
+"A0""Einar Johan Somaaen",
 "C0""Einar Johan S\370m\345en",
 "",
 "C1""Polish",
@@ -518,6 +563,7 @@ static const char *credits[] = {
 "C0""Eugene Sandulenko",
 "",
 "C1""Spanish",
+"A0""Tomas Maidagan",
 "C0""Tom\341s Maidagan",
 "C0""Jordi Vilalta Prat",
 "",
@@ -529,6 +575,7 @@ static const char *credits[] = {
 "",
 "",
 "C1""Websites (design)",
+"A0""Dobo Balazs",
 "C0""Dob\363 Bal\341zs",
 "C2""Website design",
 "C0""William Claydon",
@@ -557,6 +604,7 @@ static const char *credits[] = {
 "C2""Sound support for C64 version of MM/Zak, Loom PCE support",
 "C0""Janne Huttunen",
 "C2""V3 actor mask support, Dig/FT SMUSH audio",
+"A0""Kovacs Endre Janos",
 "C0""Kov\341cs Endre J\341nos",
 "C2""Several fixes for Simon1",
 "C0""Jeroen Janssen",
@@ -581,12 +629,14 @@ static const char *credits[] = {
 "C2""Sound support for Amiga SCUMM V2/V3 games, MM NES support",
 "C0""Robert Crossfield",
 "C2""Improved support for Apple II/C64 versions of MM",
+"A0""Andreas Roever",
 "C0""Andreas R\366ver",
 "C2""Broken Sword I & II MPEG2 cutscene support",
 "C0""Edward Rudd",
 "C2""Fixes for playing MP3 versions of MI1/Loom audio",
 "C0""Daniel Schepler",
 "C2""Final MI1 CD music support, initial Ogg Vorbis support",
+"A0""Andre Souza",
 "C0""Andr\351 Souza",
 "C2""SDL-based OpenGL renderer",
 "C0""Tom Frost",
@@ -703,6 +753,7 @@ static const char *credits[] = {
 "C2""For deep tech details about C64 Zak & MM",
 "C0""Sarien Team",
 "C2""Original AGI engine code",
+"A0""Jimmi Thogersen",
 "C0""Jimmi Th\370gersen",
 "C2""For ScummRev, and much obscure code/documentation",
 "C0""Tristan",