diff options
| author | Willem Jan Palenstijn | 2015-07-22 22:37:40 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2015-07-22 22:43:42 +0200 |
| commit | 6ec9c81b575f13b2c4b30aeac592ebf2557b5890 (patch) | |
| tree | 503d50902bad2d800165593039d08d5ccf0c98ab /AUTHORS | |
| parent | 5ec05f6b647c5ea41418be7ed19ad381f97cabd8 (diff) | |
| parent | 4e5c8d35f7e133e2e72a846fdbd54900c91eeb73 (diff) | |
| download | scummvm-rg350-6ec9c81b575f13b2c4b30aeac592ebf2557b5890.tar.gz scummvm-rg350-6ec9c81b575f13b2c4b30aeac592ebf2557b5890.tar.bz2 scummvm-rg350-6ec9c81b575f13b2c4b30aeac592ebf2557b5890.zip | |
Merge branch 'master' into mm
Conflicts:
engines/access/access.cpp
engines/access/asurface.h
engines/access/bubble_box.cpp
engines/access/bubble_box.h
engines/access/martian/martian_game.cpp
engines/access/player.cpp
engines/access/player.h
engines/access/resources.cpp
engines/access/screen.cpp
engines/access/screen.h
engines/access/sound.cpp
engines/access/sound.h
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 15 |
1 files changed, 12 insertions, 3 deletions
@@ -259,8 +259,10 @@ ScummVM Team Einar Johan T. Somaaen Tobia Tesan - ZVision: + Z-Vision: Adrian Astley + Filippos Karapetis + Anton Yarcev Backend Teams ------------- @@ -483,7 +485,7 @@ Other contributions German: Simon Sawatzki - Lothar Serra Mari - (retired) + Lothar Serra Mari Hungarian: Alex Bevilacqua @@ -524,6 +526,12 @@ Other contributions Victor Gonzalez - Soltys Spanish translation Alejandro Gomez de la Munoza - Soltys Spanish translation + CGE2: + Arnaud Boutonne - Sfinx English translation + Thierry Crozat - Sfinx English translation + Peter Bozso - Sfinx English translation editor + Ryan Clark - Sfinx English translation editor + Drascula: Thierry Crozat - Improve French translation @@ -557,6 +565,7 @@ Other contributions Jeroen Janssen - Numerous readability and bugfix patches Keith Kaisershot - Several Pegasus Prime patches Andreas Karlsson - Initial port for SymbianOS + Stefan Kristiansson - Initial work on SDL2 support Claudio Matsuoka - Daily Linux builds Thomas Mayer - PSP port contributions Sean Murray - ScummVM tools GUI application (GSoC 2007 @@ -661,7 +670,7 @@ Special thanks to Jimmi Thogersen - For ScummRev, and much obscure code/documentation Tristan - For additional work on the original MT-32 emulator James Woodcock - Soundtrack enhancements - Anton Yartsev - For the original re-implementation of the ZVision + Anton Yartsev - For the original re-implementation of the Z-Vision engine Tony Warriner and everyone at Revolution Software Ltd. for sharing with us |