some syncing with 0.6.x branch

svn-id: r14348

3 files changed, 24 insertions, 19 deletions

diff --git a/NEWS b/NEWS
index fc85eeb5e3..832b0c9f23 100644
--- a/NEWS
+++ b/NEWS
@@ -13,33 +13,38 @@ For a more comprehensive changelog for the latest experimental CVS code, see:
      Mac OS X unices (including Linux)
 
  SCUMM:
-   - Added graphics decoders for 3DO Humongous Entertainment games
-   - Rewrote parts of the text engine for improved subtitle support
-   - Many improvements made to iMuseDigital (used by The Dig, FT and COMI)
-   - Fixed several annoying bugs
-   - Fixed crash on 64 bit architectures (like AMD64)
    - Old zak256 target removed, use zakTowns instead
-   - Numerous Humongous Entertainment games fixes
-   - Fixed bug in Full Throttle, so battle difficulty matches original
 
  Queen:
    - Various fixes [TODO: Somebody of the Queen team please fill this in]
 
- Sword1:
-   - Fixed a rare masking bug
-   - Made the save/load dialog is a bit more user-friendly
-
  Sword2:
    - Simplified the memory/resource management...
    - ...which led to simplified sound effects handling
    - Various minor bugfixes.
 
- BASS
-   - ???
+0.6.1 (2004-07-25)
+ General:
+   - Fixed sound glitch when streaming two or more Ogg Vorbis sounds from the
+     same file handle, e.g. in the Sam & Max intro when using monster.sog.
 
- Simon
+ SCUMM:
+   - Many SCUMM game engine fixes.
+   - Added graphics decoders for 3DO Humongous Entertainment games
+   - Numerous Humongous Entertainment games fixes
+   - Fixed bug in Full Throttle, so battle difficulty matches original
+   - Improved Digital iMUSE
+
+ Sword1:
+   - Warn the user if saving fails, instead of crashing.
+   - Slightly more user-friendly save/restore dialog.
+   - Fixed masking glitch outside Nico's apartment.
+
+ BASS:
+   - Warn the user if saving a game doesn't work.
+
+ Simon:
    - Fixed crashes in some international versions
- 
 
 0.6.0 (2004-03-14)
  New Games:
diff --git a/README b/README
index af6b45d3e1..e09ab2e71f 100644
--- a/README
+++ b/README
@@ -1097,9 +1097,10 @@ X.X Credits:
         Max Horn             - Lead developer
         Torbjorn Andersson   - Engine: SCUMM, Broken Sword II
         David Eriksson       - Engine: Flight of the Amazon Queen
-        Robert Goeffringmann - Engine: Beneath a Steel Sky (maintainer)
+        Robert Goeffringmann - Engine: Beneath a Steel Sky,
                                        Broken Sword I
         Jonathan Gray        - Engine: SCUMM, Broken Sword II
+        Travis Howell        - Engine: SCUMM, Simon the Sorcerer
         Oliver Kiehl         - Engine: Beneath a Steel Sky, Simon
         Pawel Kolodziejski   - Engine: SCUMM (Codecs, iMUSE, Smush, etc.)
         Gregory Montoir      - Engine: Flight of the Amazon Queen
@@ -1110,7 +1111,6 @@ X.X Credits:
         Nicolas Bacca        - Port: PocketPC/WinCE port
         Marcus Comstedt      - Port: Dreamcast
         Ruediger Hanke       - Port: MorphOS
-        Travis Howell        - Port: Win32, Engine: Simon (maintainer)
         Peter Moraliyski     - Port: GP32
         Lionel Ulmer         - Port: X11
         Jamieson Christian   - iMUSE, MIDI, all things musical.
diff --git a/doc/10.tex b/doc/10.tex
index 1a0c886f88..9b544bbc48 100644
--- a/doc/10.tex
+++ b/doc/10.tex
@@ -12,9 +12,10 @@
     Max Horn             & Lead developer\\
     Torbj\"{o}rn Andersson   & Engine: SCUMM, Broken Sword II\\
     David Eriksson       & Engine: Flight of the Amazon Queen\\
-    Robert Goeffringmann & Engine: Beneath a Steel Sky (maintainer)\\
+    Robert Goeffringmann & Engine: Beneath a Steel Sky\\
     				& Broken Sword I\\
     Jonathan Gray        & Engine: SCUMM, Broken Sword II\\
+    Travis Howell        & Engine: SCUMM, Simon the Sorcerer\\
     Oliver Kiehl         & Engine: Beneath a Steel Sky, Simon\\
     Pawel Kolodziejski   & Engine: SCUMM (Codecs, iMUSE, Smush, etc.)\\
     Gregory Montoir      & Engine: Flight of the Amazon Queen\\
@@ -25,7 +26,6 @@
     Nicolas Bacca        & Port: PocketPC/WinCE port\\
     Marcus Comstedt      & Port: Dreamcast\\
     Ruediger Hanke       & Port: MorphOS\\
-    Travis Howell        & Port: Win32, Engine: Simon (maintainer)\\
     Peter Moraliyski     & Port: GP32\\
     Lionel Ulmer         & Port: X11\\
     Jamieson Christian   & iMUSE, MIDI, all things musical.\\