diff options
| author | Matthew Hoops | 2012-09-12 20:18:13 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-09-12 20:18:13 -0400 |
| commit | d5ed8b1901b88e361a2a420a9daf586f6089a36b (patch) | |
| tree | d19e4dd7baf33b7447d69d8ad8d3c25732a69698 /gui | |
| parent | ff51a7661d7a2cb296b987edfc3d81727160e627 (diff) | |
| parent | 8808393b3a3428df2946d7967e52aba084c8ffe5 (diff) | |
| download | scummvm-rg350-d5ed8b1901b88e361a2a420a9daf586f6089a36b.tar.gz scummvm-rg350-d5ed8b1901b88e361a2a420a9daf586f6089a36b.tar.bz2 scummvm-rg350-d5ed8b1901b88e361a2a420a9daf586f6089a36b.zip | |
Merge remote branch 'upstream/master' into pegasus
Conflicts:
AUTHORS
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/credits.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/gui/credits.h b/gui/credits.h index 88d492098b..43b9292ac5 100644 --- a/gui/credits.h +++ b/gui/credits.h @@ -252,6 +252,9 @@ static const char *credits[] = { "C0""Gregory Montoir", "C2""(retired)", "", +"C1""Wintermute", +"C0""Einar Johan T. S\370m\345en", +"", "", "C1""Backend Teams", "C1""Android", @@ -682,6 +685,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", @@ -698,8 +703,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.", @@ -720,7 +723,9 @@ static const char *credits[] = { "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 to redistribute the game.", +"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""", |