diff options
| author | Matthew Hoops | 2011-05-31 14:16:29 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-05-31 14:16:29 -0400 |
| commit | aa49b38c5a8032586cb94fc4ca07149eecabe64a (patch) | |
| tree | ea5c7617f8c482c8cf4141b728b3ccff5a7f84c7 /AUTHORS | |
| parent | d3ea9ab2a9334747eb445c1b45aa30cb17ffdf1b (diff) | |
| parent | c86a6c466fabe31fbf36363aa8d0ac8ea6001b9f (diff) | |
| download | scummvm-rg350-aa49b38c5a8032586cb94fc4ca07149eecabe64a.tar.gz scummvm-rg350-aa49b38c5a8032586cb94fc4ca07149eecabe64a.tar.bz2 scummvm-rg350-aa49b38c5a8032586cb94fc4ca07149eecabe64a.zip | |
Merge remote branch 'upstream/master' into t7g-ios
Conflicts:
engines/groovie/script.cpp
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 71 |
1 files changed, 36 insertions, 35 deletions
@@ -19,7 +19,7 @@ ScummVM Team Jonathan Gray - (retired) Vincent Hamm - (retired) Max Horn - Travis Howell + Travis Howell - (retired) Pawel Kolodziejski - Codecs, iMUSE, Smush, etc. Gregory Montoir Eugene Sandulenko - FT INSANE, MM NES, MM C64, game detection, @@ -28,7 +28,7 @@ ScummVM Team HE: Jonathan Gray - (retired) - Travis Howell + Travis Howell - (retired) Gregory Montoir Eugene Sandulenko @@ -45,40 +45,18 @@ ScummVM Team AGOS: Torbjorn Andersson Paul Gilbert - Travis Howell + Travis Howell - (retired) Oliver Kiehl - (retired) Ludvig Strigeus - (retired) - BASS: - Robert Goeffringmann - (retired) - Oliver Kiehl - (retired) - Joost Peters - - Broken Sword: - Fabio Battaglia - PSX version support - Thierry Crozat - Mac version support - Robert Goeffringmann - (retired) - - Broken Sword II: - Torbjorn Andersson - Fabio Battaglia - PSX version support - Jonathan Gray - (retired) - - Broken Sword 2.5: - Eugene Sandulenko - Filippos Karapetis - Max Horn - Paul Gilbert - Torbjorn Andersson - - Cinematique evo 1: + Cine: Vincent Hamm - (retired) Pawel Kolodziejski Gregory Montoir Kari Salminen Eugene Sandulenko - Cinematique evo 2: + CruisE: Paul Gilbert Vincent Hamm - (retired) @@ -90,11 +68,6 @@ ScummVM Team Filippos Karapetis Pawel Kolodziejski - FOTAQ: - David Eriksson - (retired) - Gregory Montoir - Joost Peters - Gob: Torbjorn Andersson Arnaud Boutonne @@ -118,7 +91,7 @@ ScummVM Team Gregory Montoir Johannes Schickel - Last Express: + Lastexpress: Matthew Hoops Jordi Vilalta Prat Julien Templier @@ -147,6 +120,11 @@ ScummVM Team Parallaction: peres + Queen: + David Eriksson - (retired) + Gregory Montoir + Joost Peters + SAGA: Torbjorn Andersson Filippos Karapetis @@ -164,6 +142,28 @@ ScummVM Team Jordi Vilalta Prat Lars Skovlund + Sky: + Robert Goeffringmann - (retired) + Oliver Kiehl - (retired) + Joost Peters + + Sword1: + Fabio Battaglia - PSX version support + Thierry Crozat - Mac version support + Robert Goeffringmann - (retired) + + Sword2: + Torbjorn Andersson + Fabio Battaglia - PSX version support + Jonathan Gray - (retired) + + Sword25: + Eugene Sandulenko + Filippos Karapetis + Max Horn + Paul Gilbert + Torbjorn Andersson + TeenAgent: Robert Megone - Help with callback rewriting Vladimir Menshakov @@ -222,7 +222,8 @@ ScummVM Team PocketPC / WinCE: Nicolas Bacca - (retired) - Kostas Nakos + Ismail Khatib + Kostas Nakos - (retired) PlayStation 2: Robert Goeffringmann - (retired) @@ -357,7 +358,7 @@ Other contributions Markus Strangl Win32: - Travis Howell + Travis Howell - (retired) Win64: Chris Gray - (retired) |