[Winmerge-svn] SF.net SVN: winmerge: [4217] trunk/Web
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
Menu
▾
▴
[Winmerge-svn] SF.net SVN: winmerge: [4217] trunk/Web
|
From: <ge...@us...> - 2007-03-31 14:18:43
|
Revision: 4217
http://svn.sourceforge.net/winmerge/?rev=4217&view=rev
Author: gerundt
Date: 2007-03-31 07:18:39 -0700 (Sat, 31 Mar 2007)
Log Message:
-----------
PATCH: [ 1691700 ] Web: Changes for new stable release 2.6.6
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-03-31 10:07:18 UTC (rev 4216)
+++ trunk/Web/2.6/changes.txt 2007-03-31 14:18:39 UTC (rev 4217)
@@ -1,3 +1,50 @@
+2007-03-29 2.6.6 Stable Release (R4204)
+
+2007-03-19 Kimmo
+ PATCH: [ 1659183 ] Add Vista security attributes to manifest files
+ Src/res: WinMerge.exe.manifest WinMergeU.exe.manifest
+
+2007-03-11 Tim
+ PATCH: [ 1582537 ] CSS syntax highlighter
+ Src: Merge.dsp
+ editlib: ccrystaltextview.cpp ccrystaltextview.h
+ editlib new file: css.cpp
+
+2007-03-07 Takashi
+ PATCH: [ 1675211 ] Fix crash when hiding parent folder item on folder view
+ Src/DirView.cpp
+
+2007-03-04 Kimmo
+ BUG: [ 1664832 ] Typo Error in the Registry
+ ShellExtension: WinMergeShell.rgs
+ Bump ShellExtension version to 1.9.2
+ ShellExtension: ShellExtension.rc
+
+2007-03-04 Tim
+ BUG: [ 1668996 ] Two "Copy Right" buttons in Russian GUI.
+ Src/Languages/Russian: MergeRussian.rc
+
+2007-03-01 Kimmo
+ PATCH: [ 1664689 ] French translation (Update)
+ Submitted by Jean-F Jolin
+ Src/Languages/French: MergeFrench.rc
+
+2007-02-27 Kimmo
+ PATCH: [ 1664689 ] French translation
+ Submitted by Jean-F Jolin
+ Src/Languages/French: MergeFrench.rc
+
+2007-02-10 Kimmo
+ PATCH: [ 1650831 ] Polish translation update for WinMerge 2.6.4
+ Submitted by dr_prozac
+ Src/Languages/Polish: MergePolish.rc
+
+2007-01-30 Kimmo
+ PATCH: [ 1639493 ] Updated Bulgarian language files
+ Submitted by tigertron
+ Src/Languages/Bulgarian: MergeBulgarian.rc
+ Docs/Users/Languages: Readme-Bulgarian.txt
+
2007-01-17 2.6.4 Stable Release (R4067)
2007-01-15 Kimmo
Modified: trunk/Web/2.6/index.php
===================================================================
--- trunk/Web/2.6/index.php 2007-03-31 10:07:18 UTC (rev 4216)
+++ trunk/Web/2.6/index.php 2007-03-31 14:18:39 UTC (rev 4217)
@@ -31,8 +31,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.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
+<p>Just download the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.6-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.6-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-03-31 10:07:18 UTC (rev 4216)
+++ trunk/Web/Changes.txt 2007-03-31 14:18:39 UTC (rev 4217)
@@ -1,3 +1,8 @@
+2007-03-31 Tim
+ PATCH: [ 1691700 ] Web: Changes for new stable release 2.6.6
+ Web: downloads.php index.php page.inc WinMergePAD.xml
+ Web\2.6: changes.txt index.php
+
2007-03-18 Tim
Redirect translations status page to Wiki.
Web: .htaccess
Modified: trunk/Web/WinMergePAD.xml
===================================================================
--- trunk/Web/WinMergePAD.xml 2007-03-31 10:07:18 UTC (rev 4216)
+++ trunk/Web/WinMergePAD.xml 2007-03-31 14:18:39 UTC (rev 4217)
@@ -34,9 +34,9 @@
</Company_Info>
<Program_Info>
<Program_Name>WinMerge</Program_Name>
- <Program_Version>2.6.4</Program_Version>
- <Program_Release_Month>01</Program_Release_Month>
- <Program_Release_Day>17</Program_Release_Day>
+ <Program_Version>2.6.6</Program_Version>
+ <Program_Release_Month>03</Program_Release_Month>
+ <Program_Release_Day>29</Program_Release_Day>
<Program_Release_Year>2007</Program_Release_Year>
<Program_Cost_Dollars>0</Program_Cost_Dollars>
<Program_Cost_Other_Code />
@@ -55,14 +55,14 @@
<Includes_VB_Runtime>N</Includes_VB_Runtime>
<Includes_DirectX>N</Includes_DirectX>
<File_Info>
- <Filename_Versioned>WinMerge-2.6.4-Setup.exe</Filename_Versioned>
- <Filename_Previous>WinMerge-2.6.2-Setup.exe</Filename_Previous>
+ <Filename_Versioned>WinMerge-2.6.6-Setup.exe</Filename_Versioned>
+ <Filename_Previous>WinMerge-2.6.4-Setup.exe</Filename_Previous>
<Filename_Generic>WinMergeSetup.exe</Filename_Generic>
<Filename_Long>WinMergeSetup.exe</Filename_Long>
- <File_Size_Bytes>2981157</File_Size_Bytes>
- <File_Size_K>2911</File_Size_K>
- <File_Size_MB>2.84</File_Size_MB>
+ <File_Size_Bytes>2985028</File_Size_Bytes>
+ <File_Size_K>2915</File_Size_K>
+ <File_Size_MB>2.85</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.4-Setup.exe</Primary_Download_URL>
+ <Primary_Download_URL>http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.6-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-03-31 10:07:18 UTC (rev 4216)
+++ trunk/Web/downloads.php 2007-03-31 14:18:39 UTC (rev 4217)
@@ -5,18 +5,18 @@
$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=479250">WinMerge 2.6.4</a></h3>
+<h3><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248&release_id=497312">WinMerge 2.6.6</a></h3>
<dl>
- <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.4-Setup.exe">Installer</a></dt>
+ <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.6-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.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>
+ <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.6-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.6-exe.zip">.zip</a> and <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.6-exe.7z">.7z</a>).</p></dd>
+ <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.6-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.6-src.zip">.zip</a> and <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.6-src.7z">.7z</a>).</p></dd>
+ <dt><a href="http://prdownloads.sourceforge.net/winmerge/Merge7zInstaller0019-311-444.exe">7-Zip Plugin</a> (DllBuild 0019)</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&release_id=428331">Release Notes</a> or search for <a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=143957">other versions</a>.</p>
+ <p>You can also read the <a href="http://sourceforge.net/project/shownotes.php?group_id=13216&release_id=482019">Release Notes</a> or search for <a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=143957">other versions</a>.</p>
</dd>
</dl>
<?php
Modified: trunk/Web/index.php
===================================================================
--- trunk/Web/index.php 2007-03-31 10:07:18 UTC (rev 4216)
+++ trunk/Web/index.php 2007-03-31 14:18:39 UTC (rev 4217)
@@ -30,13 +30,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.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>WinMerge 2.6.6 - latest stable version</h2>
+<p><a href="2.6/index.php">WinMerge 2.6.6</a> is the latest stable version, and is recommended for most users.</p>
+<p><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.6-Setup.exe">Download WinMerge 2.6.6 Installer</a></p>
<h2>Installation</h2>
-<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
+<p>Just download the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.6.6-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.6-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-03-31 10:07:18 UTC (rev 4216)
+++ trunk/Web/page.inc 2007-03-31 14:18:39 UTC (rev 4217)
@@ -289,7 +289,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=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=11248&release_id=497312\">WinMerge</a> (<a href=\"http://sourceforge.net/project/shownotes.php?release_id=497312\" 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.
|