PATCH: [ 1353472 ] Website changes for new stable release 2.4.2

diff --git a/Web/2.4/changes.txt b/Web/2.4/changes.txt
index acfe226..df5de1d 100644 (file)
--- a/Web/2.4/changes.txt
+++ b/Web/2.4/changes.txt
@@ -1,3 +1,108 @@
+2005-11-10 2.4.2 Stable Release
+
+2005-11-10 Kimmo
+ Bump ShellExtension version number to 1.6.2
+  ShellExtension: ShellExtension.rc
+
+2005-11-08 Kimmo
+ Merge Perry's fix for OpenDlg/SelectFile() to Merge.cpp/SelectFile() (PATCH #1348733)
+  Src: Merge.cpp
+ PATCH: [ 1350489 ] Use SelectFile() for external editor selection
+  Src: PropRegistry.cpp
+ PATCH: [ 1350696 ] Remove Window/Close All menuitem from 2.4 branch
+  Src: MainFrm.cpp
+
+2005-11-07 Kimmo
+ BUG: [ 1341243 ] Current Find string is too fragile
+  Was resetting find string after rescanning
+  Src/editlib: ccrystaltextview.cpp
+
+2005-11-06 Jochen
+ PATCH: [ 1327413 ] Fix bug in CDirDoc::AllowUpwardDirectory()
+  Src: DirActions.cpp DirDoc.cpp DirView.cpp
+
+2005-11-05 Perry
+ PATCH: [ 1334484 ] Skip location view paint if buffer not initialized
+  Src: LocationView.cpp MergeDoc.cpp MergeDoc.h
+   MergeEditView.cpp MergeEditView.h
+ PATCH: [ 1348733 ] Fix open dialog for cvs version 2.4
+  Src: OpenDlg.cpp
+
+2005-11-04 Perry
+ PATCH: [ 1335072 ] Add text to Plugins.txt to cover DisplayXMLFiles
+  Plugins/dlls: Plugins.txt
+
+2005-11-04 Kimmo
+ RFE: [ 1324314 ] CTRL+W to close current diff
+  Src: Merge.rc
+  Src/Languages: *.rc
+ PATCH: [ 1342550 ] Modernize file selection dialog
+ PATCH: [ 1345110 ] Properly compare projectfile extension
+  Src: Merge.cpp Merge.h OpenDlg.cpp
+
+2005-11-02 Tim
+ PATCH: [ 1345382 ] Translated Shell Extension to German
+  ShellExtension/Languages: ShellExtensionGerman.rc
+
+2005-11-01 Kimmo
+ PATCH: [ 1342871 ] Disable Copy Filenames for folders
+  Src: DirView.cpp DirView.h
+
+2005-10-30 Kimmo
+ PATCH: [ 1341813 ] VSS project linking misdetects project files
+  Src: VSSHelper.cpp
+
+2005-10-29 Kimmo
+ PATCH: [ 1341183 ] Fix VSS checkout canceling
+  Src: DirActions.cpp MainFrm.cpp
+ PATCH: [ 1333545 ] Small improvement to Open-dialog folder selection
+  Src: OpenDlg.cpp
+
+2005-10-23 Kimmo
+ PATCH: [ 1333581 ] Increase quick compare limit and make it option
+  Src: DiffContext.h DiffWrapper.cpp DirDoc.cpp OptionsDef.h OptionsInit.cpp
+
+2005-10-20 Kimmo
+ BUG: [ 1326621 ] Extention ".WinMerge" is omitted
+  Src: OpenDlg.cpp
+
+2005-10-19 Kimmo
+ PATCH: [ 1329951 ] Readme.txt points to version 2.2 manual
+  Docs/Users: ReadMe.txt
+  Docs/Users/Languages: ReadMe-Catalan.txt ReadMe-Swedish.txt
+
+2005-10-18 Tim
+ PATCH: [ 1330059 ] Translated 3 missing sentences to German
+  Src/Languages/German: MergeGerman.rc
+
+2005-10-15 Perry
+ PATCH: [ 1326813 ] Fix binary detection to allow archives
+  Src: DirView.cpp
+
+2005-10-12 Kimmo
+ PATCH: [ 1323107 ] Patch for crash on save filenames with different cases
+  From anonymous submitter
+  Src: DirDcoc.cpp
+
+2005-10-08 Kimmo
+ BUG: [ 1309450 ] All files in directory are scanned regardless of Filter
+  Src: DirScan.cpp
+
+2005-10-05 Perry
+ PATCH: [ 1242008 ] Update status to binary if open fails because binary
+  Follow on for 2nd case
+ Src: DirView.cpp MergeDoc.cpp
+
+2005-10-03 Kimmo
+ PATCH: [ 1310214 ] Shell extension italian translation
+  Submitted by Andrea Decorte
+  ShellExtension/Languages: ShellExtensionItalian.rc
+
+2005-09-30 Tim
+ PATCH: [ 1309423 ] Small typo in MergeSwedish.rc
+  Submitted by Hans Eriksson
+  Src/Languages/Swedish: MergeSwedish.rc
+
 2005-09-29 2.4.0 Stable Release
 
 2005-09-29 Kimmo

