cvs going to 0.4.2cvs

svn-id: r7946

8 files changed, 47 insertions, 19 deletions

diff --git a/Info.plist b/Info.plist
index ef75e500d5..66479950cc 100644
--- a/Info.plist
+++ b/Info.plist
@@ -9,7 +9,7 @@
 	<key>CFBundleExecutable</key>
 	<string>scummvm</string>
 	<key>CFBundleGetInfoString</key>
-	<string>0.4.1cvs, Copyright 2001-2003 The ScummVM team</string>
+	<string>0.4.2cvs, Copyright 2001-2003 The ScummVM team</string>
 	<key>CFBundleIconFile</key>
 	<string>scummvm.icns</string>
 	<key>CFBundleInfoDictionaryVersion</key>
@@ -19,9 +19,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.4.1cvs</string>
+	<string>0.4.2cvs</string>
 	<key>CFBundleVersion</key>
-	<string>0.4.1cvs</string>
+	<string>0.4.2cvs</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 	<key>NSHumanReadableCopyright</key>
diff --git a/NEWS b/NEWS
index 69b8aea3d9..6b9aa486d1 100644
--- a/NEWS
+++ b/NEWS
@@ -2,8 +2,7 @@ For a more comprehensive changelog for the latest experimental CVS code, see:
         http://scummvm.sourceforge.net/daily/ChangeLog
 
 ??? (2003-??-??)
-- Curse of Monkey Island (COMI) stability fixes
-- COMI support for playing from CD improved on Mac OS X
+- Curse of Monkey Island (COMI) support for playing from CD improved on Mac OS X
 - Loading COMI savegames for disk 2 doesn't anymore require disk 1 first
 - Music fixes (exp. Monkey Island 2)
 - Rewritten iMuse engine
@@ -11,6 +10,13 @@ For a more comprehensive changelog for the latest experimental CVS code, see:
 - Initial, incomplete support for Maniac Mansion and Zak McKracken
 - Many other bug fixes and improvements
 
+0.4.1 (2003-05-25)
+- Added AdvMame3x filter
+- Fixed crash Curse of Monkey Island (and possibly other games as well)
+- Fixed airport doors in Zak256
+- Fixed crash in SDL backend
+- Fixed various iMuse bugs
+
 0.4.0 (2003-05-11)
 - Curse of Monkey Island (comi) support (experimental)
 - Added support for the EGA versions of Loom, Monkey Island and Indy3
diff --git a/README b/README
index 96bf8112e1..ca94636220 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
 ScummVM README
-Last updated:    2003-05-16
-Release version: 0.4.1cvs
+Last updated:    2003-05-25
+Release version: 0.4.2cvs
 ------------------------------------------------------------------------
 
 For more information, compatibility lists, details on donating, the latest
@@ -336,8 +336,8 @@ Command Line Options:
         -b<num>       - Start in room <num>.
         -d[<num>]     - Set debug verbosity to <num>
         -u            - Dump scripts if a directory called 'dumps' exists in current directory
-		--multi-midi  - enable combination Adlib and native MIDI
-		--native-mt32 - true Roland MT-32 (disable GM emulation)
+        --multi-midi  - enable combination Adlib and native MIDI
+        --native-mt32 - true Roland MT-32 (disable GM emulation)
 
 
 Hot Keys:
@@ -679,7 +679,7 @@ Credits:
         Nicolas Bacca        - Port:   PocketPC/WinCE port
         Marcus Comstedt      - Port:   DreamCast
         Ruediger Hanke       - Port:   MorphOS
-	Travis Howell	     - Port:   Win32, Engine: Simon
+        Travis Howell        - Port:   Win32, Engine: Simon
         Peter Moraliyski     - Port:   GP32
         Lionel Ulmer         - Port:   X11
 
diff --git a/backends/wince/screen.cpp b/backends/wince/screen.cpp
index 6ad2df2cbf..a7fec1ceca 100644
--- a/backends/wince/screen.cpp
+++ b/backends/wince/screen.cpp
@@ -21,7 +21,7 @@
 
 #ifdef _WIN32_WCE
 
-#define POCKETSCUMM_VERSION "PPC 0.4.0"
+#define POCKETSCUMM_VERSION "PPC 0.4.2cvs"
 
 /* Original GFX code by Vasyl Tsvirkunov */
 
