|
From: <ge...@us...> - 2007-10-17 18:25:11
|
Revision: 4643
http://winmerge.svn.sourceforge.net/winmerge/?rev=4643&view=rev
Author: gerundt
Date: 2007-10-17 11:25:03 -0700 (Wed, 17 Oct 2007)
Log Message:
-----------
PATCH: [ 1814760 ] Web: Changes for new stable release 2.6.12
Modified Paths:
--------------
trunk/Web/2.6/changes.txt
trunk/Web/2.6/index.php
trunk/Web/WinMergePAD.xml
trunk/Web/downloads/index.php
trunk/Web/index.php
trunk/Web/page.inc
Modified: trunk/Web/2.6/changes.txt
===================================================================
--- trunk/Web/2.6/changes.txt 2007-10-17 11:33:50 UTC (rev 4642)
+++ trunk/Web/2.6/changes.txt 2007-10-17 18:25:03 UTC (rev 4643)
@@ -1,3 +1,42 @@
+2007-09-26 2.6.12 Stable Release (R4567)
+
+ Fixed uninstalling bug (BUG: [ 1802179 ] Runtime error on uninstalling 2.6.10)
+ Withdrawn 2.6.10 release due to above bug
+
+2007-09-25 2.6.10 Stable Release (R4561)
+
+2007-09-18 Kimmo
+ BUG: [ 1791351 ] Go To Line Number does not change pane focus.
+ Src: MergeEditView.cpp
+
+2007-09-17 Takashi
+ BUG: [ 1795814 ] When word wrap+scroll to first are on, it fails to scroll
+ Src: MergeDoc.cpp
+
+2007-09-15 Kimmo
+ BUG: [ 1777054 ] Next difference sometimes not seen with Wrap Lines enabled
+ Src: MergeEditView.cpp MergeEditView.h
+ BUG: [ 1787816 ] Bug in File Rename
+ Src: DirActions.cpp
+ BUG: [ 1776487 ] REPLACE dialog, copy highlighted text to FIND fileld
+ Src/editlib: ccrystaleditview.cpp
+
+2007-08-22 Tim
+ PATCH: [ 1743623 ] ChineseSimplified language .rc file for trunk rev.4317
+ Src/Languages/ChineseSimplified: MergeChineseSimplified.rc
+
+2007-08-22 Takashi
+ BUG: [ 1759793 ] Filter test dialog problem with directory filters
+ Src: TestFilterDlg.cpp
+
+2007-08-12 Tim
+ PATCH: [ 1772028 ] Russian translation update (from WinMergeMod)
+ Src/Languages/Russian: MergeRussian.rc
+
+2007-07-13 Kimmo
+ Add Alberto Kalb to contributors list
+ Docs/Users: Contributors.txt
+
2007-06-19 2.6.8 Stable Release (R4343)
2007-06-17 Tim
Modified: trunk/Web/2.6/index.php
===================================================================
--- trunk/Web/2.6/index.php 2007-10-17 11:33:50 UTC (rev 4642)
+++ trunk/Web/2.6/index.php 2007-10-17 18:25:03 UTC (rev 4643)
@@ -32,8 +32,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.8-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.8-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.12-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.12-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/WinMergePAD.xml
===================================================================
--- trunk/Web/WinMergePAD.xml 2007-10-17 11:33:50 UTC (rev 4642)
+++ trunk/Web/WinMergePAD.xml 2007-10-17 18:25:03 UTC (rev 4643)
@@ -34,9 +34,9 @@
</Company_Info>
<Program_Info>
<Program_Name>WinMerge</Program_Name>
- <Program_Version>2.6.8</Program_Version>
- <Program_Release_Month>06</Program_Release_Month>
- <Program_Release_Day>19</Program_Release_Day>
+ <Program_Version>2.6.12</Program_Version>
+ <Program_Release_Month>09</Program_Release_Month>
+ <Program_Release_Day>26</Program_Release_Day>
<Program_Release_Year>2007</Program_Release_Year>
<Program_Cost_Dollars>0</Program_Cost_Dollars>
<Program_Cost_Other_Code />
@@ -45,7 +45,7 @@
<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>
+ <Program_Language>English,ChineseSimplified,ChineseTraditional,Czech,Danish,French,German,Hungarian,Italian,Japanese,Korean,Polish,PortugueseBrazilian,Romanian,Russian,Spanish,Swedish,Turkish</Program_Language>
<Program_Change_Info />
<Program_Specific_Category>Utilities</Program_Specific_Category>
<Program_Category_Class>System Utilities::Other</Program_Category_Class>
@@ -55,14 +55,14 @@
<Includes_VB_Runtime>N</Includes_VB_Runtime>
<Includes_DirectX>N</Includes_DirectX>
<File_Info>
- <Filename_Versioned>WinMerge-2.6.8-Setup.exe</Filename_Versioned>
- <Filename_Previous>WinMerge-2.6.6-Setup.exe</Filename_Previous>
+ <Filename_Versioned>WinMerge-2.6.12-Setup.exe</Filename_Versioned>
+ <Filename_Previous>WinMerge-2.6.8-Setup.exe</Filename_Previous>
<Filename_Generic>WinMergeSetup.exe</Filename_Generic>
<Filename_Long>WinMergeSetup.exe</Filename_Long>
- <File_Size_Bytes>3023263</File_Size_Bytes>
- <File_Size_K>2952</File_Size_K>
- <File_Size_MB>2.88</File_Size_MB>
+ <File_Size_Bytes>3025610</File_Size_Bytes>
+ <File_Size_K>2955</File_Size_K>
+ <File_Size_MB>2.89</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.8-Setup.exe</Primary_Download_URL>
+ <Primary_Download_URL>http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.12-Setup.exe</Primary_Download_URL>
<Secondary_Download_URL />
<Additional_Download_URL_1 />
<Additional_Download_URL_2 />
Modified: trunk/Web/downloads/index.php
===================================================================
--- trunk/Web/downloads/index.php 2007-10-17 11:33:50 UTC (rev 4642)
+++ trunk/Web/downloads/index.php 2007-10-17 18:25:03 UTC (rev 4643)
@@ -8,7 +8,7 @@
<h2>Downloads</h2>
<?php $page->printDownloadNow(); ?>
<h3>Current Version</h3>
-<p>The current version is <strong>2.6.8</strong> and was released at <strong>2007-06-19</strong>. For detailed info on what's new, read the <a href="/2.6/changes.php">changelog</a> and the <a href="http://sourceforge.net/project/shownotes.php?release_id=517309">release notes</a>.</p>
+<p>The current version is <strong>2.6.12</strong> and was released at <strong>2007-09-26</strong>. For detailed info on what's new, read the <a href="/2.6/changes.php">changelog</a> and the <a href="http://sourceforge.net/project/shownotes.php?release_id=542344">release notes</a>.</p>
<div class="downloadmatrix">
<ul>
<li><strong>Installer</strong>
@@ -18,20 +18,20 @@
</li>
<li><strong>Binaries</strong>
<ul>
- <li><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.8-exe.zip">Zip-Format (5.18 MB)</a></li>
- <li><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.8-exe.7z">7z-Format (1.67 MB)</a></li>
+ <li><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.12-exe.zip">Zip-Format (5.18 MB)</a></li>
+ <li><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.12-exe.7z">7z-Format (1.68 MB)</a></li>
</ul>
</li>
<li><strong>Runtimes</strong>
<ul>
- <li><a href="http://prdownloads.sourceforge.net/winmerge/Runtimes-2.6.8.zip">Zip-Format (1.23 MB)</a></li>
- <li><a href="http://prdownloads.sourceforge.net/winmerge/Runtimes-2.6.8.7z">7z-Format (0.72 MB)</a></li>
+ <li><a href="http://prdownloads.sourceforge.net/winmerge/Runtimes-2.6.12.zip">Zip-Format (1.23 MB)</a></li>
+ <li><a href="http://prdownloads.sourceforge.net/winmerge/Runtimes-2.6.12.7z">7z-Format (0.72 MB)</a></li>
</ul>
</li>
<li><strong>Source Code</strong>
<ul>
- <li><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.8-src.zip">Zip-Format (5.06 MB)</a></li>
- <li><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.8-src.7z">7z-Format (2.78 MB)</a></li>
+ <li><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.12-src.zip">Zip-Format (5.06 MB)</a></li>
+ <li><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.12-src.7z">7z-Format (2.79 MB)</a></li>
</ul>
</li>
</ul>
Modified: trunk/Web/index.php
===================================================================
--- trunk/Web/index.php 2007-10-17 11:33:50 UTC (rev 4642)
+++ trunk/Web/index.php 2007-10-17 18:25:03 UTC (rev 4643)
@@ -31,13 +31,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.8 - latest stable version</h2>
-<p><a href="2.6/index.php">WinMerge 2.6.8</a> is the latest stable version, and is recommended for most users.</p>
-<p><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.8-Setup.exe">Download WinMerge 2.6.8 Installer</a></p>
+<h2>WinMerge 2.6.12 - latest stable version</h2>
+<p><a href="2.6/index.php">WinMerge 2.6.12</a> is the latest stable version, and is recommended for most users.</p>
+<p><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.12-Setup.exe">Download WinMerge 2.6.12 Installer</a></p>
<h2>Installation</h2>
-<p>Just download the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.8-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.8-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.12-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.12-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-10-17 11:33:50 UTC (rev 4642)
+++ trunk/Web/page.inc 2007-10-17 18:25:03 UTC (rev 4643)
@@ -40,9 +40,9 @@
$this->_tab = WINMERGE_2_6;
/* _Stable Release */
$this->_stablerelease = new Release;
- $this->_stablerelease->setVersionNumber('2.6.8');
- $this->_stablerelease->setSetupDownload('http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.8-Setup.exe');
- $this->_stablerelease->setSetupSize(3023263);
+ $this->_stablerelease->setVersionNumber('2.6.12');
+ $this->_stablerelease->setSetupDownload('http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.12-Setup.exe');
+ $this->_stablerelease->setSetupSize(3025610);
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