diff --git a/Web/2.4/index.php b/Web/2.4/index.php
index 754fa11..f4ed0e3 100644 (file)
--- a/Web/2.4/index.php
+++ b/Web/2.4/index.php
@@ -29,14 +29,14 @@
 <p>See the <a href="screenshots.php">screenshots page</a> for more screenshots.</p>
 
 <h2>Installation</h2>
-<p>Just download the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.0-Setup.exe">installer</a> and double-click it.</p>
-<p>Or you may simply unzip the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.0-exe.zip">binary zip package</a> into the desired location, and run
+<p>Just download the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.2-Setup.exe">installer</a> and double-click it.</p>
+<p>Or you may simply unzip the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.2-exe.zip">binary zip package</a> into the desired location, and run
 <code>WinMerge.exe</code> or <code>WinMergeU.exe</code> (the latter is the Unicode version, only for use on NT/2000/XP).</p>
 <p>For more details please look at the <a href="manual/installing.html">Installation section</a> from the <a href="manual/index.html">Manual</a>.</p>
 
 <h2>Using WinMerge</h2>
 <p>You can use the <a href="manual/index.html">online Manual</a>, or you can
-<a href="http://sourceforge.net/project/showfiles.php?group_id=13216&amp;package_id=11254&amp;release_id=360005">download</a> a copy.</p>
+<a href="http://sourceforge.net/project/showfiles.php?group_id=13216&amp;package_id=11254&amp;release_id=369986">download</a> a copy.</p>
 
 <h2>Support</h2>
 <p>WinMerge is an Open Source project, that is covered

diff --git a/Web/WinMergePAD.xml b/Web/WinMergePAD.xml
index b1595a0..52131cb 100644 (file)
--- a/Web/WinMergePAD.xml
+++ b/Web/WinMergePAD.xml
@@ -34,15 +34,15 @@
        </Company_Info>
        <Program_Info>
                <Program_Name>WinMerge</Program_Name>
-               <Program_Version>2.4.0</Program_Version>
-               <Program_Release_Month>09</Program_Release_Month>
-               <Program_Release_Day>29</Program_Release_Day>
+               <Program_Version>2.4.2</Program_Version>
+               <Program_Release_Month>11</Program_Release_Month>
+               <Program_Release_Day>10</Program_Release_Day>
                <Program_Release_Year>2005</Program_Release_Year>
                <Program_Cost_Dollars>0</Program_Cost_Dollars>
                <Program_Cost_Other_Code />
                <Program_Cost_Other />
                <Program_Type>Freeware</Program_Type>
-               <Program_Release_Status>Major Update</Program_Release_Status>
+               <Program_Release_Status>Minor Update</Program_Release_Status>
                <Program_Install_Support>Install and Uninstall</Program_Install_Support>
                <Program_OS_Support>Win95,Win98,WinME,WinNT 4.x,Windows2000,WinXP</Program_OS_Support>
                <Program_Language>English,ChineseSimplified,ChineseTraditional,Czech,Danish,French,German,Hungarian,Italian,Japanese,Korean,Polish,Portuguese,Romanian,Russian,Spanish,Swedish,Turkish</Program_Language>
@@ -55,12 +55,12 @@
                <Includes_VB_Runtime>N</Includes_VB_Runtime>
                <Includes_DirectX>N</Includes_DirectX>
                <File_Info>
