From 8017a74bffda477621b09802306ad43ebb8c54bf Mon Sep 17 00:00:00 2001
From: Stevie Strickland <sstrickl@racket-lang.org>
Date: Thu, 11 Sep 2008 22:25:49 +0000
Subject: [PATCH] svn merge -r11641:11640 .

Okay, that was the last (first?) trunk merge, so now I'll merge trunk
"appropriately".

svn: r11656
---
 collects/repos-time-stamp/stamp.ss          | 2 +-
 collects/tests/stepper/run-nightly-tests.ss | 5 +++++
 src/worksp/mred/mred.manifest               | 2 +-
 src/worksp/mred/mred.rc                     | 8 ++++----
 src/worksp/mzcom/mzcom.rc                   | 8 ++++----
 src/worksp/mzcom/mzobj.rgs                  | 6 +++---
 src/worksp/mzscheme/mzscheme.rc             | 8 ++++----
 src/worksp/starters/start.rc                | 8 ++++----
 8 files changed, 26 insertions(+), 21 deletions(-)
 create mode 100644 collects/tests/stepper/run-nightly-tests.ss

diff --git a/collects/repos-time-stamp/stamp.ss b/collects/repos-time-stamp/stamp.ss
index c9d8b64812..c1afd89f4a 100644
--- a/collects/repos-time-stamp/stamp.ss
+++ b/collects/repos-time-stamp/stamp.ss
@@ -1 +1 @@
-#lang scheme/base (provide stamp) (define stamp "11sep2008")
+#lang scheme/base (provide stamp) (define stamp "10sep2008")
diff --git a/collects/tests/stepper/run-nightly-tests.ss b/collects/tests/stepper/run-nightly-tests.ss
new file mode 100644
index 0000000000..468cd45296
--- /dev/null
+++ b/collects/tests/stepper/run-nightly-tests.ss
@@ -0,0 +1,5 @@
+(module run-nightly-tests mzscheme
+  (require "through-tests.ss")
+  
+  (parameterize ([display-only-errors #t])
+    (run-all-tests-except '(prims qq-splice time set! local-set! lazy1 lazy2 lazy3))))
\ No newline at end of file
diff --git a/src/worksp/mred/mred.manifest b/src/worksp/mred/mred.manifest
index 671bf1859d..7e029962c4 100644
--- a/src/worksp/mred/mred.manifest
+++ b/src/worksp/mred/mred.manifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?> 
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> 
 <assemblyIdentity 
-version="4.1.0.3" 
+version="4.1.0.2" 
 processorArchitecture="X86" 
 name="Org.PLT-Scheme.MrEd" 
 type="win32" 
diff --git a/src/worksp/mred/mred.rc b/src/worksp/mred/mred.rc
index 82f879d7e6..5af5b94111 100644
--- a/src/worksp/mred/mred.rc
+++ b/src/worksp/mred/mred.rc
@@ -20,8 +20,8 @@ APPLICATION             ICON    DISCARDABLE     "mred.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,1,0,3
- PRODUCTVERSION 4,1,0,3
+ FILEVERSION 4,1,0,2
+ PRODUCTVERSION 4,1,0,2
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -39,11 +39,11 @@ BEGIN
             VALUE "CompanyName", "PLT Scheme Inc.\0"
             VALUE "FileDescription", "PLT Scheme GUI application\0"
             VALUE "InternalName", "MrEd\0"
-            VALUE "FileVersion", "4, 1, 0, 3\0"
+            VALUE "FileVersion", "4, 1, 0, 2\0"
             VALUE "LegalCopyright", "Copyright © 1995-2008\0"
             VALUE "OriginalFilename", "MrEd.exe\0"
             VALUE "ProductName", "PLT Scheme\0"
-            VALUE "ProductVersion", "4, 1, 0, 3\0"
+            VALUE "ProductVersion", "4, 1, 0, 2\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/worksp/mzcom/mzcom.rc b/src/worksp/mzcom/mzcom.rc
index 9f0497fc13..57255c8a38 100644
--- a/src/worksp/mzcom/mzcom.rc
+++ b/src/worksp/mzcom/mzcom.rc
@@ -53,8 +53,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,1,0,3
- PRODUCTVERSION 4,1,0,3
+ FILEVERSION 4,1,0,2
+ PRODUCTVERSION 4,1,0,2
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -70,12 +70,12 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "MzCOM Module"
-            VALUE "FileVersion", "4, 1, 0, 3"
+            VALUE "FileVersion", "4, 1, 0, 2"
             VALUE "InternalName", "MzCOM"
             VALUE "LegalCopyright", "Copyright 2000-2008 PLT (Paul Steckler)"
             VALUE "OriginalFilename", "MzCOM.EXE"
             VALUE "ProductName", "MzCOM Module"
-            VALUE "ProductVersion", "4, 1, 0, 3"
+            VALUE "ProductVersion", "4, 1, 0, 2"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/worksp/mzcom/mzobj.rgs b/src/worksp/mzcom/mzobj.rgs
index 59e52c5893..fd23f0effe 100644
--- a/src/worksp/mzcom/mzobj.rgs
+++ b/src/worksp/mzcom/mzobj.rgs
@@ -1,19 +1,19 @@
 HKCR
 {
-	MzCOM.MzObj.4.1.0.3 = s 'MzObj Class'
+	MzCOM.MzObj.4.1.0.2 = s 'MzObj Class'
 	{
 		CLSID = s '{A3B0AF9E-2AB0-11D4-B6D2-0060089002FE}'
 	}
 	MzCOM.MzObj = s 'MzObj Class'
 	{
 		CLSID = s '{A3B0AF9E-2AB0-11D4-B6D2-0060089002FE}'
-		CurVer = s 'MzCOM.MzObj.4.1.0.3'
+		CurVer = s 'MzCOM.MzObj.4.1.0.2'
 	}
 	NoRemove CLSID
 	{
 		ForceRemove {A3B0AF9E-2AB0-11D4-B6D2-0060089002FE} = s 'MzObj Class'
 		{
-			ProgID = s 'MzCOM.MzObj.4.1.0.3'
+			ProgID = s 'MzCOM.MzObj.4.1.0.2'
 			VersionIndependentProgID = s 'MzCOM.MzObj'
 			ForceRemove 'Programmable'
 			LocalServer32 = s '%MODULE%'
diff --git a/src/worksp/mzscheme/mzscheme.rc b/src/worksp/mzscheme/mzscheme.rc
index 0dc1125434..30980db574 100644
--- a/src/worksp/mzscheme/mzscheme.rc
+++ b/src/worksp/mzscheme/mzscheme.rc
@@ -29,8 +29,8 @@ APPLICATION             ICON    DISCARDABLE     "mzscheme.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,1,0,3
- PRODUCTVERSION 4,1,0,3
+ FILEVERSION 4,1,0,2
+ PRODUCTVERSION 4,1,0,2
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -48,11 +48,11 @@ BEGIN
             VALUE "CompanyName", "PLT Scheme Inc.\0"
             VALUE "FileDescription", "PLT Scheme application\0"
             VALUE "InternalName", "MzScheme\0"
-            VALUE "FileVersion", "4, 1, 0, 3\0"
+            VALUE "FileVersion", "4, 1, 0, 2\0"
             VALUE "LegalCopyright", "Copyright �© 1995-2008\0"
             VALUE "OriginalFilename", "mzscheme.exe\0"
             VALUE "ProductName", "PLT Scheme\0"
-            VALUE "ProductVersion", "4, 1, 0, 3\0"
+            VALUE "ProductVersion", "4, 1, 0, 2\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/worksp/starters/start.rc b/src/worksp/starters/start.rc
index 7132b22018..e36f5d75fc 100644
--- a/src/worksp/starters/start.rc
+++ b/src/worksp/starters/start.rc
@@ -22,8 +22,8 @@ APPLICATION             ICON    DISCARDABLE     "mzstart.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,1,0,3
- PRODUCTVERSION 4,1,0,3
+ FILEVERSION 4,1,0,2
+ PRODUCTVERSION 4,1,0,2
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -45,7 +45,7 @@ BEGIN
 #ifdef MZSTART
             VALUE "FileDescription", "PLT Scheme Launcher\0"
 #endif
-            VALUE "FileVersion", "4, 1, 0, 3\0"
+            VALUE "FileVersion", "4, 1, 0, 2\0"
 #ifdef MRSTART
             VALUE "InternalName", "mrstart\0"
 #endif
@@ -60,7 +60,7 @@ BEGIN
             VALUE "OriginalFilename", "MzStart.exe\0"
 #endif
             VALUE "ProductName", "PLT Scheme\0"
-            VALUE "ProductVersion", "4, 1, 0, 3\0"
+            VALUE "ProductVersion", "4, 1, 0, 2\0"
         END
     END
     BLOCK "VarFileInfo"