diff options
| author | Matthew Hoops | 2011-10-07 14:34:22 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-10-07 14:34:22 -0400 |
| commit | e1dc4db7aa53d1bbc4cdb03d1163c97d049702f5 (patch) | |
| tree | 9d57b5fdd6737bc3449851a87e573abe7be984a6 /AUTHORS | |
| parent | deab5b28753155863062746ef1239535f562fd0b (diff) | |
| parent | 842b471e45ae8b7c1b4516b9bd5bf39d61112077 (diff) | |
| download | scummvm-rg350-e1dc4db7aa53d1bbc4cdb03d1163c97d049702f5.tar.gz scummvm-rg350-e1dc4db7aa53d1bbc4cdb03d1163c97d049702f5.tar.bz2 scummvm-rg350-e1dc4db7aa53d1bbc4cdb03d1163c97d049702f5.zip | |
Merge remote branch 'upstream/master' into pegasus
Conflicts:
video/qt_decoder.cpp
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -60,6 +60,10 @@ ScummVM Team Oliver Kiehl - (retired) Ludvig Strigeus - (retired) + CGE: + Arnaud Boutonne + Paul Gilbert + Cine: Vincent Hamm - (retired) Pawel Kolodziejski @@ -228,7 +232,8 @@ ScummVM Team Lubomyr Lisen Maemo: - Frantisek Dufka + Frantisek Dufka - (retired) + Tarek Soliman Nintendo 64: Fabio Battaglia |