Merge branch 'master'

.gitignore

@@ -19,6 +19,7 @@ lib*.a
 /MT32_CONTROL.ROM
 /MT32_PCM.ROM
 /ScummVM.app
+/scummvm-ps3.pkg
 /*.ipk
 /.project
 /.cproject
@@ -27,6 +28,8 @@ lib*.a
 /Icon.*
 
 /build
+/staging
+/portdist
 
 /backends/platform/dc/gui
 /backends/platform/dc/graphics
@@ -85,6 +88,7 @@ project.xcworkspace
 
 /dists/msvc*/[Dd]ebug*/
 /dists/msvc*/[Rr]elease*/
+/dists/msvc*/[Aa]nalysis*/
 /dists/msvc*/*.lib
 /dists/msvc*/*.SAV
 /dists/msvc*/*.dat
@@ -155,3 +159,12 @@ ipch/
 #Ignore default Visual Studio build folders
 [Dd]ebug/
 [Rr]elease/
+
+#Ignore Qt Creator project files
+ScummVM.config
+ScummVM.creator
+ScummVM.files
+ScummVM.includes
+
+#Ignore Komodo IDE/Edit project files
+*.komodoproject

AUTHORS

@@ -1,8 +1,19 @@
 ScummVM Team
 ************
-  Project Leaders
-  ---------------
+  Project Leader
+  --------------
+     Eugene Sandulenko
+
+  PR Office
+  ---------
+     Arnaud Boutonne       - Public Relations Officer, Project Administrator
+     Eugene Sandulenko     - Project Leader
+
+  Core Team
+  ---------
+     Willem Jan Palenstijn
      Eugene Sandulenko
+     Johannes Schickel
 
   Retired Project Leaders
   -----------------------
@@ -19,7 +30,7 @@ ScummVM Team
        Jonathan Gray         - (retired)
        Vincent Hamm          - (retired)
        Max Horn              - (retired)
-       Travis Howell         - (retired)
+       Travis Howell
        Pawel Kolodziejski    - Codecs, iMUSE, Smush, etc.
        Gregory Montoir
        Eugene Sandulenko     - FT INSANE, MM NES, MM C64, game detection,
@@ -28,7 +39,7 @@ ScummVM Team
 
     HE:
        Jonathan Gray         - (retired)
-       Travis Howell         - (retired)
+       Travis Howell
        Gregory Montoir
        Eugene Sandulenko
 
@@ -37,18 +48,22 @@ ScummVM Team
        Matthew Hoops
        Filippos Karapetis
        Pawel Kolodziejski
-       Walter van Niftrik
+       Walter van Niftrik    - (retired)
        Kari Salminen
        Eugene Sandulenko
        David Symonds         - (retired)
 
     AGOS:
        Torbjorn Andersson
        Paul Gilbert
-       Travis Howell         - (retired)
+       Travis Howell
        Oliver Kiehl          - (retired)
        Ludvig Strigeus       - (retired)
 
+    CGE:
+       Arnaud Boutonne
+       Paul Gilbert
+
     Cine:
        Vincent Hamm          - (retired)
        Pawel Kolodziejski
@@ -69,8 +84,9 @@ ScummVM Team
        Pawel Kolodziejski
 
     DreamWeb:
-       Vladimir Menshakov
        Torbjorn Andersson
+       Bertrand Augereau
+       Vladimir Menshakov
 
     Gob:
        Torbjorn Andersson
@@ -141,7 +157,7 @@ ScummVM Team
        Max Horn              - (retired)
        Filippos Karapetis
        Martin Kiewitz
-       Walter van Niftrik
+       Walter van Niftrik    - (retired)
        Willem Jan Palenstijn
        Jordi Vilalta Prat
        Lars Skovlund
@@ -162,11 +178,11 @@ ScummVM Team
        Jonathan Gray         - (retired)
 
     Sword25:
-       Eugene Sandulenko
-       Filippos Karapetis
-       Max Horn              - (retired)
-       Paul Gilbert
        Torbjorn Andersson
+       Paul Gilbert
+       Max Horn              - (retired)
+       Filippos Karapetis
+       Eugene Sandulenko
 
     TeenAgent:
        Robert Megone         - Help with callback rewriting
@@ -188,8 +204,8 @@ ScummVM Team
        Gregory Montoir
 
     TsAGE:
-       Paul Gilbert
        Arnaud Boutonne
+       Paul Gilbert
 
     Tucker:
        Gregory Montoir
@@ -200,6 +216,9 @@ ScummVM Team
        Andre Heider
        Angus Lees
 
+    BADA:
+       Chris Warren-Smith
+
     Dreamcast:
        Marcus Comstedt
 
@@ -213,12 +232,14 @@ ScummVM Team
        Lubomyr Lisen
 
     Maemo:
-       Frantisek Dufka
+       Frantisek Dufka       - (retired)
+       Tarek Soliman
 
     Nintendo 64:
        Fabio Battaglia
 
     Nintendo DS:
+       Bertrand Augereau     - HQ software scaler
        Neil Millstone
 
     OpenPandora:
@@ -234,8 +255,8 @@ ScummVM Team
        Max Lingua
 
     PSP (PlayStation Portable):
-       Joost Peters
        Yotam Barnoy
+       Joost Peters
 
     SDL (Win/Linux/OS X/etc.):
        Max Horn              - (retired)
@@ -361,7 +382,7 @@ Other contributions
        Markus Strangl
 
     Win32:
-       Travis Howell         - (retired)
+       Travis Howell
 
     Win64:
        Chris Gray            - (retired)
@@ -421,11 +442,11 @@ Other contributions
   Websites (design)
   -----------------
      Dobo Balazs           - Website design
+     William Claydon       - Skins for doxygen, buildbot and wiki
      Yaroslav Fedevych     - HTML/CSS for the website
-     David Jensen          - SVG logo conversion
      Jean Marc Gimenez     - ScummVM logo
+     David Jensen          - SVG logo conversion
      Raina                 - ScummVM forum buttons
-     William Claydon       - Skins for doxygen, buildbot and wiki
 
   Code contributions
   ------------------
@@ -452,7 +473,7 @@ Other contributions
      Tim Phillips          - Initial MI1 CD music support
      Quietust              - Sound support for Amiga SCUMM V2/V3 games, MM
                              NES support
-     segra                 - Improved support for Apple II/C64 versions of MM
+     Robert Crossfield     - Improved support for Apple II/C64 versions of MM
      Andreas Roever        - Broken Sword I & II MPEG2 cutscene support
      Edward Rudd           - Fixes for playing MP3 versions of MI1/Loom audio
      Daniel Schepler       - Final MI1 CD music support, initial Ogg Vorbis
@@ -461,50 +482,50 @@ Other contributions
 
   FreeSCI Contributors
   --------------------
-     Anders Baden Nielsen  - PPC testing
-     Bas Zoetekouw         - Man pages, debian package management, CVS
-                             maintenance
-     Carl Muckenhoupt      - Sources to the SCI resource viewer tools that
-                             started it all
+     Francois-R Boyer      - MT-32 information and mapping code
+     Rainer Canavan        - IRIX MIDI driver and bug fixes
+     Xiaojun Chen
+     Paul David Doherty    - Game version information
+     Vyacheslav Dikonov    - Config script improvements
+     Ruediger Hanke        - Port to the MorphOS platform
+     Matt Hargett          - Clean-ups, bugfixes, Hardcore QA, Win32
+     Max Horn              - SetJump implementation
+     Ravi I.               - SCI0 sound resource specification
+     Emmanuel Jeandel      - Bugfixes and bug reports
+     Dmitry Jemerov        - Port to the Win32 platform, numerous bugfixes
      Chris Kehler          - Makefile enhancements
-     Christoph Reichenbach - UN*X code, VM/Graphics/Sound/other
-                             infrastructure
      Christopher T. Lansdo - Original CVS maintainer, Alpha compatibility
                              fixes
+     Sergey Lapin          - Port of Carl's type 2 decompression code
+     Rickard Lind          - MT-32->GM MIDI mapping magic, sound research
+     Hubert Maier          - AmigaOS 4 port
+     Johannes Manhave      - Document format translation
      Claudio Matsuoka      - CVS snapshots, daily builds, BeOS and cygwin
                              ports
      Dark Minister         - SCI research (bytecode and parser)
-     Dmitry Jemerov        - Port to the Win32 platform, numerous bugfixes
-     Emmanuel Jeandel      - Bugfixes and bug reports
-     Francois-R Boyer      - MT-32 information and mapping code
+     Carl Muckenhoupt      - Sources to the SCI resource viewer tools that
+                             started it all
+     Anders Baden Nielsen  - PPC testing
+     Walter van Niftrik    - Ports to the Dreamcast and GP32 platforms
+     Rune Orsval           - Configuration file editor
+     Solomon Peachy        - SDL ports and much of the sound subsystem
+     Robey Pointer         - Bug tracking system hosting
+     Magnus Reftel         - Heap implementation, Python class viewer,
+                             bugfixes
+     Christoph Reichenbach - UN*X code, VM/Graphics/Sound/other
+                             infrastructure
      George Reid           - FreeBSD package management
-     Hubert Maier          - AmigaOS 4 port
-     Hugues Valois         - Game selection menu
-     Johannes Manhave      - Document format translation
-     Jordi Vilalta         - Numerous code and website clean-up patches
      Lars Skovlund         - Project maintenance, most documentation,
                              bugfixes, SCI1 support
-     Magnus Reftel         - Heap implementation, Python class viewer,
-                             bugfixes
-     Matt Hargett          - Clean-ups, bugfixes, Hardcore QA, Win32
-     Max Horn              - SetJump implementation
-     Paul David Doherty    - Game version information
-     Petr Vyhnak           - The DCL-INFLATE algorithm, many Win32
-                             improvements
-     Rainer Canavan        - IRIX MIDI driver and bug fixes
-     Rainer De Temple      - SCI research
-     Ravi I.               - SCI0 sound resource specification
-     Ruediger Hanke        - Port to the MorphOS platform
-     Rune Orsval           - Configuration file editor
-     Rickard Lind          - MT-32->GM MIDI mapping magic, sound research
      Rink Springer         - Port to the DOS platform, several bug fixes
-     Robey Pointer         - Bug tracking system hosting
-     Sergey Lapin          - Port of Carl's type 2 decompression code
-     Solomon Peachy        - SDL ports and much of the sound subsystem
-     Vyacheslav Dikonov    - Config script improvements
-     Walter van Niftrik    - Ports to the Dreamcast and GP32 platforms
-     Xiaojun Chen
+     Rainer De Temple      - SCI research
      Sean Terrell
+     Hugues Valois         - Game selection menu
+     Jordi Vilalta         - Numerous code and website clean-up patches
+     Petr Vyhnak           - The DCL-INFLATE algorithm, many Win32
+                             improvements
+     Bas Zoetekouw         - Man pages, debian package management, CVS
+                             maintenance
 
      Special thanks to Prof. Dr. Gary Nutt for allowing the FreeSCI VM
      extension as a course project in his Advanced OS course.

COPYING

@@ -336,4 +336,4 @@ This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
 library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
+Public License instead of this License.

COPYING.LGPL

@@ -506,5 +506,3 @@ necessary.  Here is a sample; alter the names:
   Ty Coon, President of Vice
 
 That's all there is to it!
-
-

Makefile

@@ -90,4 +90,3 @@ endif
 ifneq ($(origin port_mk), undefined)
 include $(srcdir)/$(port_mk)
 endif
-