-                       <Filename_Versioned>WinMerge-2.4.0-Setup.exe</Filename_Versioned>
-                       <Filename_Previous>WinMerge-2.2.4-Setup.exe</Filename_Previous>
+                       <Filename_Versioned>WinMerge-2.4.2-Setup.exe</Filename_Versioned>
+                       <Filename_Previous>WinMerge-2.4.0-Setup.exe</Filename_Previous>
                        <Filename_Generic>WinMergeSetup.exe</Filename_Generic>
                        <Filename_Long>WinMergeSetup.exe</Filename_Long>
-                       <File_Size_Bytes>2503917</File_Size_Bytes>
-                       <File_Size_K>2445</File_Size_K>
+                       <File_Size_Bytes>2509359</File_Size_Bytes>
+                       <File_Size_K>2451</File_Size_K>
                        <File_Size_MB>2.39</File_Size_MB>
                </File_Info>
                <Expire_Info>
@@ -92,7 +92,7 @@
                        <Application_XML_File_URL>http://winmerge.org/WinMergePAD.xml</Application_XML_File_URL>
                </Application_URLs>
                <Download_URLs>
-                       <Primary_Download_URL>http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.0-Setup.exe</Primary_Download_URL>
+                       <Primary_Download_URL>http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.2-Setup.exe</Primary_Download_URL>
                        <Secondary_Download_URL />
                        <Additional_Download_URL_1 />
                        <Additional_Download_URL_2 />

diff --git a/Web/downloads.php b/Web/downloads.php
index 0250b1d..58a39bf 100644 (file)
--- a/Web/downloads.php
+++ b/Web/downloads.php
@@ -5,21 +5,21 @@
   $page->printHead('WinMerge: Downloads', WINMERGE_USR);
 ?>
 <h2>Downloads</h2>
-<h3><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&amp;package_id=11248&amp;release_id=360001">WinMerge 2.4.0</a></h3>
+<h3><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&amp;package_id=11248&amp;release_id=369981">WinMerge 2.4.2</a></h3>
 <dl>
-  <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.0-Setup.exe">Installer</a></dt>
+  <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.2-Setup.exe">Installer</a></dt>
   <dd><p>The easiest way to install WinMerge is to download and run this installer. Read <a href="2.4/manual/installing.html">online manual</a> for help using it.</p></dd>
-  <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.0-exe.zip">Binaries</a></dt>
-  <dd><p>WinMerge binaries are also available in archive files (<a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.0-exe.zip">.zip</a> and <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.0-exe.7z">.7z</a>).</p></dd>
-  <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.0-src.zip">Source code</a></dt>
-  <dd><p>Source code is available in archive files (<a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.0-src.zip">.zip</a> and <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.0-src.7z">.7z</a>).</p></dd>
-  <dt><a href="http://prdownloads.sourceforge.net/winmerge/Merge7zInstaller0014-311-426.exe">7-Zip Plugin</a> (DllBuild 0014)</dt>
+  <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.2-exe.zip">Binaries</a></dt>
+  <dd><p>WinMerge binaries are also available in archive files (<a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.2-exe.zip">.zip</a> and <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.2-exe.7z">.7z</a>).</p></dd>
+  <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.2-src.zip">Source code</a></dt>
+  <dd><p>Source code is available in archive files (<a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.2-src.zip">.zip</a> and <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.2-src.7z">.7z</a>).</p></dd>
+  <dt><a href="http://prdownloads.sourceforge.net/winmerge/Merge7z0016-311-429.7z">7-Zip Plugin</a> (DllBuild 0016)</dt>
   <dd>
     <p>This is the 7-Zip plugin for WinMerge.</p>
-    <p>You can also read the <a href="http://sourceforge.net/project/shownotes.php?group_id=13216&amp;release_id=351569">Release Notes</a> or search for <a href="http://sourceforge.net/project/showfiles.php?group_id=13216&amp;package_id=143957">other versions</a>.</p>
+    <p>You can also read the <a href="http://sourceforge.net/project/shownotes.php?group_id=13216&amp;release_id=361995">Release Notes</a> or search for <a href="http://sourceforge.net/project/showfiles.php?group_id=13216&amp;package_id=143957">other versions</a>.</p>
   </dd>
