merge r4240 to 098 release branch

2012-04-02 16:47:04 +00:00 · 2012-04-02 16:47:04 +00:00 · 9f4cdf16f7
parent 066682fa5c
commit 9f4cdf16f7
1 changed files with 11 additions and 6 deletions
--- a/desmume/AUTHORS
+++ b/desmume/AUTHORS
@ -10,12 +10,8 @@ Bernat Mu
 Riccardo Magliocchetti
 Max Tabachenko (CrazyMax)
 zeromus
+rogerman
 Luigi__
-adelikat
-matusz
-pa__
-gocha
-nitsuja

 Contributors
 ------------
@ -33,7 +29,16 @@ Tim Seidel (Mighty Max)
 Pascal Giard (evilynux)
 Ben Jaques (masscat)
 Jeff Bland
-Hicoder
+Bernat Muñoz (shash)
+matusz
+nitsuja
+gocha
+pa__
+adelikat
+hi-coder
+WinterMute
+pengvado
+dormito
 ldesnogue

 Thanks to our super testers for this release