|
From: <ge...@us...> - 2007-01-18 22:52:27
|
Revision: 4070
http://svn.sourceforge.net/winmerge/?rev=4070&view=rev
Author: gerundt
Date: 2007-01-18 14:52:23 -0800 (Thu, 18 Jan 2007)
Log Message:
-----------
PATCH: [ 1638998 ] Web: Changes for new stable release 2.6.4
Modified Paths:
--------------
trunk/Web/2.6/changes.txt
trunk/Web/2.6/index.php
trunk/Web/Changes.txt
trunk/Web/WinMergePAD.xml
trunk/Web/downloads.php
trunk/Web/index.php
trunk/Web/page.inc
Modified: trunk/Web/2.6/changes.txt
===================================================================
--- trunk/Web/2.6/changes.txt 2007-01-18 18:35:26 UTC (rev 4069)
+++ trunk/Web/2.6/changes.txt 2007-01-18 22:52:23 UTC (rev 4070)
@@ -1,3 +1,63 @@
+2007-01-17 2.6.4 Stable Release (R4067)
+
+2007-01-15 Kimmo
+ Revert regexp uppercasing patches as they seem to cause different problems
+ Backs out patches: bug #1616838 Directory filter broken?
+ patch #1607343 Fix filefilter regexp uppercasing for 2.6 branch
+ PATCH: [ 1620076 ] Add Bazaar and Mercurial to SourceControl.flt
+ Submitted by Ren\xE9 Leonhardt
+ Filters: SourceControl.flt
+ Add Ren\xE9 Leonhardt to Contributors.txt
+ Docs/Users: Contributors.txt
+
+2007-01-14 Kimmo
+ Update manual URL point to 2.6 version manual in readme.txt
+ Docs/Users/ReadMe.txt
+ Docs/Users/Languages/ReadMe-*.txt
+
+2007-01-12 Takashi
+ BUG: [ 1603061 ] "Copy Left/Right To .." doesn't work correctly(2)
+ Src: FileActionScript.cpp DirActions.cpp
+
+2007-01-12 Gal
+ BUG: [ 1597939 ] Rename Edits Wrong Field in Folder Compare List
+ Src: DirView.cpp
+
+2007-01-12 Gal
+ PATCH: [ 1633194 ] Add editor tab setting to configuration log
+ Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
+
+2007-01-11 Kimmo
+ BUG: [ 1616838 ] Directory filter broken?
+ Src: FileFilterMgr.cpp
+
+2007-01-11 Gal
+ BUG: [ 1602313 ] WinMerge stays in tasklist after closing
+ Src: MainFrm.cpp MainFrm.h
+ Add Fanny Ricour to contributors list
+ Docs/Users: Contributors.txt
+
+2007-01-10 Takashi
+ BUG: [ 1631613 ] WinMerge crashes when editing code files
+ Src/editlib: ccrystaleditview.cpp
+
+2007-01-10 Takashi
+ BUG: [ 1630630 ] Unexpected selection of text after changing pane
+ Src: MergeEditView.cpp
+
+2007-01-10 Gal
+ PATCH: [ 1631215 ] Remove used files
+ Src: Merge.dsp
+ Src/Common deleted: listvwex.cpp listvwex.h
+
+2006-12-20 Kimmo
+ BUG: [ 1619689 ] Filefilter: ASP.NET Devel
+ Filters: ASPNET.flt
+
+2006-12-18 Kimmo
+ BUG: [ 1602219 ] Crappy save of project files
+ Src: MainFrm.cpp ProjectFilePathsDlg.cpp
+
2006-12-14 2.6.2 Stable Release (R3963)
2006-12-12 Kimmo
Modified: trunk/Web/2.6/index.php
===================================================================
--- trunk/Web/2.6/index.php 2007-01-18 18:35:26 UTC (rev 4069)
+++ trunk/Web/2.6/index.php 2007-01-18 22:52:23 UTC (rev 4070)
@@ -30,8 +30,8 @@
<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.6.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.6.2-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.6.4-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.6.4-exe.zip">binary zip package</a> into the desired location, and run
<code>WinMergeU.exe</code> (except for Windows 98/ME users who should use <code>WinMerge.exe</code>).</p>
<p>For more information, please see the <a href="manual/Installing.html">Installation section</a> of the <a href="manual/index.html">Manual</a>.</p>
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2007-01-18 18:35:26 UTC (rev 4069)
+++ trunk/Web/Changes.txt 2007-01-18 22:52:23 UTC (rev 4070)
@@ -1,3 +1,8 @@
+2007-01-18 Tim
+ PATCH: [ 1638998 ] Web: Changes for new stable release 2.6.4
+ Web: downloads.php index.php page.inc WinMergePAD.xml
+ Web\2.6: changes.txt index.php
+
2006-12-23 Tim
Fix two invalid links.
Web\2.2: downloads.php
Modified: trunk/Web/WinMergePAD.xml
===================================================================
--- trunk/Web/WinMergePAD.xml 2007-01-18 18:35:26 UTC (rev 4069)
+++ trunk/Web/WinMergePAD.xml 2007-01-18 22:52:23 UTC (rev 4070)
@@ -34,10 +34,10 @@
</Company_Info>
<Program_Info>
<Program_Name>WinMerge</Program_Name>
- <Program_Version>2.6.2</Program_Version>
- <Program_Release_Month>12</Program_Release_Month>
- <Program_Release_Day>14</Program_Release_Day>
- <Program_Release_Year>2006</Program_Release_Year>
+ <Program_Version>2.6.4</Program_Version>
+ <Program_Release_Month>01</Program_Release_Month>
+ <Program_Release_Day>17</Program_Release_Day>
+ <Program_Release_Year>2007</Program_Release_Year>
<Program_Cost_Dollars>0</Program_Cost_Dollars>
<Program_Cost_Other_Code />
<Program_Cost_Other />
@@ -55,14 +55,14 @@
<Includes_VB_Runtime>N</Includes_VB_Runtime>
<Includes_DirectX>N</Includes_DirectX>
<File_Info>
- <Filename_Versioned>WinMerge-2.6.2-Setup.exe</Filename_Versioned>
- <Filename_Previous>WinMerge-2.6.0-Setup.exe</Filename_Previous>
+ <Filename_Versioned>WinMerge-2.6.4-Setup.exe</Filename_Versioned>
+ <Filename_Previous>WinMerge-2.6.2-Setup.exe</Filename_Previous>
<Filename_Generic>WinMergeSetup.exe</Filename_Generic>
<Filename_Long>WinMergeSetup.exe</Filename_Long>
- <File_Size_Bytes>2965401</File_Size_Bytes>
- <File_Size_K>2896</File_Size_K>
- <File_Size_MB>2.83</File_Size_MB>
+ <File_Size_Bytes>2981157</File_Size_Bytes>
+ <File_Size_K>2911</File_Size_K>
+ <File_Size_MB>2.84</File_Size_MB>
</File_Info>
<Expire_Info>
<Has_Expire_Info>N</Has_Expire_Info>
@@ -93,7 +93,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.6.2-Setup.exe</Primary_Download_URL>
+ <Primary_Download_URL>http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.4-Setup.exe</Primary_Download_URL>
<Secondary_Download_URL />
<Additional_Download_URL_1 />
<Additional_Download_URL_2 />
Modified: trunk/Web/downloads.php
===================================================================
--- trunk/Web/downloads.php 2007-01-18 18:35:26 UTC (rev 4069)
+++ trunk/Web/downloads.php 2007-01-18 22:52:23 UTC (rev 4070)
@@ -5,14 +5,14 @@
$page->printHead('WinMerge: Downloads', WINMERGE_USR);
?>
<h2>Downloads</h2>
-<h3><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248&release_id=471214">WinMerge 2.6.2</a></h3>
+<h3><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248&release_id=479250">WinMerge 2.6.4</a></h3>
<dl>
- <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.2-Setup.exe">Installer</a></dt>
+ <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.4-Setup.exe">Installer</a></dt>
<dd><p>The easiest way to install WinMerge is to download and run this installer. Read the <a href="2.6/manual/Installing.html">online manual</a> for help using it.</p></dd>
- <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.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.6.2-exe.zip">.zip</a> and <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.2-exe.7z">.7z</a>).</p></dd>
- <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.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.6.2-src.zip">.zip</a> and <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.2-src.7z">.7z</a>).</p></dd>
+ <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.4-exe.zip">Binaries</a></dt>
+ <dd><p>WinMerge binaries are also available in archive files (<a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.4-exe.zip">.zip</a> and <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.4-exe.7z">.7z</a>).</p></dd>
+ <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.4-src.zip">Source code</a></dt>
+ <dd><p>Source code is available in archive files (<a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.4-src.zip">.zip</a> and <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.4-src.7z">.7z</a>).</p></dd>
<dt><a href="http://prdownloads.sourceforge.net/winmerge/Merge7zInstaller0018-311-442.exe ">7-Zip Plugin</a> (DllBuild 0018)</dt>
<dd>
<p>This is the 7-Zip plugin for WinMerge.</p>
Modified: trunk/Web/index.php
===================================================================
--- trunk/Web/index.php 2007-01-18 18:35:26 UTC (rev 4069)
+++ trunk/Web/index.php 2007-01-18 22:52:23 UTC (rev 4070)
@@ -29,13 +29,13 @@
<a href="2.6/images/foldercmp.png" target="_blank"><img class="thumbnail" src="2.6/images/foldercmp_small.png" alt="Folder Comparison Results" border="0"></a></p>
<p>See the <a href="2.6/screenshots.php">screenshots page</a> for more screenshots.</p>
-<h2>WinMerge 2.6.2 - latest stable version</h2>
-<p><a href="2.6/index.php">WinMerge 2.6.2</a> is the latest stable version, and is recommended for most users.</p>
-<p><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.2-Setup.exe">Download WinMerge 2.6.2 Installer</a></p>
+<h2>WinMerge 2.6.4 - latest stable version</h2>
+<p><a href="2.6/index.php">WinMerge 2.6.4</a> is the latest stable version, and is recommended for most users.</p>
+<p><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.4-Setup.exe">Download WinMerge 2.6.4 Installer</a></p>
<h2>Installation</h2>
-<p>Just download the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.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.6.2-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.6.4-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.6.4-exe.zip">binary zip package</a> into the desired location, and run
<code>WinMergeU.exe</code> (except for Windows 98/ME users who should use <code>WinMerge.exe</code>).</p>
<p>For more information, please see the <a href="2.6/manual/Installing.html">Installation section</a> of the <a href="2.6/manual/index.html">Manual</a>.</p>
Modified: trunk/Web/page.inc
===================================================================
--- trunk/Web/page.inc 2007-01-18 18:35:26 UTC (rev 4069)
+++ trunk/Web/page.inc 2007-01-18 22:52:23 UTC (rev 4070)
@@ -272,7 +272,7 @@
$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&package_id=11248&release_id=471214\">WinMerge</a> (<a href=\"http://sourceforge.net/project/shownotes.php?release_id=471214\" title=\"Release Notes\">Notes</a>)</li>\n";
+ $temp .= " <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248&release_id=479250\">WinMerge</a> (<a href=\"http://sourceforge.net/project/shownotes.php?release_id=479250\" title=\"Release Notes\">Notes</a>)</li>\n";
$temp .= " <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=143957\">7-Zip Plugin</a></li>\n";
$temp .= " </ul>\n";
$temp .= " </li>\n";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
