Merge branch 'master' into teenagentRefactor

Conflicts:
	engines/teenagent/callbacks.cpp

1 files changed, 27 insertions, 2 deletions

diff --git a/gui/credits.h b/gui/credits.h
index 7226864543..37c5a7bd95 100644
--- a/gui/credits.h
+++ b/gui/credits.h
@@ -106,8 +106,10 @@ static const char *credits[] = {
 "C1""DreamWeb",
 "C0""Torbj\366rn Andersson",
 "C0""Bertrand Augereau",
+"C0""Filippos Karapetis",
 "C0""Vladimir Menshakov",
 "C2""(retired)",
+"C0""Willem Jan Palenstijn",
 "",
 "C1""Gob",
 "C0""Torbj\366rn Andersson",
@@ -157,6 +159,9 @@ static const char *credits[] = {
 "C1""Parallaction",
 "C0""peres",
 "",
+"C1""Pegasus",
+"C0""Matthew Hoops",
+"",
 "C1""Queen",
 "C0""David Eriksson",
 "C2""(retired)",
@@ -232,6 +237,11 @@ static const char *credits[] = {
 "C0""Filippos Karapetis",
 "C0""Joost Peters",
 "",
+"C1""Tony",
+"C0""Arnaud Boutonn\351",
+"C0""Paul Gilbert",
+"C0""Alyssa Milburn",
+"",
 "C1""Toon",
 "C0""Sylvain Dupont",
 "",
@@ -247,6 +257,9 @@ static const char *credits[] = {
 "C0""Gregory Montoir",
 "C2""(retired)",
 "",
+"C1""Wintermute",
+"C0""Einar Johan T. S\370m\345en",
+"",
 "",
 "C1""Backend Teams",
 "C1""Android",
@@ -474,9 +487,13 @@ static const char *credits[] = {
 "C1""French",
 "C0""Thierry Crozat",
 "",
+"C1""Galician",
+"C0""Santiago G. Sanz",
+"",
 "C1""German",
 "C0""Simon Sawatzki",
 "C0""Lothar Serra Mari",
+"C2""(retired)",
 "",
 "C1""Hungarian",
 "C0""Alex Bevilacqua",
@@ -674,6 +691,8 @@ static const char *credits[] = {
 "C2""For generously providing hosting for our buildbot, SVN repository, planet and doxygen sites as well as tons of HD space",
 "C0""DOSBox Team",
 "C2""For their awesome OPL2 and OPL3 emulator",
+"C0""Yusuke Kamiyamane",
+"C2""For contributing some GUI icons ",
 "C0""Till Kresslein",
 "C2""For design of modern ScummVM GUI",
 "C0""Jezar",
@@ -690,8 +709,6 @@ static const char *credits[] = {
 "C2""For additional work on the original MT-32 emulator",
 "C0""James Woodcock",
 "C2""Soundtrack enhancements",
-"C0""Some icons by Yusuke Kamiyamane",
-"C0""",
 "C0""Tony Warriner and everyone at Revolution Software Ltd. for sharing with us the source of some of their brilliant games, allowing us to release Beneath a Steel Sky as freeware... and generally being supportive above and beyond the call of duty.",
 "C0""",
 "C0""John Passfield and Steve Stamatiadis for sharing the source of their classic title, Flight of the Amazon Queen and also being incredibly supportive.",
@@ -710,5 +727,13 @@ static const char *credits[] = {
 "C0""",
 "C0""Broken Sword 2.5 team for providing sources of their engine and their great support.",
 "C0""",
+"C0""Neil Dodwell and David Dew from Creative Reality for providing the source of Dreamweb and for their tremendous support.",
+"C0""",
+"C0""Janusz Wisniewski and Miroslaw Liminowicz from Laboratorium Komputerowe Avalon for providing full source code for Soltys and letting us redistribute the game.",
+"C0""",
+"C0""Jan Nedoma for providing the sources to the Wintermute-engine, and for his support while porting the engine to ScummVM.",
+"C0""",
+"C0""Bob Bell, Michel Kripalani, Tommy Yune, from Presto Studios for providing the source code of The Journeyman Project: Pegasus Prime.",
+"C0""",
 "",
 };