aboutsummaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2013-10-17 22:33:15 +0200
committerWillem Jan Palenstijn2013-10-17 22:33:15 +0200
commit17711622429c980a0c3a3c549a7b55dbab7a2239 (patch)
treedd7df2a7740ac5c4afe92b76cec4dd583827dea8 /AUTHORS
parent109ff80475d036ad426df9fc236de9e8108d4e00 (diff)
parent748ba2475a2486196484246dc461d435c2564aba (diff)
downloadscummvm-rg350-17711622429c980a0c3a3c549a7b55dbab7a2239.tar.gz
scummvm-rg350-17711622429c980a0c3a3c549a7b55dbab7a2239.tar.bz2
scummvm-rg350-17711622429c980a0c3a3c549a7b55dbab7a2239.zip
Merge branch 'avalanche'
This merges pull request 399 for the Avalanche engine developed during GSoC2013.
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS4
1 files changed, 4 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index e0f1a1b8fc..35a8a9ad96 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -62,6 +62,10 @@ ScummVM Team
Oliver Kiehl - (retired)
Ludvig Strigeus - (retired)
+ AVALANCHE:
+ Peter Bozso
+ Arnaud Boutonne
+
CGE:
Arnaud Boutonne
Paul Gilbert