-  <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.0-manual.zip">Manual</a></dt>
-  <dd><p>This is the offline version from our Manual in archive files (<a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.0-manual.zip">.zip</a> and <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.0-manual.7z">.7z</a>).</p></dd>
+  <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.2-manual.zip">Manual</a></dt>
+  <dd><p>This is the offline version from our Manual in archive files (<a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.2-manual.zip">.zip</a> and <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.2-manual.7z">.7z</a>).</p></dd>
 </dl>
 <?php
   $page->printFoot();

diff --git a/Web/index.php b/Web/index.php
index 381968b..c690cb5 100644 (file)
--- a/Web/index.php
+++ b/Web/index.php
@@ -28,9 +28,9 @@
 <p><img src="2.4/images/screenshot.gif" alt="Screenshot of WinMerge"></p>
 <p>See the <a href="2.4/screenshots.php">screenshots page</a> for more screenshots.</p>
 
-<h2>WinMerge 2.4.0 - latest stable version</h2>
-<p><a href="2.4/index.php">WinMerge 2.4.0</a> is the latest stable version, and it is recommended for most users.</p>
-<p><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.0-Setup.exe">Download WinMerge 2.4.0 Installer</a></p>
+<h2>WinMerge 2.4.2 - latest stable version</h2>
+<p><a href="2.4/index.php">WinMerge 2.4.2</a> is the latest stable version, and it is recommended for most users.</p>
+<p><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.2-Setup.exe">Download WinMerge 2.4.2 Installer</a></p>
 
 <h2>WinMerge 2.2.4 - older stable version</h2>
 <p><a href="2.2/index.php">WinMerge 2.2.4</a> is an older version.</p>
@@ -47,8 +47,8 @@
 -->
 
 <h2>Installation</h2>
-<p>Just download the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.0-Setup.exe">installer</a> and double-click it.</p>
-<p>Or you may simply unzip the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.0-exe.zip">binary zip package</a> into the desired location, and run
+<p>Just download the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.2-Setup.exe">installer</a> and double-click it.</p>
+<p>Or you may simply unzip the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.2-exe.zip">binary zip package</a> into the desired location, and run
 <code>WinMerge.exe</code> or <code>WinMergeU.exe</code> (the latter is the Unicode version, only for use on NT/2000/XP).</p>
 <p>For more details please look at the <a href="2.4/manual/installing.html">Installation section</a> from the <a href="2.4/manual/index.html">Manual</a>.</p>
 

diff --git a/Web/page.inc b/Web/page.inc
index 925a441..a84c426 100644 (file)
--- a/Web/page.inc
+++ b/Web/page.inc
@@ -218,9 +218,9 @@
           $temp .= "<ul>\n";
           $temp .= "  <li><a href=\"/downloads.php\">Downloads</a>\n";
           $temp .= "    <ul>\n";
-          $temp .= "      <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&amp;package_id=11248&amp;release_id=360001\">WinMerge</a> (<a href=\"http://sourceforge.net/project/shownotes.php?release_id=360001\" title=\"Release Notes\">Notes</a>)</li>\n";
+          $temp .= "      <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&amp;package_id=11248&amp;release_id=369981\">WinMerge</a> (<a href=\"http://sourceforge.net/project/shownotes.php?release_id=369981\" title=\"Release Notes\">Notes</a>)</li>\n";
           $temp .= "      <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&amp;package_id=143957\">7-Zip Plugin</a></li>\n";
-          $temp .= "      <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&amp;package_id=11254&amp;release_id=360005\">Documentation</a></li>\n";
+          $temp .= "      <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&amp;package_id=11254&amp;release_id=369986\">Documentation</a></li>\n";
           $temp .= "    </ul>\n";
           $temp .= "  </li>\n";
           $temp .= "</ul>\n";

diff --git a/Web/readme.txt b/Web/readme.txt
index bfe0bc1..0eb04ed 100644 (file)
--- a/Web/readme.txt
+++ b/Web/readme.txt
@@ -1,3 +1,8 @@
+2005-11-12 Tim
+ PATCH: [ 1353472 ] Website changes for new stable release 2.4.2
+  Web: downloads.php index.php page.inc WinMergePAD.xml
+  Web\2.4: changes.txt index.php
+
 2005-10-24 Tim
  PATCH: [Web] Updated translation instructions
   Web\developer\l10n: instructions.php