diff --git a/backends/wince/smartphone.cpp b/backends/wince/smartphone.cpp
index ae4a77d4be..5bdb65c6c4 100644
--- a/backends/wince/smartphone.cpp
+++ b/backends/wince/smartphone.cpp
@@ -30,7 +30,7 @@
 
 #define IDM_SMARTFON_MAP_BASE 99200
 
-#define SMARTFON_VERSION "Smartphone build 0.4.0"
+#define SMARTFON_VERSION "Smartphone build 0.4.2cvs"
 
 #define SCAN_LOCATION "\\Storage Card"
 
diff --git a/common/engine.h b/common/engine.h
index 0d959bbab7..d6de2d4d32 100644
--- a/common/engine.h
+++ b/common/engine.h
@@ -24,8 +24,8 @@
 #include "scummsys.h"
 #include "system.h"
 
-#define SCUMMVM_VERSION "0.4.1cvs"
-#define SCUMMVM_CVS "2003-05-19"
+#define SCUMMVM_VERSION "0.4.2cvs"
+#define SCUMMVM_CVS "2003-05-25"
 
 class SoundMixer;
 class GameDetector;
diff --git a/scummvm.rc b/scummvm.rc
index dadacc3449..020ec3f74f 100644
--- a/scummvm.rc
+++ b/scummvm.rc
@@ -44,8 +44,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,4,1,0
- PRODUCTVERSION 0,4,1,0
+ FILEVERSION 0,4,2,0
+ PRODUCTVERSION 0,4,2,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -63,14 +63,14 @@ BEGIN
             VALUE "Comments", "Look! A three headed monkey (TM)! .. Nice use of the TM!\0"
             VALUE "CompanyName", "ScummVM Team\0"
             VALUE "FileDescription", "http://www.scummvm.org/\0"
-            VALUE "FileVersion", "0.4.1cvs\0"
+            VALUE "FileVersion", "0.4.2cvs\0"
             VALUE "InternalName", "scummvm\0"
             VALUE "LegalCopyright", "Copyright © 2001-2003 The ScummVM Team\0"
             VALUE "LegalTrademarks", "'SCUMM', and all SCUMM games are a TM of LucasArts. Simon The Sorcerer is a TM of AdventureSoft. Beneath a Steel Sky is TM of Revolution.\0"
             VALUE "OriginalFilename", "scummvm.exe\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "ScummVM\0"
-            VALUE "ProductVersion", "0.4.1cvs\0"
+            VALUE "ProductVersion", "0.4.2cvs\0"
             VALUE "SpecialBuild", "\0"
         END
     END
diff --git a/scummvm.spec b/scummvm.spec
index 73a9a12744..3cf290b834 100644
--- a/scummvm.spec
+++ b/scummvm.spec
@@ -8,7 +8,7 @@
 #   Prologue information
 #------------------------------------------------------------------------------
 Name		: scummvm
-Version		: 0.3.0
+Version		: 0.4.2cvs
 Release		: @RELEASE@
 Summary		: SCUMM graphic adventure game interpreter
 Group		: Interpreters
@@ -56,6 +56,28 @@ rm -Rf %{buildroot}
 #   Change Log
 #------------------------------------------------------------------------------
 %changelog
+* 0.4.1 (2003-05-25)
+  - Added AdvMame3x filter
+  - Fixed crash Curse of Monkey Island (and possibly other games as well)
+  - Fixed airport doors in Zak256
+  - Fixed crash in SDL backend
+  - Fixed various iMuse bugs
+* 0.4.0 (2003-05-11)
+  - Curse of Monkey Island (comi) support (experimental)
+  - Added support for the EGA versions of Loom, Monkey Island and Indy3
+  - Improved music support in Indy3 and the floppy versions of Monkey Islands
+  - Many Simon the Sorcerer 1 & 2 improvements and fixes
+  - Very pre-alpha Beneath a Steel Sky code. Don't expect it to do anything. 
+  - Even more pre-alpha support for V2 SCUMM games (Maniac Mansion and Zak)
+  - Preliminary support for early Humongous Entertainment titles (very experimental)
+  - New debug console and several GUI/Launcher enhancements
+  - New Save/Load code (easier to expand while retaining compatibility)
+  - DreamCast port now works with new games added for 0.3.0b
+  - New official PalmOS port
+  - Various minor and not so minor SCUMM game fixes
+  - Large memory leak fixed for The Dig/ComI
+  - SMUSH code optimised, frame dropping added for slower machines
+  - Code cleanups
 * 0.3.0 (2002-12-01)
   - massive cleanup work for iMUSE. Sam and Max music now plays correctly
   - many bugfixes for Zak256, + sound and music support