You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(148) |
Oct
(84) |
Nov
(130) |
Dec
(121) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(89) |
Feb
(50) |
Mar
(81) |
Apr
(45) |
May
(42) |
Jun
(46) |
Jul
(40) |
Aug
(98) |
Sep
(80) |
Oct
(101) |
Nov
(128) |
Dec
(46) |
| 2008 |
Jan
(132) |
Feb
(117) |
Mar
(118) |
Apr
(112) |
May
(69) |
Jun
(140) |
Jul
(164) |
Aug
(159) |
Sep
(115) |
Oct
(65) |
Nov
(80) |
Dec
(128) |
| 2009 |
Jan
(145) |
Feb
(97) |
Mar
(118) |
Apr
(87) |
May
(96) |
Jun
(83) |
Jul
(50) |
Aug
(42) |
Sep
(18) |
Oct
(32) |
Nov
(12) |
Dec
(35) |
| 2010 |
Jan
(38) |
Feb
(8) |
Mar
(5) |
Apr
(19) |
May
(23) |
Jun
(39) |
Jul
(16) |
Aug
(4) |
Sep
(60) |
Oct
(100) |
Nov
(57) |
Dec
(43) |
| 2011 |
Jan
(25) |
Feb
(1) |
Mar
(3) |
Apr
|
May
(13) |
Jun
(19) |
Jul
|
Aug
(6) |
Sep
(5) |
Oct
(6) |
Nov
|
Dec
(1) |
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(2) |
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
(19) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ki...@us...> - 2006-10-19 20:09:24
|
Revision: 3723
http://svn.sourceforge.net/winmerge/?rev=3723&view=rev
Author: kimmov
Date: 2006-10-19 13:09:15 -0700 (Thu, 19 Oct 2006)
Log Message:
-----------
BUG: [ 1570348 ] self-tests seem to be broken
Modified Paths:
--------------
branches/R2_6/Testing/selftests/Changes.txt
branches/R2_6/Testing/selftests/testdiff.pl
Modified: branches/R2_6/Testing/selftests/Changes.txt
===================================================================
--- branches/R2_6/Testing/selftests/Changes.txt 2006-10-19 20:07:57 UTC (rev 3722)
+++ branches/R2_6/Testing/selftests/Changes.txt 2006-10-19 20:09:15 UTC (rev 3723)
@@ -1,5 +1,9 @@
selftest\Changes.txt
+2006-10-19 Kimmo
+ BUG: [ 1570348 ] self-tests seem to be broken
+ selftests: testdiff.pl
+
2006-02-08 Perry
PATCH: [ 1426552 ] Add selftests between platform versions
Adds some cross-platform comparisons (using existing test files).
Modified: branches/R2_6/Testing/selftests/testdiff.pl
===================================================================
--- branches/R2_6/Testing/selftests/testdiff.pl 2006-10-19 20:07:57 UTC (rev 3722)
+++ branches/R2_6/Testing/selftests/testdiff.pl 2006-10-19 20:09:15 UTC (rev 3723)
@@ -345,11 +345,11 @@
# Request diff2merge path
# Takes argument from 0-3 for build to test
sub getDiff2merge {
- "..\\Build\\$testprogs[$_[0]][0]\\$testprogs[$_[0]][1]";
+ "..\\..\\Tools\\Build\\$testprogs[$_[0]][0]\\$testprogs[$_[0]][1]";
}
# Request WinMerge path
# Takes argument from 0-3 for build to test
sub getWinMerge {
- "..\\Build\\$testprogs[$_[0]][0]\\$testprogs[$_[0]][2]";
+ "..\\..\\Build\\$testprogs[$_[0]][0]\\$testprogs[$_[0]][2]";
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-19 20:08:07
|
Revision: 3722
http://svn.sourceforge.net/winmerge/?rev=3722&view=rev
Author: kimmov
Date: 2006-10-19 13:07:57 -0700 (Thu, 19 Oct 2006)
Log Message:
-----------
BUG: [ 1570348 ] self-tests seem to be broken
Modified Paths:
--------------
trunk/Testing/selftests/Changes.txt
trunk/Testing/selftests/testdiff.pl
Modified: trunk/Testing/selftests/Changes.txt
===================================================================
--- trunk/Testing/selftests/Changes.txt 2006-10-19 19:03:18 UTC (rev 3721)
+++ trunk/Testing/selftests/Changes.txt 2006-10-19 20:07:57 UTC (rev 3722)
@@ -1,5 +1,9 @@
selftest\Changes.txt
+2006-10-19 Kimmo
+ BUG: [ 1570348 ] self-tests seem to be broken
+ selftests: testdiff.pl
+
2006-02-08 Perry
PATCH: [ 1426552 ] Add selftests between platform versions
Adds some cross-platform comparisons (using existing test files).
Modified: trunk/Testing/selftests/testdiff.pl
===================================================================
--- trunk/Testing/selftests/testdiff.pl 2006-10-19 19:03:18 UTC (rev 3721)
+++ trunk/Testing/selftests/testdiff.pl 2006-10-19 20:07:57 UTC (rev 3722)
@@ -345,11 +345,11 @@
# Request diff2merge path
# Takes argument from 0-3 for build to test
sub getDiff2merge {
- "..\\Build\\$testprogs[$_[0]][0]\\$testprogs[$_[0]][1]";
+ "..\\..\\Tools\\Build\\$testprogs[$_[0]][0]\\$testprogs[$_[0]][1]";
}
# Request WinMerge path
# Takes argument from 0-3 for build to test
sub getWinMerge {
- "..\\Build\\$testprogs[$_[0]][0]\\$testprogs[$_[0]][2]";
+ "..\\..\\Build\\$testprogs[$_[0]][0]\\$testprogs[$_[0]][2]";
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-19 19:03:24
|
Revision: 3721
http://svn.sourceforge.net/winmerge/?rev=3721&view=rev
Author: kimmov
Date: 2006-10-19 12:03:18 -0700 (Thu, 19 Oct 2006)
Log Message:
-----------
PATCH: [ 1578456 ] Manual: Small tweaks for installing doc
Modified Paths:
--------------
branches/R2_6/Docs/Users/Manual/Changes.txt
branches/R2_6/Docs/Users/Manual/Install.xml
Modified: branches/R2_6/Docs/Users/Manual/Changes.txt
===================================================================
--- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-19 18:59:57 UTC (rev 3720)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-19 19:03:18 UTC (rev 3721)
@@ -1,3 +1,7 @@
+2006-10-19 Kimmo
+ PATCH: [ 1578456 ] Manual: Small tweaks for installing doc
+ Manual: Install.xml
+
2006-10-12 Kimmo
Set version- and revision numbers for 2.6.0 release.
Manual: WinMerge_help.xml
Modified: branches/R2_6/Docs/Users/Manual/Install.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Install.xml 2006-10-19 18:59:57 UTC (rev 3720)
+++ branches/R2_6/Docs/Users/Manual/Install.xml 2006-10-19 19:03:18 UTC (rev 3721)
@@ -5,11 +5,13 @@
<para>WinMerge can be installed using installer or by unzipping files from
archive. Using the installer is the recommended method.</para>
- <para>Currently WinMerge installer works for natively for 32-bit Windows.
- There is no separate version for 64-bit Windows (WinXP/2003/Vista) but those
- can run installer and WinMerge as 32-bit application. However there is
- 64-bit version of Shell Integration included in 32-bit installer. So Shell
- Integration works in 64-bit Windows.</para>
+ <note>
+ <para>Currently WinMerge installer works natively only for 32-bit Windows.
+ There is no separate version of WinMerge for 64-bit Windows
+ (WinXP/2003/Vista). 64-bit Windows versions can run the installer and
+ WinMerge as 32-bit application. For the Shell Integration there is 64-bit
+ version of included in the installer.</para>
+ </note>
<sect2>
<title>Getting Files</title>
@@ -31,8 +33,7 @@
<para>Installer requires Admin-user priviledges in Windows NT4/2000/XP.
If you don't have Admin-user priviledges you can install WinMerge by
unzipping from an archive file (see <link
- linkend="InstallFromArchive">Installing from an
- Archive</link>).</para>
+ linkend="InstallFromArchive">Installing from an Archive</link>).</para>
</note>
<para>This is recommended for most users. Installer asks location where
@@ -169,14 +170,20 @@
<filename>WinMerge[U].exe</filename> is needed to run WinMerge. Mentioned
DLL files are available also as Runtimes-package to download.</para>
+ <note>
+ <para>WinMerge 2.6.0 and later versions require a new version of runtime
+ libraries. When updating from older WinMerge versions using archive
+ files, new runtime files form Runtime-package are needed.</para>
+ </note>
+
<para>Archive files have correct folder structure. WinMerge should be
unzipped preserving folder structure to destination folder, for example
<filename class="directory">C:\Program Files\</filename>. Root folder
created has name <filename
class="directory">/WinMerge-<replaceable>version</replaceable></filename>,
for example <filename class="directory">/WinMerge-2.6.0</filename>. This
- folder can be renamed or files copied to other folder (preserving folder
- structure!).</para>
+ folder can be renamed or files copied to other folder (preserving the
+ folder structure!).</para>
<para>After unzipping files WinMerge is ready to run! Shell Integration
and Archive Integration may need additional steps (see below).</para>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-19 19:00:16
|
Revision: 3720
http://svn.sourceforge.net/winmerge/?rev=3720&view=rev
Author: kimmov
Date: 2006-10-19 11:59:57 -0700 (Thu, 19 Oct 2006)
Log Message:
-----------
PATCH: [ 1578456 ] Manual: Small tweaks for installing doc
Modified Paths:
--------------
trunk/Docs/Users/Manual/Changes.txt
trunk/Docs/Users/Manual/Install.xml
Modified: trunk/Docs/Users/Manual/Changes.txt
===================================================================
--- trunk/Docs/Users/Manual/Changes.txt 2006-10-18 21:43:13 UTC (rev 3719)
+++ trunk/Docs/Users/Manual/Changes.txt 2006-10-19 18:59:57 UTC (rev 3720)
@@ -1,3 +1,7 @@
+2006-10-19 Kimmo
+ PATCH: [ 1578456 ] Manual: Small tweaks for installing doc
+ Manual: Install.xml
+
2006-10-11 Kimmo
PATCH: [ 1574644 ] Manual: Fix cvs id-line in filters-doc
Manual: Filters.xml
Modified: trunk/Docs/Users/Manual/Install.xml
===================================================================
--- trunk/Docs/Users/Manual/Install.xml 2006-10-18 21:43:13 UTC (rev 3719)
+++ trunk/Docs/Users/Manual/Install.xml 2006-10-19 18:59:57 UTC (rev 3720)
@@ -5,11 +5,13 @@
<para>WinMerge can be installed using installer or by unzipping files from
archive. Using the installer is the recommended method.</para>
- <para>Currently WinMerge installer works for natively for 32-bit Windows.
- There is no separate version for 64-bit Windows (WinXP/2003/Vista) but those
- can run installer and WinMerge as 32-bit application. However there is
- 64-bit version of Shell Integration included in 32-bit installer. So Shell
- Integration works in 64-bit Windows.</para>
+ <note>
+ <para>Currently WinMerge installer works natively only for 32-bit Windows.
+ There is no separate version of WinMerge for 64-bit Windows
+ (WinXP/2003/Vista). 64-bit Windows versions can run the installer and
+ WinMerge as 32-bit application. For the Shell Integration there is 64-bit
+ version of included in the installer.</para>
+ </note>
<sect2>
<title>Getting Files</title>
@@ -31,8 +33,7 @@
<para>Installer requires Admin-user priviledges in Windows NT4/2000/XP.
If you don't have Admin-user priviledges you can install WinMerge by
unzipping from an archive file (see <link
- linkend="InstallFromArchive">Installing from an
- Archive</link>).</para>
+ linkend="InstallFromArchive">Installing from an Archive</link>).</para>
</note>
<para>This is recommended for most users. Installer asks location where
@@ -169,14 +170,20 @@
<filename>WinMerge[U].exe</filename> is needed to run WinMerge. Mentioned
DLL files are available also as Runtimes-package to download.</para>
+ <note>
+ <para>WinMerge 2.6.0 and later versions require a new version of runtime
+ libraries. When updating from older WinMerge versions using archive
+ files, new runtime files form Runtime-package are needed.</para>
+ </note>
+
<para>Archive files have correct folder structure. WinMerge should be
unzipped preserving folder structure to destination folder, for example
<filename class="directory">C:\Program Files\</filename>. Root folder
created has name <filename
class="directory">/WinMerge-<replaceable>version</replaceable></filename>,
for example <filename class="directory">/WinMerge-2.6.0</filename>. This
- folder can be renamed or files copied to other folder (preserving folder
- structure!).</para>
+ folder can be renamed or files copied to other folder (preserving the
+ folder structure!).</para>
<para>After unzipping files WinMerge is ready to run! Shell Integration
and Archive Integration may need additional steps (see below).</para>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-18 21:43:26
|
Revision: 3719
http://svn.sourceforge.net/winmerge/?rev=3719&view=rev
Author: kimmov
Date: 2006-10-18 14:43:13 -0700 (Wed, 18 Oct 2006)
Log Message:
-----------
PATCH: [ 1578419 ] Fix creating WinMerge folder to MyFolders always
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/MainFrm.cpp
trunk/Src/MainFrm.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-10-18 21:24:09 UTC (rev 3718)
+++ trunk/Src/Changes.txt 2006-10-18 21:43:13 UTC (rev 3719)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-10-19 Kimmo
+ PATCH: [ 1578419 ] Fix creating WinMerge folder to MyFolders always
+ Src: MainFrm.cpp MainFrm.h
+
2006-10-11 Kimmo
PATCH: [ 1574696 ] Fix problem in saving filefilter to project file
Src: ProjectFilePathsDlg.cpp
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2006-10-18 21:24:09 UTC (rev 3718)
+++ trunk/Src/MainFrm.cpp 2006-10-18 21:43:13 UTC (rev 3719)
@@ -241,7 +241,8 @@
CString pathMyFolders = m_options.GetString(OPT_FILTER_USERPATH);
if (pathMyFolders.IsEmpty())
{
- CString pathFilters = GetDefaultFilterUserPath();
+ // No filter path, set it to default and make sure it exists.
+ CString pathFilters = GetDefaultFilterUserPath(TRUE);
m_options.SaveOption(OPT_FILTER_USERPATH, pathFilters);
theApp.m_globalFileFilter.SetFileFilterPath(pathFilters);
}
@@ -2321,9 +2322,16 @@
}
/**
- * @brief Get default user filter folder path
+ * @brief Get default user filter folder path.
+ * This function returns the default filter path for user filters.
+ * If wanted so (@p bCreate) path can be created if it does not
+ * exist yet. But you really want to create the patch only when
+ * there is no user path defined.
+ * @param [in] bCreate If TRUE filter path is created if it does
+ * not exist.
+ * @return Default folder for user filters.
*/
-CString CMainFrame::GetDefaultFilterUserPath()
+CString CMainFrame::GetDefaultFilterUserPath(BOOL bCreate /*=FALSE*/)
{
CString pathMyFolders = paths_GetMyDocuments(GetSafeHwnd());
CString pathFilters(pathMyFolders);
@@ -2331,7 +2339,7 @@
pathFilters += _T("\\");
pathFilters += DefaultRelativeFilterPath;
- if (!paths_CreateIfNeeded(pathFilters))
+ if (bCreate && !paths_CreateIfNeeded(pathFilters))
{
// Failed to create a folder, check it didn't already
// exist.
Modified: trunk/Src/MainFrm.h
===================================================================
--- trunk/Src/MainFrm.h 2006-10-18 21:24:09 UTC (rev 3718)
+++ trunk/Src/MainFrm.h 2006-10-18 21:43:13 UTC (rev 3719)
@@ -117,7 +117,7 @@
void ApplyViewWhitespace();
BOOL OpenFileToExternalEditor(CString file);
CString GetDefaultEditor();
- CString GetDefaultFilterUserPath();
+ CString GetDefaultFilterUserPath(BOOL bCreate = FALSE);
void SetEOLMixed(BOOL bAllow);
void SelectFilter();
void ShowVSSError(CException *e, CString strItem);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-10-18 21:25:58
|
Revision: 3718
http://svn.sourceforge.net/winmerge/?rev=3718&view=rev
Author: gerundt
Date: 2006-10-18 14:24:09 -0700 (Wed, 18 Oct 2006)
Log Message:
-----------
BUG: [ 1580031 ] Web: Wrong link to screenshot in pad file
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/WinMergePAD.xml
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-10-13 22:50:20 UTC (rev 3717)
+++ trunk/Web/Changes.txt 2006-10-18 21:24:09 UTC (rev 3718)
@@ -1,3 +1,7 @@
+2006-10-18 Tim
+ BUG: [ 1580031 ] Web: Wrong link to screenshot in pad file
+ Web: WinMergePAD.xml
+
2006-10-13 Tim
PATCH: [ 1576903 ] Web: Changes for new stable release 2.6.0
Web: downloads.php index.php page.inc WinMergePAD.xml
Modified: trunk/Web/WinMergePAD.xml
===================================================================
--- trunk/Web/WinMergePAD.xml 2006-10-13 22:50:20 UTC (rev 3717)
+++ trunk/Web/WinMergePAD.xml 2006-10-18 21:24:09 UTC (rev 3718)
@@ -87,7 +87,7 @@
<Application_URLs>
<Application_Info_URL>http://winmerge.org/2.6/</Application_Info_URL>
<Application_Order_URL>http://winmerge.org/2.6/</Application_Order_URL>
- <Application_Screenshot_URL>http://winmerge.org/2.6/images/screenshot.gif</Application_Screenshot_URL>
+ <Application_Screenshot_URL>http://winmerge.org/2.6/images/screenshot.png</Application_Screenshot_URL>
<Application_Icon_URL>http://winmerge.org/2.6/images/icon.gif</Application_Icon_URL>
<Application_XML_File_URL>http://winmerge.org/WinMergePAD.xml</Application_XML_File_URL>
</Application_URLs>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-10-13 22:50:31
|
Revision: 3717
http://svn.sourceforge.net/winmerge/?rev=3717&view=rev
Author: gerundt
Date: 2006-10-13 15:50:20 -0700 (Fri, 13 Oct 2006)
Log Message:
-----------
German translation is updated to 2.6.
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/developer/l10n/status.xml
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-10-13 22:45:44 UTC (rev 3716)
+++ trunk/Web/Changes.txt 2006-10-13 22:50:20 UTC (rev 3717)
@@ -7,6 +7,8 @@
Web\2.6\images: new file *.gif *.png
Remove "development version" link from Known Limitations (EditBinaryFiles.dll).
Web\2.6: limitations.php
+ German translation is updated to 2.6.
+ Web\developer\l10n: status.xml
2006-10-12 Tim
PATCH: [ 1575541 ] Web: Generator for Tracker Shortcuts
Modified: trunk/Web/developer/l10n/status.xml
===================================================================
--- trunk/Web/developer/l10n/status.xml 2006-10-13 22:45:44 UTC (rev 3716)
+++ trunk/Web/developer/l10n/status.xml 2006-10-13 22:50:20 UTC (rev 3717)
@@ -195,10 +195,11 @@
<author>
<name>Tim Gerundt</name>
<email>tim at gerundt dot de</email>
- <comment>2.5 - 2.1</comment>
+ <comment>2.6 - 2.1</comment>
</author>
</authors>
<versions>
+ <version>2.6</version>
<version>2.5</version>
<version>2.4</version>
<version>2.3</version>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-10-13 22:45:52
|
Revision: 3716
http://svn.sourceforge.net/winmerge/?rev=3716&view=rev
Author: gerundt
Date: 2006-10-13 15:45:44 -0700 (Fri, 13 Oct 2006)
Log Message:
-----------
Remove "development version" link from Known Limitations (EditBinaryFiles.dll).
Modified Paths:
--------------
trunk/Web/2.6/limitations.php
trunk/Web/Changes.txt
Modified: trunk/Web/2.6/limitations.php
===================================================================
--- trunk/Web/2.6/limitations.php 2006-10-13 22:31:52 UTC (rev 3715)
+++ trunk/Web/2.6/limitations.php 2006-10-13 22:45:44 UTC (rev 3716)
@@ -8,7 +8,7 @@
<ul>
<li>
<p><strong>Sometimes you cannot merge two files because the program says they are binary, even if they are mostly text files.</strong></p>
- <p><i>Workaround</i>: Use the new <code>EditBinaryFiles.dll</code> plugin available in <a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=29158">development version 2.5</a>.</p>
+ <p><i>Workaround</i>: Use the new <code>EditBinaryFiles.dll</code> plugin.</p>
</li>
<li>
<p><strong>There is no way to specify the codepage for a particular file.</strong></p>
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-10-13 22:31:52 UTC (rev 3715)
+++ trunk/Web/Changes.txt 2006-10-13 22:45:44 UTC (rev 3716)
@@ -5,6 +5,8 @@
Web\2.4: index.php new file downloads.php
Web\2.6: new file *.php *.txt
Web\2.6\images: new file *.gif *.png
+ Remove "development version" link from Known Limitations (EditBinaryFiles.dll).
+ Web\2.6: limitations.php
2006-10-12 Tim
PATCH: [ 1575541 ] Web: Generator for Tracker Shortcuts
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-10-13 22:32:36
|
Revision: 3715
http://svn.sourceforge.net/winmerge/?rev=3715&view=rev
Author: gerundt
Date: 2006-10-13 15:31:52 -0700 (Fri, 13 Oct 2006)
Log Message:
-----------
PATCH: [ 1576903 ] Web: Changes for new stable release 2.6.0
Modified Paths:
--------------
trunk/Web/2.2/downloads.php
trunk/Web/2.4/index.php
trunk/Web/Changes.txt
trunk/Web/WinMergePAD.xml
trunk/Web/downloads.php
trunk/Web/images/icon.gif
trunk/Web/index.php
trunk/Web/page.inc
Added Paths:
-----------
trunk/Web/2.4/downloads.php
trunk/Web/2.6/
trunk/Web/2.6/changes.php
trunk/Web/2.6/changes.txt
trunk/Web/2.6/images/
trunk/Web/2.6/images/filecmp.png
trunk/Web/2.6/images/filecmp_inlinediff.png
trunk/Web/2.6/images/foldercmp.png
trunk/Web/2.6/images/icon.gif
trunk/Web/2.6/images/open-dialog.gif
trunk/Web/2.6/images/screenshot.png
trunk/Web/2.6/index.php
trunk/Web/2.6/limitations.php
trunk/Web/2.6/screenshots.php
Modified: trunk/Web/2.2/downloads.php
===================================================================
--- trunk/Web/2.2/downloads.php 2006-10-12 20:11:57 UTC (rev 3714)
+++ trunk/Web/2.2/downloads.php 2006-10-13 22:31:52 UTC (rev 3715)
@@ -5,6 +5,7 @@
$page->printHead('WinMerge: Downloads', WINMERGE_USR);
?>
<h2>Downloads</h2>
+<p class="important">This is an old version of WinMerge, for the latest version go to the <a href="../index.php">main site</a>.</p>
<h3><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248&release_id=331334">WinMerge 2.2.4</a></h3>
<dl>
<dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.2.4-Setup.exe">Installer</a></dt>
Added: trunk/Web/2.4/downloads.php
===================================================================
--- trunk/Web/2.4/downloads.php (rev 0)
+++ trunk/Web/2.4/downloads.php 2006-10-13 22:31:52 UTC (rev 3715)
@@ -0,0 +1,27 @@
+<?php
+ include('../page.inc');
+
+ $page = new Page;
+ $page->printHead('WinMerge: Downloads', WINMERGE_2_4);
+?>
+<h2>Downloads</h2>
+<p class="important">This is an old version of WinMerge, for the latest version go to the <a href="../index.php">main site</a>.</p>
+<h3><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11248&release_id=438554">WinMerge 2.4.10</a></h3>
+<dl>
+ <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.10-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.4/manual/installing.html">online manual</a> for help using it.</p></dd>
+ <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.10-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.10-exe.zip">.zip</a> and <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.10-exe.7z">.7z</a>).</p></dd>
+ <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.10-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.10-src.zip">.zip</a> and <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.10-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>
+ <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>
+ </dd>
+ <dt><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.10-manual.zip">Manual</a></dt>
+ <dd><p>This is the offline version of the manual in archived format (<a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.10-manual.zip">.zip</a> and <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.10-manual.7z">.7z</a>).</p></dd>
+</dl>
+<?php
+ $page->printFoot();
+?>
\ No newline at end of file
Modified: trunk/Web/2.4/index.php
===================================================================
--- trunk/Web/2.4/index.php 2006-10-12 20:11:57 UTC (rev 3714)
+++ trunk/Web/2.4/index.php 2006-10-13 22:31:52 UTC (rev 3715)
@@ -4,6 +4,7 @@
$page = new Page;
$page->printHead('WinMerge 2.4', WINMERGE_2_4);
?>
+<p class="important">This is an old version of WinMerge, for the latest version go to the <a href="../index.php">main site</a>.</p>
<p>WinMerge is an Open Source visual text file differencing and merging tool for Win32 platforms. It is highly useful for determing what has changed between project versions, and then merging changes between versions.</p>
<h2>Features</h2>
<ul>
Added: trunk/Web/2.6/changes.php
===================================================================
--- trunk/Web/2.6/changes.php (rev 0)
+++ trunk/Web/2.6/changes.php 2006-10-13 22:31:52 UTC (rev 3715)
@@ -0,0 +1,14 @@
+<?php
+ include('../page.inc');
+
+ $page = new Page;
+ $page->printHead('WinMerge 2.6: Change History', WINMERGE_2_6);
+?>
+<h2>Change History</h2>
+<?php
+ print($page->convertChanges2Html('changes.txt'));
+?>
+<p>For older changes look at the <a href="/2.4/changes.php">Change History</a> from <a href="/2.4/index.php">WinMerge 2.4</a>.</p>
+<?php
+ $page->printFoot();
+?>
\ No newline at end of file
Added: trunk/Web/2.6/changes.txt
===================================================================
--- trunk/Web/2.6/changes.txt (rev 0)
+++ trunk/Web/2.6/changes.txt 2006-10-13 22:31:52 UTC (rev 3715)
@@ -0,0 +1,2787 @@
+2006-10-12 2.6.0 Stable Release (R3712)
+
+2006-10-12 Kimmo
+ Fix building catalan language file
+ Src/Languages/Catalan: MergeCatalan.rc
+
+2006-10-11 Kimmo
+ PATCH: [ 1574696 ] Fix problem in saving filefilter to project file
+ Src: ProjectFilePathsDlg.cpp
+
+2006-10-10 Takashi
+ BUG: [ 1573240 ] Crash in subversion trunk
+ Src: MainFrm.cpp MainFrm.h OptionsInit.cpp
+
+2006-10-09 Takashi
+ BUG: [ 1570259 ] Bookmarks GUI get reset after save
+ Src/editlib: ccrystaltextview.cpp
+
+2006-10-08 Takashi
+ To fix the bug "BUG: [ 1570173 ] Crash when merging all differences",
+ revert the fix for "BUG: [ 1555664 ] fail to copy all to right when enabling moved block detect"
+ Src: MergeDoc.cpp
+
+2006-10-08 Kimmo
+ PATCH: [ 1555344 ] Separate active/inactive developers in Contributors.txt
+ Docs/Users: Contributors.txt
+ BUG: [ 1563187 ] Can't close a file compare with -e switch
+ Src: MergeDoc.cpp
+
+2006-10-07 Tim
+ PATCH: [ 1572359 ] Various Updates in German Translation for WinMerge 2.6
+ Src/Languages/German: MergeGerman.rc
+
+2006-10-04 Tim
+ PATCH: [ 1570241 ] Various Updates in German Translation for WinMerge 2.6
+ Src/Languages/German: MergeGerman.rc
+
+2006-10-02 Gal
+ BUG: [ 1566783 ] Crash on Save Project when no file is selected
+ Src: MainFrm.cpp
+
+2006-10-01 Kimmo
+ PATCH: [ 1567874 ] Change manual URL to point to 2.6 manual
+ Src: MainFrm.cpp
+
+2006-09-27 Takashi
+ BUG: [ 1564572 ] Leak memory on undoing
+ Src: GhostTextBuffer.h
+ Src/editlib: ccrystaltextbuffer.h
+
+2006-09-27 Kimmo
+ PATCH: [ 1565917 ] Register.bat to register ShellExt for 64-bit Windows
+ ShellExtension: Register.bat
+
+2006-09-26 Tim
+ PATCH: [ 1565359 ] Various Updates in German Translation for WinMerge 2.6
+ Src/Languages/German: MergeGerman.rc
+
+2006-09-26 Kimmo
+ PATCH: [ 1563171 ] Catalan translation update (Open-dialog)
+ Submitted by Jordi Vilar
+ Src/Languages/Catalan: MergeCatalan.rc
+
+2006-09-24 Gal
+ BUG: [ 1564283 ] Parameter -x causes files to be closed after merging
+ Src: MergeDoc.cpp
+
+2006-09-24 Kimmo
+ PATCH: [ 1564280 ] Stack corruption in LanguageSelect
+ Src/Common: LanguageSelect.cpp
+ PATCH: [ 1563386 ] Spanish translation update
+ Submitted by Jesus M. Delgado 'Mack'
+ Src/Languages/Spanish: MergeSpanish.rc
+
+2006-09-23 Kimmo
+ Fix Visual C 6 compile by backouting (partly) patches:
+ - Fix 64-bit pointer truncation in SetWindowLongPtr call (the last I hope)
+ - PATCH: [ 1561796 ] Get/SetWindowLong not supported in 64-bit Windows
+ - BUG: [ 1561781 ] 64-bit compile errors from 7zCommon.cpp
+ Src: 7zCommon.cpp ChildFrm.cpp
+ Src/Common: CSubclass.cpp MessageBoxDialog.cpp MessageBoxDialog.h sizecbar.cpp
+
+2006-09-21 WinMerge experimental release 2.5.7.1 (SVN revision 3600)
+
+2006-09-21 Kimmo
+ PATCH: [ 1558213 ] Tweak text positions in splash screen
+ Src: Splash.cpp
+ Bump ShellExtension version to 1.9.0 (first 64-bit Windows version)
+ ShellExtension: ShellExtension.rc
+ Fix 64-bit typecast warning
+ Src: GhostTextBuffer.h
+ Fix 64-bit pointer truncation in SetWindowLongPtr call (the last I hope)
+ Src: ChildFrm.cpp
+ Minor tweaks to 64-bit ShellExtension project file
+ ShellExtension: ShellExtensionX64.vcproj
+
+2006-09-20 Kimmo
+ PATCH: [ 1561788 ] Fix 64-bit CFile constructor usage
+ Src/Common: UniFile.cpp
+ PATCH: [ 1561796 ] Get/SetWindowLong not supported in 64-bit Windows
+ Src: 7zCommon.cpp ChildFrm.cpp
+ Src/Common: CSubclass.cpp sizecbar.cpp
+ BUG: [ 1561781 ] 64-bit compile errors from 7zCommon.cpp
+ Src: 7zCommon.cpp
+ PATCH: [ 1561650 ] Separate FilterCommentsManager code from DiffWrapper
+ Src: DiffWrapper.cpp DiffWrapper.h Merge.dsp
+ Src new files: FilterCommentsManager.cpp FilterCommentsManager.h
+ Fix 64-bit compile warning by casting last SendMessage() param to LPARAM
+ Src: Merge.cpp
+ Fix hex number used instead of INVALID_HANDLE_VALUE
+ Src/Common: sinstance.cpp
+ Fix 64-bit pointer truncation in SetWindowLongPtr call
+ Src: ChildFrm.cpp
+
+2006-09-19 Kimmo
+ PATCH: [ 1561001 ] Fix FileActionScript type in running actions
+ Src: FileActionScript.cpp
+ PATCH: [ 1561008 ] Warning fix for FileActionScript
+ Src: DirDoc.cpp
+ PATCH: [ 1561080 ] Cleanup for loglevel definition
+ Src: DirDoc.cpp DirScan.cpp MainFrm.cpp Plugins.cpp StdAfx.cpp
+ Src/Common: LogFile.cpp LogFile.h
+
+2006-09-18 Kimmo
+ Cleanup 64-bit ShellExtension projectfile, add a debug target
+ ShellExtension: ShellExtensionX64.vcproj
+
+2006-09-16 Kimmo
+ PATCH: [ 1559619 ] 64-bit shellextension project file
+ ShellExtension new files: ShellExtensionX64.def ShellExtensionX64.vcproj
+ Remove unused variable
+ Src/editlib: memcombo.cpp
+ Remove unused variable
+ Src: OpenDlg.cpp
+ Fix typecasting warnings
+ Src: locality.cpp locality.h MergeDoc.cpp
+ Remove unused variable
+ Src: FileActionScript.cpp
+ Remove unused variable
+ Src: FileFiltersDlg.cpp
+
+2006-09-15 Kimmo
+ BUG: [ 1558839 ] ShellExtension does not compile as 64-bit
+ ShellExtension: WinMergeShell.cpp WinMergeShell.h
+ PATCH: [ 1558893 ] Fix incompatible prototype in MessageBoxDialog
+ Src/Common: MessageBoxDialog.cpp MessageBoxDialog.h
+ PATCH: [ 1558913 ] Fix OnTimer prototypes (64-bit compatibility)
+ Src: ChildFrm.cpp ChildFrm.h DircompProgressDlg.cpp DirCompProgressDlg.h DirView.cpp
+ Dirview.h MainFrm.cpp MainFrm.h MergeEditview.cpp MergeEditView.h OpenDlg.cpp
+ Opendlg.h Splash.cpp Splash.h
+ Src/Common: MessageBoxDialog.cpp MessageBoxDialog.h
+ Src/editlib: ccrystaltextview2.cpp ccrystaltextview.h
+
+2006-09-13 Kimmo
+ BUG: [ 1547247 ] WinMerge ANSI target does not compile with VS2005
+ Fix from Perry
+ Src: Common/SuperComboBox.cpp
+ PATCH: [ 1558152 ] Italian translation updated
+ Submitted by Andrea Decorte
+ Src/Languages/Italian: MergeItalian.rc
+
+2006-09-12 Takashi
+ PATCH: [ 1555764 ] prevent from shaking in view when pressing F5 down
+ Src: GhostTextView.cpp MergeDiffDetailView.cpp
+
+2006-09-12 Kimmo
+ PATCH: [ 1556851 ] An Swedish translation update
+ Submitted by Hans Eriksson
+ Src/Languages/Swedish: MergeSwedish.rc
+
+2006-09-11 WinMerge beta release 2.5.6 (revision 3552)
+
+2006-09-11 Takashi
+ Japanese translation - update
+ Src/Languages/Japanese: MergeJapanese.rc
+
+2006-09-11 Takashi
+ PATCH: [ 1555764 ] prevent from shaking in view when pressing F5 down
+ Src: GhostTextView.cpp GhostTextView.h MergeDiffDetailView.cpp MergeDiffDetailView.h
+
+2006-09-11 Takashi
+ BUG: [ 1555664 ] fail to copy all to right when enabling moved block detect
+ Src: MergeDoc.cpp
+
+2006-09-10 Kimmo
+ Czech translation update from Jan Hryz
+ Src/Languages/Czech/MergeCzech.rc
+ PATCH: [ 1553714 ] Add new commandine switches to help dialog
+ Src: Merge.rc MergeArgs.cpp resource.h
+ Src/Languages/*: Merge*.rc
+ PATCH: [ 1552228 ] Don't use 'export' as variable name
+ Src: dllpstub.cpp
+
+2006-09-08 Gal
+ RFE: [ 1533506 ] Need commandline switch for single-instance
+ Src: Merge.cpp
+
+2006-09-06 Kimmo
+ PATCH: [ 1552901 ] Update VC loose filefilter
+ Filters: Merge_VC_loose.flt
+ PATCH: [ 1552917 ] Fix GUI for autocompletion option
+ Src: Merge.rc
+ Src/Languages/*: Merge*.rc
+
+2006-09-05 Kimmo
+ PATCH: [ 1552095 ] Fix last compare method not visible in GUI list
+ Src: Merge.rc
+ Src/Languages/*: Merge*.rc
+
+2006-09-04 Takashi
+ PATCH: [ 1551332 ] defer loading plugin
+ Src: MainFrm.cpp Merge.rc MergeDoc.cpp MergeEditView.cpp MergeEditView.h
+ Src/Languages/*: Merge*.rc
+
+2006-09-04 Kimmo
+ BUG: [ 1550427 ] WinMerge 2.5.5.7 don't save "Include subfoders by default"
+ Src: PropRegistry.cpp
+
+2006-09-01 Takashi
+ Japanese translation - update
+ Src/Languages/Japanese: MergeJapanese.rc
+
+2006-08-28 Kimmo
+ PATCH: [ 1544777 ] Compare by size
+ Forgot to commit Options-dialog changes last time so option for this wasn't visible
+ Src: PropCompare.cpp
+ BUG: [ 1547262 ] Suspicious bit shift warning
+ Fix from Gal
+ Src/Common: UniFile.cpp
+
+2006-08-27 Kimmo
+ PATCH: [ 1547190 ] Fix VS2005 compile
+ Src: MergeArgs.cpp
+
+2006-08-26 Gal
+ BUG: [ 1546938 ] New toolbar icons only works for 'disabled' icons
+ Src/Languages/*/Merge*.rc
+
+2006-08-25 Kimmo
+ Fix compiling WinMerge after moving folders around (Merge7z moved under ArchiveSupport)
+ Src: 7zCommon.h
+
+***** Switch to Subversion *****
+
+2006-08-24 WinMerge experimental release 2.5.5.7 (cvs)
+
+2006-08-24 Kimmo
+ PATCH: [ 1545411 ] Add some missing options to configlog
+ Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
+ PATCH: [ 1545165 ] WinMarge Bulgarian Translation
+ Submitted by tigertron
+ Src/Languages/Bulgarian: MergeBulgarian.rc
+ Docs/Users/Languages: Readme-Bulgarian.txt
+ Docs/Users/Contributors.txt
+ InnoSetup: WinMerge.iss
+ ShellExtension: ShellExtension.rc
+ ShellExtension/Languages: ShellExtensionBulgarian.rc
+ PATCH: [ 1545890 ] Swedish translation for update for WinMerge 2.5.5.7+
+ Submitted by Hans Eriksson
+ Src/Languages/Swedish: MergeSwedish.rc
+ BUG: [ 1545082 ] Crash when comparing .rc files
+ Fix submitted by Takashi
+ Src/editlib: ccrystaltextview.cpp
+
+2006-08-23 Kimmo
+ PATCH: [ 1544905 ] Use stat() to check if file is read-only
+ Src: files.cpp files.h
+ PATCH: [ 1544777 ] Compare by size
+ Src: DiffWrapper.h DirScan.cpp Merge.rc resource.h
+ Src/Languages/*: Merge*.rc
+
+2006-08-22 Gal
+ PATCH: [ 1541427 ] Using as an external diff tool (RFE 1454623)
+ Src: MainFrm.cpp MainFrm.h MergeArgs.cpp MergeDoc.cpp
+
+2006-08-22 Gal
+ PATCH: [ 1544784 ] Use as ClearCase external merge tool
+ Src: MergeArgs.cpp
+
+2006-08-22 Gal
+ BUG: [ 1543783 ] Misbehave margin draw
+ Src/editlib: ccrystaltextview.cpp
+
+2006-08-22 Kimmo
+ PATCH: [ 1544147 ] Add Install-feature for file filters
+ Src: FileFiltersDlg.cpp FileFiltersDlg.h Merge.rc resource.h
+ Src/Languages/*: Merge*.rc
+ BUG: [ 1534429 ] Message IDS_SUGGEST_IGNOREEOL incorrect
+ Src: MergeDoc.cpp
+
+2006-08-20 Kimmo
+ PATCH: [ 1424673 ] Widen labels on OpenDialog
+ Submitted by Perry
+ Src: Merge.rc
+ Src/Languages/*: Merge*.rc
+
+2006-08-19 Kimmo
+ PATCH: [ 1542201 ] Change default user filter folder to WinMerge/Filters
+ Src: MainFrm.cpp
+ PATCH: [ 1542829 ] Rename Format-item in File-menu to Convert
+ Src: Merge.rc
+ Src/Languages/*: Merge*.rc
+
+2006-08-17 Kimmo
+ PATCH: [ 1540090 ] Change horizontal scroll synch from relative to absolute
+ Src/Common: SplitterWndEx.cpp
+
+2006-08-17 Gal
+ PATCH: [ 1541158 ] New high-color toolbar icons
+ Src: BCMenu.cpp MainFrm.cpp MainFrm.h Merge.rc resource.h
+ Src/res: ToolbarDisabled.bmp ToolbarEnabled.bmp
+
+2006-08-16 Takashi
+ PATCH: [ 1539568 ] draw icon at modified line (it was changed to line revision marks)
+ Src: GhostTextBuffer.cpp GhostTextBuffer.h MergeDoc.cpp MergeDoc.h
+ Src/editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h ccrystaltextview.cpp
+
+2006-08-16 Kimmo
+ PATCH: [ 1456356 ] Scrollbars sometimes not initially active
+ Src: Merge.cpp
+
+2006-08-15 Kimmo
+ PATCH: [ 1540129 ] Fix indentation of diffutils io.c
+ Src/diffutils/src: IO.C
+ PATCH: [ 1540054 ] Remove Copy All -items from folder compare menu
+ Src: Merge.rc
+ Src/Languages/*: Merge*.rc
+ PATCH: [ 1535558 ] Add GUI for shell extension folder include
+ Src: Merge.rc PropRegistry.cpp PropRegistry.h resource.h
+ Src/Languages/*: Merge*.rc
+
+2006-08-13 Gal
+ BUG: [ 1538340 ] Undo enabled for folder compare.
+ Src: DirView.h DirView.cpp
+
+2006-08-13 Takashi
+ Japanese translation - update
+ Src/Languages/Japanese: MergeJapanese.rc
+
+2006-08-13 Tim
+ PATCH: [ 1539204 ] Remove '#' from '#differences' column
+ Src: Merge.rc
+ Src/Languages/*: Merge*.rc
+
+2006-08-11 Kimmo
+ PATCH: [ 1538264 ] Split DiffFileData class to own files
+ Src: DiffWrapper.cpp DiffWrapper.h DirScan.cpp DirViewColItems.cpp Merge.dsp
+ Src new files: DiffFileData.cpp DiffFileData.h
+ PATCH: [ 1537261 ] Swedish 2.5.5.6+ translation update
+ Submitted by Hans Eriksson
+ Src/Languages/Swedish: MergeSwedish.rc
+
+2006-08-10 Kimmo
+ Fix doxygen comment for ImportOptions()
+ Src/Common: OptionsMgr.cpp
+
+2006-08-10 Gal
+ PATCH: Code cleanup. Removed commented out code.
+ Src/Common: SuperComboBox.cpp
+
+ BUG: [ 1531965 ] Crash undoing empty (?) event
+ Src/editlib: ccrystaleditview.cpp
+
+2006-08-09 Jan Hryz
+ Czech translation - update
+ Src/Languages/Czech/MergeCzech.rc
+
+2006-08-09 Jochen
+ PATCH: [ 1310951 ] Option to copy DirCmpReport to clipboard
+ Src: DirCmpReport.cpp DirCmpReport.h DirCmpReportDlg.cpp DirCmpReportDlg.h
+ Merge.rc resource.h
+ Src/Languages/*: Merge*.rc
+
+2006-08-08 Jan Hryz
+ Czech translation - update
+ Src/Languages/Czech/MergeCzech.rc
+
+2006-08-08 WinMerge experimental release 2.5.5.6 (cvs)
+
+2006-08-08 Kimmo
+ BUG: [ 1535835 ] Import settings from the file
+ Src/Common: PreferencesDlg.cpp PreferencesDlg.h
+ PATCH: [ 1536240 ] Fix diff count numbers for real
+ Src: DiffWrapper.cpp DirScan.cpp
+ Src/diffutils/src: analyze.c UTIL.c
+
+2006-08-07 Jochen
+ PATCH: [ 1514487 ] Merge7z DllBuild 0018
+ Merge7z: Merge7z311.cpp Merge7z409.cpp Merge7zCommon.cpp Merge7zCommon.h
+ revision.txt Merge7z*.dsp
+ Merge7z new files: Merge7z433.dsp Merge7z434.dsp Merge7z435.dsp Merge7z436.dsp
+ Merge7z437.dsp Merge7z438.dsp Merge7z439.dsp Merge7z440.dsp Merge7z442.dsp
+ Merge7zInstaller: Installer.cpp Installer.rc Files.rc2
+ Change recommended version of 7-Zip to 4.42
+ Src: 7zCommon.cpp
+
+2006-08-07 Kimmo
+ PATCH: [ 1535175 ] Shell ext: Add flag for subfolder inclusion
+ ShellExtension: WinMergeShell.cpp WinMergeShell.h
+ Bump ShellExtension version to 1.8.0
+ ShellExtension: ShellExtension.rc
+
+2006-08-06 Takashi
+ BUG: [ 1533292 ] crash when specifying nonexistent project file.
+ Src: XmlDoc.cpp
+
+2006-08-05 Kimmo
+ PATCH: [ 1534770 ] Add "don't wrap end of file" option for Find
+ Src: Merge.rc resource.h
+ Src/editlib: ccrystaleditview.cpp ccrystaltextview.cpp ccrystaltextview.h
+ ceditreplacedlg.cpp cfindtextdlg.cpp cfindtextdlg.h
+ Src/Languages/*: Merge*.rc
+ BUG: [ 1534461 ] WinMerge 2.5.5.5 ingoring subfolders option in project files
+ Src: MainFrm.cpp Merge.cpp
+
+2006-08-03 Jan Hryz
+ Czech translation - update
+ Src/Languages/Czech/MergeCzech.rc
+
+2006-08-03 WinMerge experimental release 2.5.5.5 (cvs)
+
+2006-08-03 Kimmo
+ PATCH: [ 1533457 ] Add Refresh Selected -item to Folder compare main menu
+ Src: DirActions.cpp DirView.cpp DirView.h Merge.rc
+ Src/Languages/*: Merge*.rc
+
+2006-08-02 Kimmo
+ PATCH: [ 1532743 ] Improve difference count columns in folder compare
+ Src: DiffItem.h DiffItemList.cpp DirScan.cpp DirVierwColItems.cpp
+ Merge.rc resource.h
+ Src/Languages/*: Merge*.rc
+ PATCH: [ 1529864 ] Stop using Application Data folders as filefilter folders
+ Src: FileFilterHelper.cpp FileFilterHelper.h
+
+2006-08-01 Kimmo
+ PATCH: [ 1531845 ] Fix memory leak after find
+ Src/editlib: ccrystaltextview.cpp
+ PATCH: [ 1531957 ] Fix imagelist memory leak in editor
+ Src/editlib: ccrystaltextview.cpp
+ PATCH: [ 1430331 ] New Debug menu
+ Submitted by Perry, modified by me
+ Src: MainFrm.cpp MainFrm.h Merge.rc resource.h
+ Src/Languages/*: Merge*.rc
+ PATCH: [ 1531319 ] Tidy Folder compare progress dialog
+ Src: Merge.rc
+ Src/Languages/*: Merge*.rc
+
+2006-07-31 Kimmo
+ PATCH: [ 1531293 ] Fix wrong cursor position after find
+ Src: ccrystaltextview.cpp ccrystaltextview.h cfindtextdlg.cpp
+ PATCH: [ 1406051 ] code cleanup for ScriptFileActions
+ Submitted by Perry
+ Src: DirActions.cpp FileActionScript.cpp FileActionScript.h
+ PATCH: [ 1530459 ] Add some doxygen comments for ViewableWhitespace
+ Src: ViewableWhitespace.cpp ViewableWhitespace.h
+
+2006-07-30 Takashi
+ BUG: [ 1528322 ] Crash when using F6 / Bugg for file differences
+ Src: MergeEditView.cpp
+
+2006-07-30 Kimmo
+ PATCH: [ 1530352 ] Start flashing WinMerge window when folder compare is ready
+ Src: DirView.cpp MainFrm.cpp MainFrm.h
+ PATCH: [ 1529995 ] Swedish translation update for 2.5.5.4+
+ Submitted by Hans Eriksson
+ Src/Languages/Swedish: MergeSwedish.rc
+ PATCH: [ 1530655 ] Catalan translation update
+ Submitted by Jordi Vilar
+ Src/Languages/Catalan: MergeCatalan.rc
+
+2006-07-29 Takashi
+ PATCH: [ 1529915 ] Refresh menu on DirView does not work correctly
+ Src: DirActions.cpp DirScan.cpp
+
+2006-07-28 Kimmo
+ PATCH: [ 1529599 ] Cleanup DiffWrapper
+ Src: DiffWrapper.cpp DiffWrapper.h MergeDoc.cpp PatchTool.cpp
+ PATCH: [ 1529965 ] Add error messages for managing file filters
+ Src: FileFiltersDlg.cpp FileFiltersDlg.h Merge.rc resource.h
+ Src/Languages/*: Merge*.rc
+
+2006-07-27 Takashi
+ PATCH: [ 1527843 ] prevent dialog from flickering
+ Src: DirCompProgressDlg.cpp DirView.cpp
+ Src/Common: CMoveConstraint.cpp
+
+2006-07-27 Kimmo
+ PATCH: [ 1528841 ] Cleanup ByteComparator
+ Src: ByteComparator.cpp ByteComparator.h FileTextStats.h
+ PATCH: [ 1528987 ] Use 64-bit variable as file position in Bytecompare
+ Src: ByteComparator.cpp ByteComparator.h DiffWrapper.cpp FileTextStats.h
+ PATCH: [ 1529053 ] Success message for loading/saving project file
+ Src: Merge.rc ProjectFilePathsDlg.cpp resource.h
+ Src/Languages/*: Merge*.rc
+
+2006-07-26 Kimmo
+ PATCH: [ 1528444 ] Cleanup for AppSerialize
+ Src: AppSerialize.cpp AppSerialize.h
+
+2006-07-25 Kimmo
+ PATCH: [ 1527771 ] Remove Apply syntax highlight to other side option
+ Src: Merge.rc MergeDoc.cpp OptionsDef.h OptionsInit.cpp PropEditor.cpp
+ PropEditor.h resource.h
+ Src/Languages/*: Merge*.rc
+
+2006-07-24 Tim
+ PATCH: [ 1527947 ] Various Updates in German Translation for WinMerge 2.5
+ Src/Languages/German: MergeGerman.rc
+
+2006-07-24 Kimmo
+ PATCH: [ 1526918 ] Detect which side file is binary file
+ Src: DiffItem.h DiffWrapper.cpp DiffWrapper.h
+ Src/diffutils/src: DIFF.H IO.c analyze.c
+
+2006-07-20 WinMerge experimental release 2.5.5.4 (cvs)
+
+2006-07-20 Kimmo
+ PATCH: [ 1525013 ] Add description for ASP.NET filter
+ Filters: ASPNET.flt
+ PATCH: [ 1525417 ] Move MovedBlock code to own file
+ Src: DiffWrapper.cpp Merge.dsp
+ Src new file: MovedBlocks.cpp
+ PATCH: [ 1525531 ] Allow comparing project files from Open-dialog
+ Src: OpenDlg.cpp
+ Config log files are .txt files (not .log)
+ Src: MainFrm.cpp
+ BUG: [ 1495212 ] Wrong cursor position after selecting wordwrapped line
+ Fix from Takashi
+ Src/editlib: ccrystaltextview.cpp
+
+2006-07-19 Jan Hryz
+ Czech translation - update
+ Src/Languages/Czech/MergeCzech.rc
+
+2006-07-19 Kimmo
+ BUG: [ 1198248 ] version copyright symbol needs review
+ Src/Languages/*: MergeChineseSimplified.rc MergeChineseTraditional.rc MergeJapanese.rc
+ MergeKorean.rc
+
+2006-07-19 Takashi
+ BUG: [ 1525451 ] ASSERT in CCrystalTextView::DrawSingleLine()
+ Src/editlib: ccrystaltextview.cpp
+ BUG: [ 1525466 ] ASSERT in CCrystalTextView::AssertValidTextPos()
+ Src/editlib: ccrystaltextview2.cpp
+
+2006-07-19 Kimmo
+ BUG: [ 1524832 ] Bogus include's
+ Src: DirColsDlg.cpp PropEditor.cpp
+ PATCH: [ 1522037 ] Add read-only option for paths in Project file
+ Src: MainFrm.cpp Merge.cpp Merge.rc OpenDlg.cpp OpenDlg.h ProjectFile.cpp
+ ProjectFile.h ProjectFilePathsDlg.cpp ProjectFilePathsDlg.h resource.h
+ Src/Languages/*: Merge*.rc
+ PATCH: [ 1525025 ] Copy/paste error in MainFrm.cpp
+ Src: MainFrm.cpp
+ PATCH: [ 1525198 ] Version info misses copyright (c) char
+ Src: Merge.rc
+
+2006-07-18 Kimmo
+ Fix and improve comment for folder compare columns table
+ DirViewColItems.cpp
+ BUG: [ 1524251 ] File filter does not work on 2.5.5.3
+ Original fix from Takashi, modified by Kimmo
+ Src: FileFilterMgr.cpp
+
+2006-07-16 Kimmo
+ PATCH: [ 1517057 ] Option to Ignore Multiline Comments (bugfix for single-line comments)
+ Submitted by David Maisonave
+ Src: DiffWrapper.cpp
+
+2006-07-15 Kimmo
+ Strip SuperComboBox strings before saving
+ Src/Common: SuperComboBox.cpp
+
+2006-07-14 WinMerge experimental release 2.5.5.3 (cvs)
+
+2006-07-14 Kimmo
+ BUG: [ 1521555 ] Location Pane - can't see current location because of color
+ Use 3d-color instead of scrollbar color in location pane
+ Src: LocationView.cpp
+ PATCH: [ 1521696 ] Improve Text color option dialog
+ Src: Merge.rc PropTextColors.cpp PropTextColors.h
+ Src/Languages/*: Merge*.rc
+
+2006-07-13 Kimmo
+ PATCH: [ 1521352 ] Cleanup char constants for CRegExep
+ Src/Common: RegExp.cpp
+ PATCH: [ 1521392 ] Fix reading last line in linefilter file
+ Src: FileFilterMgr.cpp
+ BUG: [ 1498511 ] Conflict accelerator key in IDR_DIRVIEWMENU
+ Src: Merge.rc
+ Src/Languages/*: Merge*.rc
+ PATCH: [ 1517057 ] Option to Ignore Multiline Comments (bugfix + rename to filtering)
+ Submitted by David Maisonave
+ Src: DiffWrapper.cpp DiffWrapper.h DirDoc.cpp MainFrm.cpp Merge.rc MergeDoc.cpp
+ OptionsDef.h OptionsInit.cpp PropCompare.cpp Propcompare.h resource.h
+ Src/Languages/*: Merge*.rc
+ PATCH: [ 1517057 ] Option to Ignore Multiline Comments (bugfix)
+ Submitted by David Maisonave
+ Src: DiffWrapper.cpp
+
+2006-07-12 Kimmo
+ PATCH: [ 1517057 ] Option to Ignore Multiline Comments
+ Submitted by David Maisonave
+ Src: DiffWrapper.cpp DiffWrapper.h DirDoc.cpp MainFrm.cpp Merge.rc MergeDoc.cpp
+ OptionsDef.h OptionsInit.cpp PatchTool.cpp PropCompare.cpp Propcompare.h
+ resource.h
+ Src/Languages/*: Merge*.rc
+ Add Ed_K and David Maisonave to Contributors
+ Docs/Users: Contributors.txt
+ Document UniMemFile::ReadString() function parameters and return values
+ Src/Common: UniFile.cpp
+
+2006-07-09 Kimmo
+ Quiet warning about deprecated function for VS2003 and later
+ Merge.cpp
+
+2006-07-08 Kimmo
+ PATCH: [ 1517362 ] Ensure diff is visible in location view
+ Src: LocationView.cpp
+ Fix codinstyle in LocationView.cpp (messed up by patch #1517362)
+ Src: LocationView.cpp
+ Make VS2005 build less noisy by defining _CRT_SECURE_NO_DEPRECATE for it
+ Src: StdAfx.h
+
+2006-07-04 Kimmo
+ PATCH: [ 1516626 ] Enable double-click in column customization dialog
+ Src: DirColsDlg.cpp DirColsDlg.h
+ PATCH: [ 1514435 ] Optimize versioninfo reading
+ Src: AboutDlg.cpp ConfigLog.cpp Splash.cpp
+ Src/Common: version.cpp version.h
+
+2006-07-04 Takashi
+ BUG: [ 1303166 ] crash or freeze on closing all window
+ Src: MainFrm.cpp
+
+2006-07-03 WinMerge experimental release 2.5.5.2 (cvs)
+
+2006-07-03 Kimmo
+ PATCH: [ 1515380 ] Page Up/Down Anomaly
+ Submitted by Ed_K
+ Src/editlib: ccrystaltextview2.cpp
+ PATCH: [ 1515966 ] Use View-IDs in MergeDoc.cpp
+ Src: MergeDoc.cpp MergeDoc.h
+ PATCH: [ 1516016 ] Fix poor handling of invalid tab size in Options-dialog
+ Src: Merge.rc PropEditor.cpp PropEditor.h resource.h
+ Src/Languages/*: Merge*.rc
+ Fix comment in DiffList.cpp
+ Src: DiffList.cpp
+
+2006-07-02 Kimmo
+ PATCH: [ 1515669 ] Add selected difference marker for locationview
+ Src: LocationView.cpp LocationView.h
+
+2006-07-01 Kimmo
+ PATCH: [ 1514459 ] Cleanup for LocationView code (use view ID)
+ Src: LocationView.cpp LocationView.h StdAfx.h
+ PATCH: [ 1514580 ] Tweak location view bar look
+ Src: LocationView.cpp
+
+2006-06-30 Tim
+ PATCH: [ 1514645 ] Various Updates in German Translation for WinMerge 2.5
+ Src/Languages/German: MergeGerman.rc
+
+2006-06-29 Kimmo
+ PATCH: [ 1513618 ] Fix Merge.rc translation id
+ Src: Merge.rc
+
+2006-06-27 Kimmo
+ PATCH: [ 1512708 ] Fix compile with VS2005
+ Also additional cleanup for CCrystalTextView::GetMarginWidth()
+ Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
+ PATCH: [ 1512726 ] Fix combining filesize from two values
+ Src: DiffFileInfo.cpp DirScan.cpp FileInfo.cpp FileInfo.h
+ PATCH: [ 1512775 ] Fix encoding columns showing -1
+ Src: FileTextEncoding.cpp FileTextEncoding.h
+
+2006-06-26 Kimmo
+ PATCH: [ 1510596 ] Updated Readme-Swedish.txt
+ Submitted by Hans Eriksson
+ Docs/Users/Languages: ReadMe-Swedish.txt
+ PATCH: [ 1510600 ] Updated MergeSwedish.rc file for 2.5.5.1+
+ Submitted by Hans Eriksson
+ Src/Languages/Swedish: MergeSwedish.rc
+ BUG: [ 1483242 ] Needless resource file 'MergeSwedish_LastTranslation.rc'?
+ Remove unneeded file
+ Removed: Src/Languages/Swedish: MergeSwedish_LastTranslation.rc
+ BUG: [ 1489034 ] Src/Common/LanguageSelect.rc unused?
+ Remove unneeded file
+ Removed: Src/Common/LanguageSelect.rc
+ Remove unused files (language.h & language.c)
+ Removed: Src: language.c language.h
+
+2006-06-21 WinMerge experimental release 2.5.5.1 (cvs)
+
+2006-06-21 Kimmo
+ PATCH: [ 1509505 ] Manual: new compare method and options export/import
+ Docs/Users/Manual: Configuration.xml
+ Bump manual revision to 1.2.4
+ Docs/Users/Manual: WinMerge_help.xml
+ Bump ShellExtension version to 1.7.2
+ ShellExtension: ShellExtension.rc
+
+2006-06-20 Kimmo
+ BUG: [ 1505763 ] Crash after closing file compare window
+ Src: MergeEditView.cpp
+ PATCH: [ 1508865 ] Improve error handling for loading file filters
+ Src: FileFilterHelper.cpp FileFilterMgr.cpp FileFilterMgr.h FileFiltersDlg.cpp
+ FileFiltersDlg.h
+ PATCH: [ 1508898 ] Show binary as one of EOL types
+ Src: DirViewColItems.cpp Merge.rc resource.h
+ Src/Languages/*: Merge*.rc
+ PATCH: [ 1506184 ] Polish translation update for WM 2.5.4.0
+ Submitted by dr_prozac
+ Src/Languages/Polish: MergePolish.rc
+ PATCH:[ 1509495 ] Polish translation for ShellExtension
+ Submitted by dr_prozac
+ ShellExtension/Languages: ShellExtensionPolish.rc
+
+2006-06-19 Gal
+ RFE: [ 1499245 ] Ruby Syntax Highlighting
+ Src: Merge.dsp
+ Src/editlib: ccrystaltextview.cpp ccrystaltextview.h ruby.cpp
+
+2006-06-13 Gal
+ BUG: [ 1494776 ] Can't rename files if '|' seperator exists
+ Src: DirView.h DirView.cpp DirActions.cpp
+
+2006-06-12 Kimmo
+ BUG: [ 1486434 ] Copy Pathnames for right-only dir copies parent dir only
+ Src: DirView.cpp
+
+2006-05-31 Kimmo
+ PATCH: [ 1483544 ] New compare method: by date and size
+ Src: DiffWrapper.h DirScan.cpp Merge.rc PropCompare.cpp resource.h
+ Src/Languages/*: Merge*.rc
+
+2006-05-31 Takashi
+ BUG: [ 1496066 ] WinMerge crashed with those files
+ Src: GhostTextView.cpp GhostTextView.h
+
+2006-05-31 Kimmo
+ BUG: [ 1494610 ] Wrong selection in ccrystalview2.cpp
+ Src/editlib: ccrystaltextview2.cpp
+ PATCH: [ 1497817 ] Cleanup CCrystalTextView::GetLineBySubLine
+ Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
+
+2006-05-30 Kimmo
+ PATCH: [ 1497154 ] Fix memory leak in wordwrap code
+ Src/editlib: ccrystaltextview.cpp
+ PATCH: [ 1497068 ] Initialize cursorpositions in GhostTextView
+ Src: GhostTextView.h
+ PATCH: [ 1497147 ] Cleanup CCrystalTextView::ClientToText
+ Src/editlib: ccrystaltextview.cpp
+
+2006-05-25 Kimmo
+ BUG: [ 1494610 ] Wrong selection in ccrystalview2.cpp
+ Analyzed by Mallato
+ Src/editlib: ccrystaltextview2.cpp
+
+2006-05-25 Tim
+ PATCH: [ 1495017 ] Translate 'Textcolors' options to German
+ Src/Languages/German: MergeGerman.rc
+
+2006-05-25 Kimmo
+ PATCH: [ 1494627 ] Skip processing empty paths in Open dialog
+ Src: OpenDlg.cpp
+ Doxygen comments and trivial cleanups for paths.cpp & paths.h
+ Src: paths.cpp paths.h
+
+2006-05-24 Kimmo
+ PATCH: [ 1493742 ] Limit vertical scrolling to last line of files
+ Src/editlib: ccrystaltextview.cpp
+ PATCH: [ 1493868 ] Add bookmark by double-clicking selection frame
+ Src/editlib: ccrystaltextview.cpp ccrystaltextview.h ccrystaltextview2.cpp
+ PATCH: [ 1492458 ] Swedish translation update for 2.5.4.0
+ Submitted by Hans Eriksson
+ Src/Languages/Swedish: MergeSwedish.rc
+ Add some const keywords and fix comments, remove unused function.
+ Src: DiffList.cpp DiffList.h
+ BUG: [ 1488797 ] ASSERT in CMergeEditView::OnPrevdiff
+ Fix from Mallato
+ Src: MergeEditView.cpp
+
+2006-05-23 Tim
+ PATCH: [ 1493713 ] Translate 'Bookmarks' feature to German
+ Src/Languages/German: MergeGerman.rc
+
+2006-05-23 Kimmo
+ PATCH: [ 1491436 ] Spanish Readme.txt
+ Submitted by Jesus M. Delgado 'Mack'
+ Docs/Users/Languages new file: ReadMe-Spanish.txt
+ InnoSetup: WinMerge.iss
+
+2006-05-22 Gal
+ PATCH: [ 1491993 ] Ability to rename files (RFE 1380228)
+ Src: DirActions.cpp DirView.cpp DirView.h Merge.rc resource.h
+
+2006-05-22 Kimmo
+ PATCH: [ 1491212 ] Czech Translation
+ Submitted by: Jan Hryz
+ Src/Languages/Czech/MergeCzec.rc
+ PATCH: [ 1492025 ] Catalan translation update
+ Submitted by Jordi Vilar
+ Src/Languages/Catalan: MergeCatalan.rc
+ PATCH: [ 1491424 ] Spanish translation for v2.5.3.7
+ Submitted by Jesus M. Delgado 'Mack'
+ Languages/Spanish: MergeSpanish.rc
+
+2006-05-18 WinMerge beta release 2.5.4
+
+2006-05-18 Kimmo
+ PATCH: [ 1490540 ] Manual: add picture and explanation about our version tree
+ Docs/Users/Manual: Introduction.xml
+ Docs/Users/Manual/build: build_html.bat build_htmlhelp.bat
+ Docs/Users/Manual/Art new files: WinMerge_versions.gif WinMerge_versions.odg
+
+2006-05-17 Kimmo
+ PATCH: [ 1489824 ] Better default folder for user filters
+ Src: MainFrm.cpp
+ BUG: [ 1445975 ] BuildDll.bat exit is not good
+ Src/Languages: BuildDll.bat
+ PATCH: [ 1488387 ] Russian translation update for 2.4.6
+ Submitted by Dmitriy Aleshkowskiy
+ Src/Languages/Russian: MergeRussian.rc
+
+2006-05-15 Kimmo
+ PATCH: [ 1489133 ] Manual: document new filter location(s)
+ Docs/Users/Manual: Filters.xml
+ PATCH: [ 1489091 ] Enable Help/Index
+ Src: MainFrm.cpp
+ PATCH: [ 1489098 ] Doesn't open Help TOC correctly
+ Src: MainFrm.cpp
+ BUG: [ 1487856 ] Long delay if many language dlls
+ Src: Merge.cpp
+ Src/Common: LanguageSelect.cpp LanguageSelect.h
+ BUG: [ 1487854 ] ASSERT in CCrystalTextView::OnPrint
+ Fix suggested by Mallato
+ Src/editlib: ccrystaltextview.cpp
+ Graphic Design: Alexander Skinner
+ Docs/Users: Contributors.txt
+ BUG: [ 1478057 ] Memory leak when cancelling print preview
+ Fix suggested by Mallato
+ Src/editlib: ccrystaltextview.cpp
+
+2006-05-15 Gal
+ PATCH: [ 1488637 ] PHP/ASP Syntax Highlighting Fix (Bug 1441643)
+ Src/editlib: asp.cpp php.cpp
+
+2006-05-14 Kimmo
+ PATCH: [ 1485861 ] Czech translation - update
+ Submitted by: Jan Hryz
+ Src/Languages/Czech/MergeCzec.rc
+ PATCH: [ 1483553 ] Swedish MergeSwedish.rc 1.304 2.5.3.7 update
+ Submitted by Hans Eriksson
+ Src/Languages/Swedish: MergeSwedish.rc
+ PATCH: [ 1484004 ] Manual: new Open-dialog screenshot and small fixes
+ Docs/Users/Manual: Quick_start.xml
+ Docs/Users/Manual/screenshots: OpenDlg1.gif
+ PATCH: [ 1484013 ] Manual: small changes to Introduction chapter
+ Docs/Users/Manual: Introduction.xml
+ PATCH: [ 1484092 ] Manual: preliminary whats new list for 2.5
+ Docs/Users/Manual: Whatsnew_2_1.xml
+ PATCH: [ 1484101 ] Manual: Add index
+ Docs/Users/Manual: WinMerge_help.xml
+ PATCH: [ 1484142 ] Manual: update some options descriptions
+ Docs/Users/Manual: Configuration.xml
+
+2006-05-08 Kimmo
+ PATCH: [ 1483344 ] Fix creating private file filters
+ Src: FileFiltersDlg.cpp
+ PATCH: [ 1483486 ] Add commenting for CLogFile
+ Src/Common: LogFile.cpp LogFile.h
+
+2006-05-07 Kimmo
+ PATCH: [ 1483107 ] Remove dublicated code from folder compare progress dlg
+ Src: DirCompProgressDlg.cpp DirCompProgressDlg.h
+ PATCH: [ 1483088 ] Add GUI for user to select filter folder
+ Src: FileFilterHelper.cpp FileFilterHelper.h FileFiltersDlg.cpp MainFrm.cpp Merge.rc
+ OptionsDef.h OptionsInit.cpp paths.cpp paths.h PropRegistry.cpp PropRegistry.h
+ resource.h
+ Src/Languages/*: Merge*.rc
+
+2006-05-06 Tim
+ BUG: [ 1481053 ] Options: Text Colors should use 3D-Look too
+ Src: Merge.rc
+ Src/Languages/*: Merge*.rc
+ PATCH: [ 1482352 ] Icons for 'Bookmarks' feature
+ Src: MainFrm.cpp Merge.rc resource.h
+ Src/res new files: clear_bookmarks.bmp next_bookmark.bmp prev_bookmark.bmp
+ toggle_bookmark.bmp
+ Src/Languages/*: Merge*.rc
+
+2006-05-06 Kimmo
+ BUG: [ 1363364 ] DisplayBinaryFiles extension list wrong
+ Also bump version of plugin to 1.0.3.0
+ Plugins/src_VCPP/DisplayBinaryFiles: ChangeLog.txt DisplayBinaryFiles.rc WinMergeScript.cpp
+ Plugins/dlls: DisplayBinaryFiles.dll
+
+2006-05-06 Tim
+ PATCH: [ 1482411 ] Add line before 'Open Project' in main menu
+ Src: Merge.rc
+ Src/Languages/*: Merge*.rc
+
+2006-05-06 Kimmo
+ PATCH: [ 1482688 ] sgml.cpp contains "lt" twice
+ Src/editlib: sgml.cpp
+ PATCH: [ 1482694 ] xml.cpp contains "lt" twice
+ Src/editlib: xml.cpp
+ PATCH: [ 1482765 ] Fix closing folder compare progress dialog
+ Src: DirCompProgressDlg.cpp DirCompProgressDlg.h DirView.cpp
+
+2006-05-04 WinMerge experimental release 2.5.3.7 (cvs)
+
+2005-05-04 Kimmo
+ PATCH: [ 1481213 ] Fix foldercompare short-size suffixes and localize them
+ Src: DirViewColItems.cpp Merge.rc resource.h
+ Src/Languages/*: Merge*.rc
+ PATCH: [ 1481391 ] Make LocationView update from MergeView more safe
+ Src: LocationView.cpp MergeEditView.cpp MergeEditView.h
+ BUG: [ 1456356 ] Scrollbars sometimes not initially active
+ Another possible fix..
+ Src/editlib: ccrystaltextview.cpp
+
+2006-05-03 Kimmo
+ PATCH: [ 1480652 ] Small fix for XML syntax highlight
+ Src/editlib: xml.cpp
+
+2006-05-02 Kimmo
+ PATCH: [ 1479007 ] WinMerge Icon Set Revision 3
+ Submitted by Alexander Skinner
+ Src/res: Merge.ico
+ BUG: [ 1474782 ] Crash when comparing SQL with with binary data
+ Fix suggested by anonymous submitter
+ Src/editlib: asp.cpp basic.cpp batch.cpp cplusplus.cpp csharp.cpp dcl.cpp
+ fortran.cpp html.cpp ini.cpp innosetup.cpp is.cpp java.cpp lisp.cpp nsis.cpp
+ pascal.cpp perl.cpp php.cpp python.cpp rexx.cpp rsrc.cpp sgml.cpp sh.cpp
+ siod.cpp sql.cpp tcl.cpp tex.cpp xml.cpp
+ PATCH: [ 1471835 ] Fix setting filename in folder-compare report dialog
+ Fix bug in the original patch
+ Src: DirCmpReportDlg.cpp
+
+2006-05-01 Takashi
+ PATCH: [ 1475649 ] Enable selection margin and line numbers
+ Src/res new file: mg_icons.bmp
+
+2006-04-29 Takashi
+ PATCH: [ 1475649 ] Enable selection margin and line numbers
+ Src: GhostTextView.cpp GhostTextView.h Merge.rc MergeEditView.cpp
+ MergeEditView.h OptionsDef.h OptionsInit.cpp resource.h
+ Src/editlib: ccrystaltextview.cpp ccrystaltextview.h editcmd.h
+ Src/Languages/*: Merge*.rc
+
+2006-04-28 Tim
+ PATCH: [ 1477957 ] Fix 'Help' button position in German translation
+ Src/Languages/German: MergeGerman.rc
+
+2006-04-26 Kimmo
+ PATCH: [ 1476279 ] Cleanup CDiffContext::UpdateInfoFromDiskHalf() and its usage
+ Src: Diffcontext.cpp DiffContext.h DirScan.cpp DirViewColItems.cpp
+
+2006-04-25 Kimmo
+ PATCH: [ 1475776 ] Optimize dirview UI updates
+ Src: DirActions.cpp DirDoc.cpp DirDoc.h
+ PATCH: [ 1472622 ] Czech translation - update (more dialog fixes)
+ Submitted by: Jan Hryz
+ Src/Languages/*: Merge*.rc
+
+2006-04-24 Kimmo
+ PATCH: [ 1474884 ] Fix XmlDoc not releasing file handles
+ Src: XmlDoc.cpp XmlDoc.h
+ PATCH: [ 1475092 ] Add DocumentsLoaded() to MergeDiffDetailView
+ Src: MergeDiffDetailView.cpp MergeDiffDetailView.h MergeDoc.cpp
+ Gal Hammer is now a developer
+ Docs/Users: Contributors.txt
+
+2006-04-23 Kimmo
+ PATCH: [ 1473902 ] Add dialog for editing and saving project files
+ Src: DirDoc.cpp DirDoc.h MainFrm.cpp MainFrm.h Merge.dsp Merge.rc MergeDoc.cpp
+ MergeDoc.h resource.h
+ Src new files: ProjectFilePathsDlg.cpp ProjectFilePathsDlg.h
+ Src/Languages/*: Merge*.rc
+ PATCH: [ 1472622 ] Czech translation - update
+ Submitted by: Jan Hryz
+ Src/Languages/Czech/MergeCzec.rc
+ PATCH: [ 1472622 ] Czech translation - update (apply dialog fixes)
+ Submitted by: Jan Hryz
+ Src/Languages/*: Merge*.rc
+
+2006-04-22 Kimmo
+ PATCH: [ 1473635 ] Move some results update code to DirDoc
+ Src: DirActions.cpp DirDoc.cpp DirDoc.h
+ PATCH: [ 1468691 ] Center folder compare status dialog to mainframe
+ Adding line I missed previous time applying the patch (2006-04-12)
+ Src: DirView.cpp
+
+2006-04-20 Kimmo
+ TODO: [ 1469363 ] Need image for aborted status in folder compare
+ Icon from Tim
+ Src: DirView.cpp Merge.rc resource.h
+ Src/res new file: aborted.ico
+ Src/Languages/*: Merge*.rc
+ PATCH: [ 1400653 ] Write project files using objects
+ Submitted by Perry
+ Src: Merge.dsp ProjectFile.cpp ProjectFile.h
+ Src new files: XmlDoc.cpp XmlDoc.h
+
+2006-04-18 Kimmo
+ PATCH: [ 1471835 ] Fix setting filename in folder-compare report dialog
+ Src: DirCmpReportDlg.cpp DirCmpReportDlg.h
+
+2006-04-18 Takashi
+ PATCH: [ 1445996 ] Fix wrong PgDown scrolling after mousescroll(2)
+ Src/editlib: ccrystaltextview2.cpp
+
+2006-04-12 WinMerge experimental release 2.5.3.6 (cvs)
+
+2006-04-12 Kimmo
+ PATCH: [ 1468691 ] Center folder compare status dialog to mainframe
+ Src: DirView.cpp
+ PaTCH: [ 1468783 ] Fix disabled scrollbars after loading files
+ Src: MergeDoc.cpp MergeEditView.cpp MergeEditView.h
+
+2006-04-11 Kimmo
+ PATCH: [ 1467872 ] Fix diff navigation for first-line of diff
+ Src: MergeEditView.cpp
+ PATCH: [ 1443719 ] xml output reports
+ Submitted by Perry, modified by me
+ Src: DirCmpReport.cpp DirCmpReport.h DirCmpReportDlg.cpp DirCmpReportDlg.h
+ DirView.cpp DirView.h Merge.dsp Merge.rc resource.h
+ Src new file: DirReportTypes.h
+
+2006-04-10 Kimmo
+ PATCH: [ 1467305 ] Beep when long compare is ready
+ Src: DirView.cpp DirView.h
+
+2006-04-09 Tim
+ BUG: [ 1461375 ] Forgot old patch #981526 for sgml.cpp, sh.cpp and tcl.cpp?
+ Src\editlib: sgml.cpp sh.cpp tcl.cpp
+
+2006-04-09 Kimmo
+ BUG: [ 1383719 ] ShellExtension resources opening in IDE fails
+ Fix from Sdottaka
+ ShellExtension/Languages/*.rc
+ BUG: [ 1465893 ] Compile error with VC6 (SuperComboBox.cpp)
+ Fix from Gal Hammer
+ Src/Common: SuperComboBox.cpp
+
+2006-04-06 Kimmo
+ BUG: [ 1463137 ] MergeArgs.h is empty file?
+ Remove MergeArgs.h
+ Src: Merge.dsp
+ Src removed file: MergeArgs.h
+
+2006-04-05 Tim
+ PATCH: [ 1461896 ] Syntax highlighting of HTML for ASP not complete
+ Src\editlib: asp.cpp
+
+2006-04-05 Kimmo
+ PATCH: [ 1460749 ] Print relative paths to patch files
+ Src: DiffWrapper.cpp DiffWrapper.h MainFrm.cpp MergeDoc.cpp PatchDlg.h
+ PatchTool.cpp PatchTool.h
+ BUG: [ 1461328 ] Commandline handling overwrites flags?
+ Fix from Gal Hammer
+ Src: MergeArgs.cpp
+ BUG: [ 1460236 ] Splash localization is broken
+ Src: Merge.rc resource.h Splash.cpp
+ Src/Languages/*: Merge*.rc
+ PATCH: [ 1445426 ] Clear PrivateBuild flag in SetResourceVersions.wsf
+ Submitted by Perry
+ Src: SetResourceVersions.wsf
+
+2006-04-05 Takashi
+ BUG: [ 1458714 ] [Replace All] doesn't work
+ Src/editlib: ceditreplacedlg.cpp
+
+2006-03-27 Kimmo
+ PATCH: [ 1459284 ] Update of MergeSwedish.rc for WinMerge 2.5.3.5+
+ Submitted by Hans Eriksson
+ Src/Languages/Swedish: MergeSwedish.rc
+ PATCH: [ 1458852 ] Fix UI for multiple file patches
+ Src: PatchDlg.cpp PatchDlg.h
+ PATCH: [ 1441718 ] Auto Complete on files or folders selection
+ Submitted by Gal Hammer
+ Src/Common: SuperComboBox.cpp SupercompoBox.h
+ Src: Merge.rc OpenDlg.cpp OptionsDef.h OptionsInit.cpp PropGeneral.cpp
+ PropGeneral.h resource.h
+ Src/Languages/*: Merge*.rc
+
+2006-03-26 Kimmo
+ PATCH: [ 1458066 ] Use / as path delimiter in patch files
+ Src: DiffWrapper.cpp
+ PATCH: [ 1406944 ] Compute text statistics in QuickCompare
+ Src new file: FileTextStats.h
+
+2006-03-24 Kimmo
+ PATCH: [ 1457203 ] Create patch from multiple files in folder compare
+ Src: DirView.cpp DirView.h MainFrm.cpp
+
+2006-03-24 Tim
+ PATCH: [ 1457306 ] Revamped Visual Basic syntax highlighter
+ Src\editlib: basic.cpp
+
+2006-03-24 Kimmo
+ BUG: [ 1455656 ] GPL text still contains 'How to Apply These Terms...'
+ Docs/Users: GPL.rtf
+
+2006-03-22 WinMerge experimental release 2.5.3.5 (cvs)
+
+2006-03-22 Kimmo
+ PATCH: [ 1455706 ] Catalan translation update
+ Submitted by Jordi Vilar
+ Src/Languages/Catalan: MergeCatalan.rc
+ PATCH: [ 1406944 ] Compute text statistics in QuickCompare
+ Src: ByteComparator.cpp ByteComparator.h DiffFileInfo.cpp DiffFileInfo.h DiffWrapper.cpp
+ Diffwrapper.h DirScan.cpp DirViewColItems.cpp Merge.dsp Merge.rc resource.h
+ Src/diffutils/src: DIFF.H IO.C
+ Src/Languages/*: Merge*.rc
+
+2006-03-21 Tim
+ PATCH: [ 1455663 ] Add new keywords to Visual Basic highlighter
+ Src\editlib: basic.cpp
+
+2006-03-21 Kimmo
+ PATCH: [ 1448599 ] WinMerge Program Icon Set
+ Submitted by Alexander Skinner
+ Src/res: Merge.ico
+ PATCH: [ 1452288 ] Add ASP.NET filefilter
+ By By Jon Galloway and Josh Blair
+ Filters new file: ASPNET.flt
+ PATCH: [ 1454720 ] Fix resizable dialogs missing captionbar close button
+ Src: Merge.rc
+ Src/Languages/*: Merge*.rc
+ PATCH: [ 1455430 ] New Splash Screen Revision 2
+ Submitted by Alexander Skinner
+ Src/res: splash.jpg
+ Remove obsolete splashscreen image (for old splashscreen)
+ Src/res removed file: WinMergesplash.psd
+
+2006-03-19 Kimmo
+ PATCH: [ 1449892 ] Add compare method to configlog
+ Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
+ PATCH: [ 1453252 ] Fix closing filecompare after error
+ Src: MainFrm.cpp MergeDoc.cpp
+
+2006-03-17 Tim
+ PATCH: [ 1449571 ] Add '*.pm' and '*.plx' to Perl highlighter
+ Src/editlib: ccrystaleditview.cpp
+
+2006-03-14 Perry
+ BUG: [ 1449947 ] Looks like diffutils bug for mac-style
+ BUG: [ 1449949 ] crash comparing two simple test mac files
+ Fix looping which missed mac case
+ diffutils\src: IO.C
+
+2006-03-15 Kimmo
+ PATCH: [ 1449868 ] Fix difference counts
+ Src: DiffWrapper.cpp
+
+2006-03-14 Kimmo
+ PATCH: [ 1449038 ] Add Help-button to Open-dialog
+ Src: FileFiltersDlg.cpp FileFiltersDlg.h Merge.rc OpenDlg.cpp OpenDlg.h
+ PropLineFilter.cpp PropLineFilter.h
+ Src/Common: PreferencesDlg.cpp
+ Src/Languages/*: Merge*.rc
+
+2006-03-13 Kimmo
+ PATCH: [ 1447927 ] Add Help Search to menu, open correct manual location
+ Src: DirView.cpp DirView.h MainFrm.cpp MainFrm.h Merge.rc MergeEditView.cpp
+ MergeEditView.h resource.h
+ Src/Languages/*: Merge*.rc
+
+2006-03-11 Kimmo
+ PATCH: [ 1447506 ] Don't include splash bitmap to lang files
+ Src/Languages/*: Merge*.rc
+ Remove Catalan localized splash screen
+ Src/Languages/Catalan/res removed files: splash1.bmp WinMergeSplash.psd
+ BUG: [ 1447851 ] Not enough space for version info in new splash screen
+ Src: Splash.cpp
+ PaTCH: [ 1445377 ] WinMerge Logos (72 DPI)
+ Submitted by Alexander Skinner
+ Add new folder Docs/Logos
+ New Docs/Logos files: readme.txt WinMerge_logo_24bit.png
+ WinMerge_logo_shadow_24bit.png WinMerge_logo_shadow_trans.tif
+ WinMerge_logo_trans.gif
+ Change Splashscreen text to according to Dean's wish
+ Src: Splash.cpp
+ Add Alexander Skinner to contributors list
+ Docs/Users: Contributors.txt
+ PATCH: [ 1447348 ] Build language files to Build directory
+ Src/Languages: BuildDll.bat
+ PATCH: [ 1447806 ] Use JPEG splashscreen
+ Src: Merge.dsp Merge.rc resource.h Splash.cpp Splash.h
+ Src/Common new files: Picture.cpp Picture.h
+ Src/res new file: splash.jpg
+ Src/res deleted file: splash1.bmp
+ Src/Languages/*: Merge*.rc
+
+2006-03-11 Takashi
+ BUG: [ 1441389 ] Comparing root directory - mysterious
+ Src: DiffWrapper.cpp
+
+2006-03-11 Perry
+ PATCH: [ 1447539 ] Add explanatory comment to CCrystalTextBuffer::MoveLine
+ Src/editlib: ccrystaltextbuffer.cpp
+ PATCH: [ 1447547 ] Add more comments to CMergeDoc::PrimeTextBuffers
+ Src: MergeDoc.cpp
+
+2006-03-10 Kimmo
+ Remove unneeded splash image (Splash2.bmp) as noted in Patch item #1441392
+ Src/res removed file: Splash2.bmp
+
+2006-03-10 Perry
+ PATCH: [ 1445434 ] SyntaxColors scrambling reg values
+ Src: SyntaxColors.cpp
+
+2006-03-10 WinMerge experimental release 2.5.3.4 (cvs)
+
+2006-03-09 Kimmo
+ PATCH: [ 1445996 ] Fix wrong PgDown scrolling after mousescroll
+ Src/editlib: ccrystaltextview2.cpp
+ BUG: [ 1446648 ] cvs trunk doesn't compile
+ Src: Splash.cpp
+
+2006-03-08 Kimmo
+ PATCH: [ 1441392 ] New Splash Screen
+ Submitted by Alexander Skinner
+ Src: Splash.cpp
+ Src/res: splash1.bmp
+
+2006-03-08 Perry
+ Update MakeResDll readme with current information (MSVC.Net 2003 works
+ now), and better explanation of how to pick a specific version.
+ MakeResDll: readme.txt
+ PATCH: [ 1443391 ] Update MakeResDll for VS.NET 2005
+ MakeResDll: MakeResDll.cpp MakeResDll.dsp MakeResDll.rc
+ StdAfx.cpp StdAfx.h readme.txt resource.h
+ New MakeResDll: Merge.ico VsVersionDlg.cpp VsVersionDlg.h
+ Bump MakeResDll version from 1.0.6.0 to 1.0.7.0.
+ MakeResDll: MakeResDll.rc
+ PATCH: [ 1442844 ] Make GetFileExt easier to understand
+ Src: MergeDoc.cpp MergeDoc.h
+ Add two minor comments to PropRegistry.
+ PropRegistry.cpp
+
+2006-03-06 WinMerge experimental release 2.5.3.3 (cvs)
+
+2006-03-06 Perry
+ BUG: [ 1444211 ] bug in current SelectFile
+ Src: Merge.cpp
+ PATCH: [ 1443841 ] Add header comment to Src/Changes.txt
+ Src: Changes.txt
+
+2006-03-06 Tim
+ BUG: [ 1442866 ] German RC format error
+ Src/Languages/German: MergeGerman.rc
+ BUG: [ 1442865 ] languages lack generate patch & report bitmaps
+ Src/Languages/*: Merge*.rc
+
+2006-03-06 Perry
+ PATCH: [ 1435361 ] Fix and cleanup project file code
+ Src: DiffContext.cpp DiffContext.h DirDoc.cpp MainFrm.cpp
+ Merge.cpp Merge.h Merge.rc MergeArgs.cpp ProjectFile.cpp
+ resource.h
+ Src/Languages/*: Merge*.rc
+
+2006-03-04 Perry
+ PATCH: [ 1396506 ] customizable text colors
+ Fix compilation (MSVC.NET 2003 correctly gave error that MSVC6 ignored)
+ Src: PreferencesDlg.cpp
+ PATCH: [ 1442125 ] Improvements for MakeResDll parsing
+ MakeResDll: MakeResDll.cpp MakeResDll.rc resource.h
+ Src\Common: RegKey.cpp RegKey.h
+ PATCH: [ 1442134 ] MakeResDll: check that RC file exists
+ MakeResDll: MakeResDll.cpp MakeResDll.rc resource.h
+ PATCH: [ 1442238 ] Fix MakeResDll to work with VS.NET 2003
+ MakeResDll: MakeResDll.cpp MakeResDll.rc
+ PATCH: [ 1442791 ] Update MakeResDll project
+ Add Changes.txt to project.
+ Change version copyright from "2003" to "2003-2006"
+ MakeResDll: MakeResDll.dsp MakeResDll.rc
+
+2006-03-04 Perry (MSVC6)
+ Current selftests status: Failure count: 0 (of 756)
+
+2006-03-04 Perry
+ PATCH: [ 1396506 ] customizable text colors
+ Src: MainFrm.cpp MainFrm.h Merge.dsp Merge.rc MergeDoc.cpp
+ OptionsDef.h OptionsInit.cpp PropArchive.cpp PropArchive.h
+ PropCodepage.cpp PropCodepage.h PropColors.cpp PropColors.h
+ PropCompare.cpp PropCompare.h PropEditor.h PropGeneral.h
+ PropRegistry.h PropSyntaxColors.cpp PropSyntaxColors.h
+ PropVss.h SyntaxColors.cpp SyntaxColors.h resource.h
+ Src\Common: PreferencesDlg.cpp PreferencesDlg.h
+ Src/Languages/*: Merge*.rc
+ PATCH: [ 1439335 ] Reset cwd in Merge.cpp SelectFile
+ Src: Merge.cpp OpenDlg.cpp
+ PATCH: [ 1442082 ] Fix MakeDirs to not error if directory exists
+ Src\Common: coretools.cpp
+ PATCH: [ 1396506 ] customizable text colors
+ Add missing files
+ Src: new PropTextColors.cpp PropTextColors.h
+
+2006-03-03 Perry
+ PATCH: [ 1442699 ] New Changes.txt file for MakeResDll
+ Add Changes.txt change log (this file).
+ MakeResDll: new Changes.txt
+ PATCH: [ 1424636 ] New BuildOneLanguage.vbs & fix MakeResDll exit
+ MakeResDll: MakeResDll.cpp StdAfx.h
+ Src\Languages: BuildDll.bat BuildOneLanguage.vbs
+
+2006-03-03 Kimmo
+ PATCH: [ 1441387 ] Improve File Encoding dialog
+ Src: Merge.rc
+ Src/Languages/*: Merge*.rc
+ PATCH: [ 1442107 ] Move About-dialog code to separate files from Merge.cpp
+ Src: Merge.cpp Merge.dsp
+ Src new files: AboutDlg.cpp AboutDlg.h
+
+2006-03-02 Tim
+ PATCH: [ 1437770 ] Icons for 'Generate Patch' and 'Generate Report'
+ Src: MainFrm.cpp Merge.rc resource.h
+ Src/res new files: patch.bmp report.bmp
+
+2006-03-02 Kimmo
+ PATCH: [ 1441124 ] Improve filter test dialog
+ Src: Merge.rc
+ Src/Languages/*: Merge*.rc
+
+2006-03-01 Kimmo
+ PATCH: [ 1424535 ] Czech Translation, Submitted by Jan Hryz
+ Improve unpacker selection dialog and new filter location selection dialog
+ Src: Merge.rc
+ Src/Languages/*: Merge*.rc
+
+2006-03-01 Tim
+ PATCH: [ 1438233 ] New icons for 'notequalfile', 'lfile' and 'rfile'
+ Src/res: lfile.ico notequalfile.ico rfile.ico
+
+2006-03-01 Kimmo
+ PATCH: [ 1436855 ] Typo in lang files (change pactch to patch)
+ Src/Languages/*: Merge*.rc
+ BUG: [ 1440774 ] Test button for file filters enabled for no filter
+ Fix submitted by Gal Hammer
+ Src: FileFiltersDlg.cpp
+ PATCH: [ 1395847 ] Integration with Rational ClearCase
+ Submitted by Gal Hammer
+ Src: MainFrm.cpp MainFrm.h Merge.h MergeArgs.cpp MergeDoc.cpp MergeDoc.h
+ Src/Common: coretools.cpp coretools.h
+
+2006-02-28 Perry
+ BUG: [ 1439360 ] Native languages sometimes suppressed in Unicode Build
+ Add note to CLanguageSelect::GetNativeLanguageNameString
+ explaining why codepage check is done even for Unicode build.
+ Src/Common: LanguageSelect.cpp
+
+2006-02-27 Perry
+ BUG: [ 1439350 ] Russian language name in LanguageSelect?
+ Src/Common: LanguageSelect.cpp
+
+2006-02-26 Perry
+ PATCH: [ 1435470 ] Remove CTextFile
+ Src: Merge.dsp
+ Deleted Src\Common: textfile.cpp textfile.h
+ PATCH: [ 1439229 ] Fix CMergeDoc::SanityCheckD not to dereference illegal lines
+ BUG: [ 1438390 ] Crash when editting the attached files
+ Src: MergeDoc.cpp
+ PATCH: [ 1434007 ] Move source control code out of MainFrm.cpp
+ Src: MainFrm.cpp MainFrm.h Merge.dsp
+ New Src: SourceControl.cpp
+
+2006-02-24 Kimmo
+ PATCH: [ 1437758 ] Improve diff selection when selected diff not visible
+ Src: MergeEditView.cpp MergeEditView.h
+ PATCH: [ 1431607 ] Fix worddiff highlight error
+ Submitted by Perry
+ Src: stringdiffs.cpp
+
+2006-02-24 Tim
+ PATCH: [ 1437677 ] Various Updates in German Translation for WinMerge 2.5
+ Src/Languages/German: MergeGerman.rc
+
+2006-02-22 Kimmo
+ PATCH: [ 1435431 ] Fix GenerateReport lines
+ Submitted by Perry
+ Src: DirCmpReport.cpp
+ PATCH: [ 1395721 ] VS.NET 2003 warning of SEH bug
+ Src: Merge.dsp
+ PATCH: [ 1428686 ] Catalan translation update
+ By Jordi Vilar
+ Src/Languages/Catalan: MergeCatalan.rc
+ PATCH: [ 1430321 ] Swedish translation update and feedback on WinMerge 2.5.3.2
+ By Hans Eriksson
+ Src\Languages\Swedish: MergeSwedish.rc
+ PATCH: [ 1434270 ] Fix difference counts
+ Submitted by Perry
+ Src: DiffWrapper.cpp
+
+2006-02-21 Kimmo
+ PATCH: [ 1435384 ] Add context menu for diff pane
+ Src: Merge.rc MergeDiffDetailView.cpp MergeDiffDetailView.h resource.h
+ Src/Languages/*: Merge*.rc
+ PATCH: [ 1433125 ] Trap errors from filesystem during actions
+ Src: FileActionScript.cpp
+
+2006-02-21 Perry
+ PATCH: [ 1405603 ] New Test dialog for file filters
+ (Forgot to do all the language resources)
+ and misc RC file fixes (eg, many fixes in editor proppage)
+ New: Src/Languages: WinMerge_Resource_Discrepencies.txt
+
+2006-02-20 Perry
+ PATCH: [ 1405603 ] New Test dialog for file filters
+ Src: FileFilterMgr.cpp FileFilterMgr.h FileFiltersDlg.cpp
+ FileFiltersDlg.h Merge.dsp Merge.rc resource.h
+ Src new: TestFilterDlg.cpp TestFilterDlg.h
+ PATCH: [ 1433312 ] Add cvs tags to source files
+ Src: ByteComparator.cpp SharedFilterDlg.cpp StdAfx.cpp
+ TestFilterDlg.cpp TestFilterDlg.h ViewableWhitespace.cpp
+ Src/Common: SortHeaderCtrl.cpp SortHeaderCtrl.h UniFile.cpp
+ UniFile.h textfile.cpp textfile.h unicoder.cpp unicoder.h
+ varprop.cpp varprop.h version.cpp version.h
+
+2006-02-20 Kimmo
+ PATCH: [ 1178743 ] Disable lang menu if no additional langs installed
+ Src: Merge.cpp Merge.h
+ Src/Common: LanguageSelect.cpp LanguageSelect.h
+
+2006-02-19 Perry
+ PATCH: [ 1433931 ] Add comment before isBin checks in DirView
+ Src: DirView.cpp
+ PATCH: [ 1424153 ] Remove VTS_PUI1 from lwdisp.h
+ BUG: [ 1395475 ] VTS_UI1 & VTSPUI1 macro redefinition warnings (VS.NET)
+ Src\Common: lwdisp.h
+ PATCH: [ 1433927 ] Fix external editor default and messages
+ BUG: [ 1433774 ] default editor is blank
+ Src: MainFrm.cpp Merge.cpp Merge.rc OptionsInit.cpp resource.h
+ Src/Languages/*: Merge*.rc
+ PATCH: [ 1433353 ] Fix menu resources
+ Src: MainFrm.cpp Merge.cpp Merge.rc resource.h
+ Src/Languages/*: Merge*.rc
+
+2006-02-19 Christian
+ PATCH: [ 1429125 ] Return number of diffs instead of true/false
+ Src: MergeDoc.cpp
+
+2006-02-17 Perry
+ BUG: [ 1395483 ] Signed/unsigned mismatch warning from LocationView.cpp
+ Src: LocationView.cpp
+
+2006-02-16 Perry
+ BUG: [ 1395475 ] VTS_UI1 & VTSPUI1 macro redefinition warnings (VS.NET)
+ Fixed VTS_PUI1 (which previous patch for this bug missed).
+ Src\Common: lwdisp.h
+
+2006-02-16 Kimmo
+ PATCH: [ 1424535 ] Czech Translation, Submitted by Jan Hryz
+ Improve folder compare columns dialog (idea for new arrows from Catalan translation)
+ Src: Merge.rc
+ Src/Languages/*: Merge*.rc
+
+2006-02-16 Perry
+ PATCH: [ 1431771 ] Alter CheckTranslations.vbs to YesNoCancel
+ Src/Languages: CheckTranslations.vbs
+ PATCH: [ 1419582 ] Polish translation update for latest v2.5
+ Contributed by dr_prozac
+ Src/Languages/Polish: MergePolish.rc
+ PATCH: [ 1431846 ] Update Czech Translation
+ Contributed by Jan Hryz
+ Src/Languages/Czech: MergeCzech.rc
+ ShellExtension/Languages/ShellExtensionCzech.rc
+ A few control adjustments matching Czech to English (many left)
+ Src/Languages/Czech: MergeCzech.rc
+
+2006-02-15 Perry
+ PATCH: [ 1431636 ] IgnoreEOL broken in cvs trunk
+ Src: PropCompare.cpp
+
+2006-02-15 Kimmo
+ PATCH: [ 1431768 ] Write paths to patch files as given
+ Src: DiffWrapper.cpp
+
+2006-02-14 Perry
+ PATCH: [ 1431205 ] Fix ViewWhitespace \r\n bug
+ BUG: [ 1431012 ] View line differences adds additional EOL char
+ Src/editlib: ccrystaltextview.cpp
+ PATCH: [ 1431197 ] Fix off-by-one highlight error
+ Src: stringdiffs.cpp
+ Fix button movement on LanguageSelect (broken by PATCH#1423461).
+ Also add cvs id comment at top, and doxygen file label.
+ Src\Common: LanguageSelect.cpp
+
+2006-02-14 Kimmo
+ BUG: [ 1197976 ] GeneratePatch file browse not intialized correctly
+ Fix submitted by Perry
+ Src: PatchDlg.cpp
+
+2006-02-14 Perry
+ PATCH: [ 1431131 ] Fix VS.NET 2003 compilation
+ Src\Common: coretools.cpp scbarg.cpp scbarg.h sizecbar.cpp sizecbar.h
+ Shrink Swedish dialog IDD_PROPPAGE_LARGE to same size as English
+ (all controls already were the same size anyway)
+ Src\Languages\Swedish: MergeSwedish.rc
+
+2006-02-13 Perry
+ PATCH: [ 1212124 ] File encoding GUI
+ Src: DiffContext.cpp DiffFileInfo.cpp DiffFileInfo.h DiffItem.cpp
+ DiffItem.h DiffThread.cpp DiffWrapper.cpp DirActions.cpp
+ DirScan.cpp DirView.cpp DirView.h DirViewColItems.cpp FileLocation.h
+ MainFrm.cpp Merge.dsp Merge.rc MergeDoc.cpp MergeDoc.h OpenDlg.cpp
+ codepage_detect.cpp codepage_detect.h resource.h
+ NEW Src: FileTextEncoding.cpp FileTextEncoding.h IntToIntMap.h
+ LoadSaveCodepageDlg.cpp LoadSaveCodepageDlg.h MergeDocEncoding.cpp
+ dlgutil.cpp dlgutil.h
+
+2006-02-12 Perry
+ Adjust whitespace to match English translation
+ Also update Russian options/editor controls to match English
+ Src\Languages\Russian: MergeRussian.rc
+ Src\Languages\Slovak: MergeSlovak.rc
+ Src\Languages\Swedish: MergeSwedish.rc
+ Src\Languages\Turkish: MergeTurkish.rc
+ PATCH: [ 1424681 ] Widen labels on unpacker dialog
+ Src: Merge.rc
+ Src\Languages: Merge*.rc
+
+2006-02-11 Perry
+ PATCH: [ 1429517 ] Fix core...
[truncated message content] |
|
From: <ge...@us...> - 2006-10-12 20:12:12
|
Revision: 3714
http://svn.sourceforge.net/winmerge/?rev=3714&view=rev
Author: gerundt
Date: 2006-10-12 13:11:57 -0700 (Thu, 12 Oct 2006)
Log Message:
-----------
PATCH: [ 1575541 ] Web: Generator for Tracker Shortcuts
Modified Paths:
--------------
trunk/Web/Changes.txt
Added Paths:
-----------
trunk/Web/developer/tracker-shortcuts.php
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-10-12 16:08:27 UTC (rev 3713)
+++ trunk/Web/Changes.txt 2006-10-12 20:11:57 UTC (rev 3714)
@@ -1,3 +1,7 @@
+2006-10-12 Tim
+ PATCH: [ 1575541 ] Web: Generator for Tracker Shortcuts
+ Web\developer: new file tracker-shortcuts.php
+
2006-10-08 Tim
PATCH: [ 1573243 ] Web: Add info and link for developers-wiki
Web\developer: needed.php
Added: trunk/Web/developer/tracker-shortcuts.php
===================================================================
--- trunk/Web/developer/tracker-shortcuts.php (rev 0)
+++ trunk/Web/developer/tracker-shortcuts.php 2006-10-12 20:11:57 UTC (rev 3714)
@@ -0,0 +1,51 @@
+<?php
+ include('../page.inc');
+
+ $page = new Page;
+ $page->printHead('WinMerge: Tracker Shortcuts', WINMERGE_DEV);
+?>
+<h2>Tracker Shortcuts</h2>
+<p><em>Tracker Shortcuts</em> are shorter and nicer URLs to <a href="http://sourceforge.net/tracker/?group_id=13216">Tracker</a>
+items from our <a href="http://sourceforge.net/projects/winmerge">SF.net project page</a>.</p>
+<p>You can use this page, to create a shortcut:</p>
+<?php
+ $types['bug'] = 'Bug';
+ $types['patch'] = 'Patch';
+ $types['support'] = 'Support Request';
+ $types['rfe'] = 'Feature Request';
+ $types['todo'] = 'Todo Item';
+?>
+<form action="tracker-shortcuts.php" method="post">
+<table>
+ <tr>
+ <td><label for="type">Type:</label></td>
+ <td>
+ <select name="type" id="type" size="1">
+<?php
+ foreach ($types as $value => $name) { //For all types...
+ if ($value == $_POST['type']) $selected = ' selected="selected"'; else $selected = '';
+ echo " <option value=\"" . $value . "\"" . $selected . ">" . $name . "</option>\n";
+ }
+?>
+ </select>
+ </td>
+ <td rowspan="2" valign="bottom">
+ <input type="submit" name="submit" value="Generate" />
+ </td>
+ </tr>
+ <tr>
+ <td><label for="id">ID:</label></td>
+ <td>
+ <input type="text" name="id" id="id" size="8" maxlength="8" value="<?php echo htmlentities($_POST['id']); ?>" />
+ </td>
+ </tr>
+</table>
+</form>
+<?php
+ if (isset($_POST['type']) && ($_POST['type'] != '') && isset($_POST['id']) && ($_POST['id'] > 0)) {
+ echo "<p />\n";
+ echo "<p style=\"font-size:larger;\"><code>http://winmerge.org/" . htmlentities($_POST['type']) . "/" . htmlentities($_POST['id']) . "</code></p>\n";
+ echo "<p />\n";
+ }
+ $page->printFoot();
+?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-12 16:08:54
|
Revision: 3713
http://svn.sourceforge.net/winmerge/?rev=3713&view=rev
Author: kimmov
Date: 2006-10-12 09:08:27 -0700 (Thu, 12 Oct 2006)
Log Message:
-----------
Create a 2.6.0 release tag (R2_6_0)
Added Paths:
-----------
tags/R2_6_0/
Copied: tags/R2_6_0 (from rev 3712, branches/R2_6)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-12 16:06:54
|
Revision: 3712
http://svn.sourceforge.net/winmerge/?rev=3712&view=rev
Author: kimmov
Date: 2006-10-12 09:06:47 -0700 (Thu, 12 Oct 2006)
Log Message:
-----------
2.6.0 Stable Release (R3712)
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2006-10-12 15:48:56 UTC (rev 3711)
+++ branches/R2_6/Src/Changes.txt 2006-10-12 16:06:47 UTC (rev 3712)
@@ -2,6 +2,8 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-10-12 2.6.0 Stable Release (R3712)
+
2006-10-12 Kimmo
Fix building catalan language file
Src/Languages/Catalan: MergeCatalan.rc
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-12 15:49:05
|
Revision: 3711
http://svn.sourceforge.net/winmerge/?rev=3711&view=rev
Author: kimmov
Date: 2006-10-12 08:48:56 -0700 (Thu, 12 Oct 2006)
Log Message:
-----------
Fix building catalan language file
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2006-10-12 15:36:26 UTC (rev 3710)
+++ branches/R2_6/Src/Changes.txt 2006-10-12 15:48:56 UTC (rev 3711)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-10-12 Kimmo
+ Fix building catalan language file
+ Src/Languages/Catalan: MergeCatalan.rc
+
2006-10-11 Kimmo
PATCH: [ 1574696 ] Fix problem in saving filefilter to project file
Src: ProjectFilePathsDlg.cpp
Modified: branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc
===================================================================
--- branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc 2006-10-12 15:36:26 UTC (rev 3710)
+++ branches/R2_6/Src/Languages/Catalan/MergeCatalan.rc 2006-10-12 15:48:56 UTC (rev 3711)
@@ -2011,7 +2011,7 @@
IDS_COMPMETHOD_QUICK_CONTENTS "Contingut en un cop d'ull"
IDS_COMPMETHOD_MODDATE "Data de modificaci\xF3"
IDS_COMPMETHOD_DATESIZE "Data de modificaci\xF3 i mida"
- IDS_COMPMETHOD_SIZE "Mida
+ IDS_COMPMETHOD_SIZE "Mida"
END
// FILTER OPTIONS
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-12 15:36:38
|
Revision: 3710
http://svn.sourceforge.net/winmerge/?rev=3710&view=rev
Author: kimmov
Date: 2006-10-12 08:36:26 -0700 (Thu, 12 Oct 2006)
Log Message:
-----------
Set version- and revision numbers for 2.6.0 release.
Modified Paths:
--------------
branches/R2_6/Docs/Users/Manual/Changes.txt
branches/R2_6/Docs/Users/Manual/WinMerge_help.xml
Modified: branches/R2_6/Docs/Users/Manual/Changes.txt
===================================================================
--- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-11 21:21:33 UTC (rev 3709)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-12 15:36:26 UTC (rev 3710)
@@ -1,3 +1,7 @@
+2006-10-12 Kimmo
+ Set version- and revision numbers for 2.6.0 release.
+ Manual: WinMerge_help.xml
+
2006-10-11 Kimmo
PATCH: [ 1574644 ] Manual: Fix cvs id-line in filters-doc
Manual: Filters.xml
Modified: branches/R2_6/Docs/Users/Manual/WinMerge_help.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/WinMerge_help.xml 2006-10-11 21:21:33 UTC (rev 3709)
+++ branches/R2_6/Docs/Users/Manual/WinMerge_help.xml 2006-10-12 15:36:26 UTC (rev 3710)
@@ -22,11 +22,11 @@
]>
<article id="index">
<articleinfo>
- <title>WinMerge 2.5 Manual</title>
+ <title>WinMerge 2.6 Manual</title>
<productname>WinMerge</productname>
- <releaseinfo><emphasis>Revision 1.2.7</emphasis></releaseinfo>
+ <releaseinfo><emphasis>Revision 1.2.8</emphasis></releaseinfo>
<copyright>
<year>2004-2006</year>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-11 21:21:41
|
Revision: 3709
http://svn.sourceforge.net/winmerge/?rev=3709&view=rev
Author: kimmov
Date: 2006-10-11 14:21:33 -0700 (Wed, 11 Oct 2006)
Log Message:
-----------
PATCH: [ 1574644 ] Manual: Fix cvs id-line in filters-doc
Modified Paths:
--------------
branches/R2_6/Docs/Users/Manual/Changes.txt
branches/R2_6/Docs/Users/Manual/Filters.xml
Modified: branches/R2_6/Docs/Users/Manual/Changes.txt
===================================================================
--- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-11 21:18:37 UTC (rev 3708)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-11 21:21:33 UTC (rev 3709)
@@ -1,3 +1,7 @@
+2006-10-11 Kimmo
+ PATCH: [ 1574644 ] Manual: Fix cvs id-line in filters-doc
+ Manual: Filters.xml
+
2006-10-10 Kimmo
PATCH: [ 1573933 ] Manual: Update introduction chapter
Manual: Introduction.xml
Modified: branches/R2_6/Docs/Users/Manual/Filters.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Filters.xml 2006-10-11 21:18:37 UTC (rev 3708)
+++ branches/R2_6/Docs/Users/Manual/Filters.xml 2006-10-11 21:21:33 UTC (rev 3709)
@@ -110,7 +110,7 @@
<para>User-defined folder. Selected in Options (<menuchoice>
<guimenu>Edit</guimenu>
- <guimenuitem>Options </guimenuitem>
+ <guimenuitem>Options</guimenuitem>
</menuchoice><guilabel>> System >
</guilabel><guilabel>Filter Folder)</guilabel>. By default it is
<filename class="directory">My Documents</filename> -folder.</para>
@@ -292,9 +292,10 @@
<example>
<title>Line filter rule matching CVS "Id:" -lines:</title>
- <para>Id-lines are like this:</para>
+ <para>Id-lines are like this (dollar-char not written so that version
+ control does not mess up that line):</para>
- <screen>// $Id$</screen>
+ <screen>// [dollar-char]Id: Filters.xml,v 1.14.2.2 2005/10/29 17:21:16 kimmov Exp [dollar-char]</screen>
<para>And they can be filtered with rule:</para>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-11 21:18:45
|
Revision: 3708
http://svn.sourceforge.net/winmerge/?rev=3708&view=rev
Author: kimmov
Date: 2006-10-11 14:18:37 -0700 (Wed, 11 Oct 2006)
Log Message:
-----------
PATCH: [ 1574644 ] Manual: Fix cvs id-line in filters-doc
Modified Paths:
--------------
trunk/Docs/Users/Manual/Changes.txt
trunk/Docs/Users/Manual/Filters.xml
Modified: trunk/Docs/Users/Manual/Changes.txt
===================================================================
--- trunk/Docs/Users/Manual/Changes.txt 2006-10-11 15:50:56 UTC (rev 3707)
+++ trunk/Docs/Users/Manual/Changes.txt 2006-10-11 21:18:37 UTC (rev 3708)
@@ -1,3 +1,7 @@
+2006-10-11 Kimmo
+ PATCH: [ 1574644 ] Manual: Fix cvs id-line in filters-doc
+ Manual: Filters.xml
+
2006-10-10 Kimmo
PATCH: [ 1573933 ] Manual: Update introduction chapter
Manual: Introduction.xml
Modified: trunk/Docs/Users/Manual/Filters.xml
===================================================================
--- trunk/Docs/Users/Manual/Filters.xml 2006-10-11 15:50:56 UTC (rev 3707)
+++ trunk/Docs/Users/Manual/Filters.xml 2006-10-11 21:18:37 UTC (rev 3708)
@@ -110,7 +110,7 @@
<para>User-defined folder. Selected in Options (<menuchoice>
<guimenu>Edit</guimenu>
- <guimenuitem>Options </guimenuitem>
+ <guimenuitem>Options</guimenuitem>
</menuchoice><guilabel>> System >
</guilabel><guilabel>Filter Folder)</guilabel>. By default it is
<filename class="directory">My Documents</filename> -folder.</para>
@@ -292,9 +292,10 @@
<example>
<title>Line filter rule matching CVS "Id:" -lines:</title>
- <para>Id-lines are like this:</para>
+ <para>Id-lines are like this (dollar-char not written so that version
+ control does not mess up that line):</para>
- <screen>// $Id$</screen>
+ <screen>// [dollar-char]Id: Filters.xml,v 1.14.2.2 2005/10/29 17:21:16 kimmov Exp [dollar-char]</screen>
<para>And they can be filtered with rule:</para>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-11 15:51:03
|
Revision: 3707
http://svn.sourceforge.net/winmerge/?rev=3707&view=rev
Author: kimmov
Date: 2006-10-11 08:50:56 -0700 (Wed, 11 Oct 2006)
Log Message:
-----------
PATCH: [ 1574696 ] Fix problem in saving filefilter to project file
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/ProjectFilePathsDlg.cpp
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2006-10-11 15:46:09 UTC (rev 3706)
+++ branches/R2_6/Src/Changes.txt 2006-10-11 15:50:56 UTC (rev 3707)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-10-11 Kimmo
+ PATCH: [ 1574696 ] Fix problem in saving filefilter to project file
+ Src: ProjectFilePathsDlg.cpp
+
2006-10-10 Takashi
BUG: [ 1573240 ] Crash in subversion trunk
Src: MainFrm.cpp MainFrm.h OptionsInit.cpp
Modified: branches/R2_6/Src/ProjectFilePathsDlg.cpp
===================================================================
--- branches/R2_6/Src/ProjectFilePathsDlg.cpp 2006-10-11 15:46:09 UTC (rev 3706)
+++ branches/R2_6/Src/ProjectFilePathsDlg.cpp 2006-10-11 15:50:56 UTC (rev 3707)
@@ -158,6 +158,13 @@
{
UpdateData(TRUE);
+ m_sLeftFile.TrimLeft();
+ m_sLeftFile.TrimRight();
+ m_sLeftFile.TrimLeft();
+ m_sLeftFile.TrimRight();
+ m_sFilter.TrimLeft();
+ m_sFilter.TrimRight();
+
CString fileName = AskProjectFileName(FALSE);
if (fileName.IsEmpty())
return;
@@ -169,7 +176,17 @@
if (!m_sRightFile.IsEmpty())
project.SetRight(m_sRightFile, &m_bRightPathReadOnly);
if (!m_sFilter.IsEmpty())
+ {
+ // Remove possbile prefix from the filter name
+ CString prefix = LoadResString(IDS_FILTER_PREFIX);
+ int ind = m_sFilter.Find(prefix, 0);
+ if (ind == 0)
+ {
+ m_sFilter.Delete(0, prefix.GetLength());
+ }
+ m_sFilter.TrimLeft();
project.SetFilter(m_sFilter);
+ }
project.SetSubfolders(m_bIncludeSubfolders);
CString sErr;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-11 15:46:23
|
Revision: 3706
http://svn.sourceforge.net/winmerge/?rev=3706&view=rev
Author: kimmov
Date: 2006-10-11 08:46:09 -0700 (Wed, 11 Oct 2006)
Log Message:
-----------
PATCH: [ 1574696 ] Fix problem in saving filefilter to project file
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/ProjectFilePathsDlg.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-10-10 18:21:23 UTC (rev 3705)
+++ trunk/Src/Changes.txt 2006-10-11 15:46:09 UTC (rev 3706)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-10-11 Kimmo
+ PATCH: [ 1574696 ] Fix problem in saving filefilter to project file
+ Src: ProjectFilePathsDlg.cpp
+
2006-10-10 Takashi
BUG: [ 1573240 ] Crash in subversion trunk
Src: MainFrm.cpp MainFrm.h OptionsInit.cpp
Modified: trunk/Src/ProjectFilePathsDlg.cpp
===================================================================
--- trunk/Src/ProjectFilePathsDlg.cpp 2006-10-10 18:21:23 UTC (rev 3705)
+++ trunk/Src/ProjectFilePathsDlg.cpp 2006-10-11 15:46:09 UTC (rev 3706)
@@ -158,6 +158,13 @@
{
UpdateData(TRUE);
+ m_sLeftFile.TrimLeft();
+ m_sLeftFile.TrimRight();
+ m_sLeftFile.TrimLeft();
+ m_sLeftFile.TrimRight();
+ m_sFilter.TrimLeft();
+ m_sFilter.TrimRight();
+
CString fileName = AskProjectFileName(FALSE);
if (fileName.IsEmpty())
return;
@@ -169,7 +176,17 @@
if (!m_sRightFile.IsEmpty())
project.SetRight(m_sRightFile, &m_bRightPathReadOnly);
if (!m_sFilter.IsEmpty())
+ {
+ // Remove possbile prefix from the filter name
+ CString prefix = LoadResString(IDS_FILTER_PREFIX);
+ int ind = m_sFilter.Find(prefix, 0);
+ if (ind == 0)
+ {
+ m_sFilter.Delete(0, prefix.GetLength());
+ }
+ m_sFilter.TrimLeft();
project.SetFilter(m_sFilter);
+ }
project.SetSubfolders(m_bIncludeSubfolders);
CString sErr;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2006-10-10 18:21:34
|
Revision: 3705
http://svn.sourceforge.net/winmerge/?rev=3705&view=rev
Author: sdottaka
Date: 2006-10-10 11:21:23 -0700 (Tue, 10 Oct 2006)
Log Message:
-----------
BUG: [ 1573240 ] Crash in subversion trunk
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/MainFrm.cpp
branches/R2_6/Src/MainFrm.h
branches/R2_6/Src/OptionsInit.cpp
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2006-10-10 18:18:22 UTC (rev 3704)
+++ branches/R2_6/Src/Changes.txt 2006-10-10 18:21:23 UTC (rev 3705)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-10-10 Takashi
+ BUG: [ 1573240 ] Crash in subversion trunk
+ Src: MainFrm.cpp MainFrm.h OptionsInit.cpp
+
2006-10-09 Takashi
BUG: [ 1570259 ] Bookmarks GUI get reset after save
Src/editlib: ccrystaltextview.cpp
Modified: branches/R2_6/Src/MainFrm.cpp
===================================================================
--- branches/R2_6/Src/MainFrm.cpp 2006-10-10 18:18:22 UTC (rev 3704)
+++ branches/R2_6/Src/MainFrm.cpp 2006-10-10 18:21:23 UTC (rev 3705)
@@ -241,26 +241,7 @@
CString pathMyFolders = m_options.GetString(OPT_FILTER_USERPATH);
if (pathMyFolders.IsEmpty())
{
- pathMyFolders = paths_GetMyDocuments(GetSafeHwnd());
- CString pathFilters(pathMyFolders);
- if (pathFilters.Right(1) != _T("\\"))
- pathFilters += _T("\\");
- pathFilters += DefaultRelativeFilterPath;
-
- if (!paths_CreateIfNeeded(pathFilters))
- {
- // Failed to create a folder, check it didn't already
- // exist.
- DWORD errCode = GetLastError();
- if (errCode != ERROR_ALREADY_EXISTS)
- {
- // Failed to create a folder for filters, fallback to
- // "My Documents"-folder. It is not worth the trouble to
- // bother user about this or user more clever solutions.
- pathFilters = pathMyFolders;
- }
- }
-
+ CString pathFilters = GetDefaultFilterUserPath();
m_options.SaveOption(OPT_FILTER_USERPATH, pathFilters);
theApp.m_globalFileFilter.SetFileFilterPath(pathFilters);
}
@@ -2339,6 +2320,33 @@
return path;
}
+/**
+ * @brief Get default user filter folder path
+ */
+CString CMainFrame::GetDefaultFilterUserPath()
+{
+ CString pathMyFolders = paths_GetMyDocuments(GetSafeHwnd());
+ CString pathFilters(pathMyFolders);
+ if (pathFilters.Right(1) != _T("\\"))
+ pathFilters += _T("\\");
+ pathFilters += DefaultRelativeFilterPath;
+
+ if (!paths_CreateIfNeeded(pathFilters))
+ {
+ // Failed to create a folder, check it didn't already
+ // exist.
+ DWORD errCode = GetLastError();
+ if (errCode != ERROR_ALREADY_EXISTS)
+ {
+ // Failed to create a folder for filters, fallback to
+ // "My Documents"-folder. It is not worth the trouble to
+ // bother user about this or user more clever solutions.
+ pathFilters = pathMyFolders;
+ }
+ }
+ return pathFilters;
+}
+
typedef enum { ToConfigLog, FromConfigLog } ConfigLogDirection;
/**
Modified: branches/R2_6/Src/MainFrm.h
===================================================================
--- branches/R2_6/Src/MainFrm.h 2006-10-10 18:18:22 UTC (rev 3704)
+++ branches/R2_6/Src/MainFrm.h 2006-10-10 18:21:23 UTC (rev 3705)
@@ -117,6 +117,7 @@
void ApplyViewWhitespace();
BOOL OpenFileToExternalEditor(CString file);
CString GetDefaultEditor();
+ CString GetDefaultFilterUserPath();
void SetEOLMixed(BOOL bAllow);
void SelectFilter();
void ShowVSSError(CException *e, CString strItem);
Modified: branches/R2_6/Src/OptionsInit.cpp
===================================================================
--- branches/R2_6/Src/OptionsInit.cpp 2006-10-10 18:18:22 UTC (rev 3704)
+++ branches/R2_6/Src/OptionsInit.cpp 2006-10-10 18:21:23 UTC (rev 3705)
@@ -112,7 +112,7 @@
m_options.InitOption(OPT_LINEFILTER_ENABLED, false);
m_options.InitOption(OPT_LINEFILTER_REGEXP, _T(""));
m_options.InitOption(OPT_FILEFILTER_CURRENT, _T("*.*"));
- m_options.InitOption(OPT_FILTER_USERPATH, _T(""));
+ m_options.InitOption(OPT_FILTER_USERPATH, GetDefaultFilterUserPath());
m_options.InitOption(OPT_CP_DEFAULT_MODE, (int)0);
m_options.InitOption(OPT_CP_DEFAULT_CUSTOM, (int)GetACP());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2006-10-10 18:18:30
|
Revision: 3704
http://svn.sourceforge.net/winmerge/?rev=3704&view=rev
Author: sdottaka
Date: 2006-10-10 11:18:22 -0700 (Tue, 10 Oct 2006)
Log Message:
-----------
BUG: [ 1573240 ] Crash in subversion trunk
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/MainFrm.cpp
trunk/Src/MainFrm.h
trunk/Src/OptionsInit.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-10-10 16:25:25 UTC (rev 3703)
+++ trunk/Src/Changes.txt 2006-10-10 18:18:22 UTC (rev 3704)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+2006-10-10 Takashi
+ BUG: [ 1573240 ] Crash in subversion trunk
+ Src: MainFrm.cpp MainFrm.h OptionsInit.cpp
+
2006-10-09 Takashi
BUG: [ 1570259 ] Bookmarks GUI get reset after save
Src/editlib: ccrystaltextview.cpp
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2006-10-10 16:25:25 UTC (rev 3703)
+++ trunk/Src/MainFrm.cpp 2006-10-10 18:18:22 UTC (rev 3704)
@@ -241,26 +241,7 @@
CString pathMyFolders = m_options.GetString(OPT_FILTER_USERPATH);
if (pathMyFolders.IsEmpty())
{
- pathMyFolders = paths_GetMyDocuments(GetSafeHwnd());
- CString pathFilters(pathMyFolders);
- if (pathFilters.Right(1) != _T("\\"))
- pathFilters += _T("\\");
- pathFilters += DefaultRelativeFilterPath;
-
- if (!paths_CreateIfNeeded(pathFilters))
- {
- // Failed to create a folder, check it didn't already
- // exist.
- DWORD errCode = GetLastError();
- if (errCode != ERROR_ALREADY_EXISTS)
- {
- // Failed to create a folder for filters, fallback to
- // "My Documents"-folder. It is not worth the trouble to
- // bother user about this or user more clever solutions.
- pathFilters = pathMyFolders;
- }
- }
-
+ CString pathFilters = GetDefaultFilterUserPath();
m_options.SaveOption(OPT_FILTER_USERPATH, pathFilters);
theApp.m_globalFileFilter.SetFileFilterPath(pathFilters);
}
@@ -2339,6 +2320,33 @@
return path;
}
+/**
+ * @brief Get default user filter folder path
+ */
+CString CMainFrame::GetDefaultFilterUserPath()
+{
+ CString pathMyFolders = paths_GetMyDocuments(GetSafeHwnd());
+ CString pathFilters(pathMyFolders);
+ if (pathFilters.Right(1) != _T("\\"))
+ pathFilters += _T("\\");
+ pathFilters += DefaultRelativeFilterPath;
+
+ if (!paths_CreateIfNeeded(pathFilters))
+ {
+ // Failed to create a folder, check it didn't already
+ // exist.
+ DWORD errCode = GetLastError();
+ if (errCode != ERROR_ALREADY_EXISTS)
+ {
+ // Failed to create a folder for filters, fallback to
+ // "My Documents"-folder. It is not worth the trouble to
+ // bother user about this or user more clever solutions.
+ pathFilters = pathMyFolders;
+ }
+ }
+ return pathFilters;
+}
+
typedef enum { ToConfigLog, FromConfigLog } ConfigLogDirection;
/**
Modified: trunk/Src/MainFrm.h
===================================================================
--- trunk/Src/MainFrm.h 2006-10-10 16:25:25 UTC (rev 3703)
+++ trunk/Src/MainFrm.h 2006-10-10 18:18:22 UTC (rev 3704)
@@ -117,6 +117,7 @@
void ApplyViewWhitespace();
BOOL OpenFileToExternalEditor(CString file);
CString GetDefaultEditor();
+ CString GetDefaultFilterUserPath();
void SetEOLMixed(BOOL bAllow);
void SelectFilter();
void ShowVSSError(CException *e, CString strItem);
Modified: trunk/Src/OptionsInit.cpp
===================================================================
--- trunk/Src/OptionsInit.cpp 2006-10-10 16:25:25 UTC (rev 3703)
+++ trunk/Src/OptionsInit.cpp 2006-10-10 18:18:22 UTC (rev 3704)
@@ -112,7 +112,7 @@
m_options.InitOption(OPT_LINEFILTER_ENABLED, false);
m_options.InitOption(OPT_LINEFILTER_REGEXP, _T(""));
m_options.InitOption(OPT_FILEFILTER_CURRENT, _T("*.*"));
- m_options.InitOption(OPT_FILTER_USERPATH, _T(""));
+ m_options.InitOption(OPT_FILTER_USERPATH, GetDefaultFilterUserPath());
m_options.InitOption(OPT_CP_DEFAULT_MODE, (int)0);
m_options.InitOption(OPT_CP_DEFAULT_CUSTOM, (int)GetACP());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-10 16:25:33
|
Revision: 3703
http://svn.sourceforge.net/winmerge/?rev=3703&view=rev
Author: kimmov
Date: 2006-10-10 09:25:25 -0700 (Tue, 10 Oct 2006)
Log Message:
-----------
Fix invalid links in Introduction, added in patch #1573933
Modified Paths:
--------------
branches/R2_6/Docs/Users/Manual/Changes.txt
branches/R2_6/Docs/Users/Manual/Introduction.xml
Modified: branches/R2_6/Docs/Users/Manual/Changes.txt
===================================================================
--- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-10 16:23:54 UTC (rev 3702)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-10 16:25:25 UTC (rev 3703)
@@ -3,6 +3,8 @@
Manual: Introduction.xml
PATCH: [ 1573938 ] Manual: Update whatsnew for 2.6 release
Manual: Whatsnew.xml
+ Fix invalid links in Introduction, added in patch #1573933
+ Manual: Introduction.xml
2006-10-07 Tim
BUG: [ 1572388 ] Wrong link to regex.pdf
Modified: branches/R2_6/Docs/Users/Manual/Introduction.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Introduction.xml 2006-10-10 16:23:54 UTC (rev 3702)
+++ branches/R2_6/Docs/Users/Manual/Introduction.xml 2006-10-10 16:25:25 UTC (rev 3703)
@@ -229,12 +229,13 @@
<para><ulink
url="http://winmerge.sourceforge.net/developer/index.php">Developer
pages</ulink> are good start if you want to help with development. We
- have also created a <link linkend="???"><ulink
- url="http://wiki.winmerge.org/">Developers-Wiki</ulink></link> for
- developer documentation.</para>
+ have also created a <ulink
+ url="http://wiki.winmerge.org/">Developers-Wiki</ulink> for developer
+ documentation.</para>
- <para><ulink url="???">Development-mailing</ulink> list is the preferred
- place for development discussions. Another place is in <ulink
+ <para><ulink url="https://sourceforge.net/mail/?group_id=13216">
+ Development-mailing</ulink> list is the preferred place for development
+ discussions. Another place is in <ulink
url="http://sourceforge.net/forum/forum.php?forum_id=41639">Developers-forum</ulink>.
If you are interested in helping with WinMerge development, let us know.
If you want to fix one of our <ulink
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-10 16:24:06
|
Revision: 3702
http://svn.sourceforge.net/winmerge/?rev=3702&view=rev
Author: kimmov
Date: 2006-10-10 09:23:54 -0700 (Tue, 10 Oct 2006)
Log Message:
-----------
Fix invalid links in Introduction, added in patch #1573933
Modified Paths:
--------------
trunk/Docs/Users/Manual/Changes.txt
trunk/Docs/Users/Manual/Introduction.xml
Modified: trunk/Docs/Users/Manual/Changes.txt
===================================================================
--- trunk/Docs/Users/Manual/Changes.txt 2006-10-10 15:41:54 UTC (rev 3701)
+++ trunk/Docs/Users/Manual/Changes.txt 2006-10-10 16:23:54 UTC (rev 3702)
@@ -3,6 +3,8 @@
Manual: Introduction.xml
PATCH: [ 1573938 ] Manual: Update whatsnew for 2.6 release
Manual: Whatsnew.xml
+ Fix invalid links in Introduction, added in patch #1573933
+ Manual: Introduction.xml
2006-10-07 Tim
BUG: [ 1572388 ] Wrong link to regex.pdf
Modified: trunk/Docs/Users/Manual/Introduction.xml
===================================================================
--- trunk/Docs/Users/Manual/Introduction.xml 2006-10-10 15:41:54 UTC (rev 3701)
+++ trunk/Docs/Users/Manual/Introduction.xml 2006-10-10 16:23:54 UTC (rev 3702)
@@ -229,12 +229,13 @@
<para><ulink
url="http://winmerge.sourceforge.net/developer/index.php">Developer
pages</ulink> are good start if you want to help with development. We
- have also created a <link linkend="???"><ulink
- url="http://wiki.winmerge.org/">Developers-Wiki</ulink></link> for
- developer documentation.</para>
+ have also created a <ulink
+ url="http://wiki.winmerge.org/">Developers-Wiki</ulink> for developer
+ documentation.</para>
- <para><ulink url="???">Development-mailing</ulink> list is the preferred
- place for development discussions. Another place is in <ulink
+ <para><ulink url="https://sourceforge.net/mail/?group_id=13216">
+ Development-mailing</ulink> list is the preferred place for development
+ discussions. Another place is in <ulink
url="http://sourceforge.net/forum/forum.php?forum_id=41639">Developers-forum</ulink>.
If you are interested in helping with WinMerge development, let us know.
If you want to fix one of our <ulink
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-10 15:42:03
|
Revision: 3701
http://svn.sourceforge.net/winmerge/?rev=3701&view=rev
Author: kimmov
Date: 2006-10-10 08:41:54 -0700 (Tue, 10 Oct 2006)
Log Message:
-----------
PATCH: [ 1573938 ] Manual: Update whatsnew for 2.6 release
Modified Paths:
--------------
branches/R2_6/Docs/Users/Manual/Changes.txt
branches/R2_6/Docs/Users/Manual/Whatsnew.xml
Modified: branches/R2_6/Docs/Users/Manual/Changes.txt
===================================================================
--- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-10 15:39:18 UTC (rev 3700)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-10 15:41:54 UTC (rev 3701)
@@ -1,6 +1,8 @@
2006-10-10 Kimmo
PATCH: [ 1573933 ] Manual: Update introduction chapter
Manual: Introduction.xml
+ PATCH: [ 1573938 ] Manual: Update whatsnew for 2.6 release
+ Manual: Whatsnew.xml
2006-10-07 Tim
BUG: [ 1572388 ] Wrong link to regex.pdf
Modified: branches/R2_6/Docs/Users/Manual/Whatsnew.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Whatsnew.xml 2006-10-10 15:39:18 UTC (rev 3700)
+++ branches/R2_6/Docs/Users/Manual/Whatsnew.xml 2006-10-10 15:41:54 UTC (rev 3701)
@@ -3,11 +3,10 @@
<title>What's new in release</title>
<sect2>
- <title>What's new in 2.5</title>
+ <title>What's new in 2.6</title>
- <para>WinMerge 2.5 is our development version. It contains lots of fixes
- and improvements done after 2.4 releases. This list contains few most
- important ones:</para>
+ <para>WinMerge 2.6 release has some long-waited new features plus
+ important usability and stability fixes.</para>
<itemizedlist>
<listitem>
@@ -119,8 +118,8 @@
</listitem>
<listitem>
- <simpara>Path to archive file and path inside archive is shown instead
- of path to temporary folder</simpara>
+ <simpara>Path to archive file and path inside archive is shown
+ instead of path to temporary folder</simpara>
</listitem>
</itemizedlist>
</sect3>
@@ -142,8 +141,8 @@
</listitem>
<listitem>
- <simpara>Compare statepane shows progressbar and compared/total amount
- of items</simpara>
+ <simpara>Compare statepane shows progressbar and compared/total
+ amount of items</simpara>
</listitem>
<listitem>
@@ -183,12 +182,13 @@
</listitem>
<listitem>
- <simpara>Opening files to external editor from file compare</simpara>
+ <simpara>Opening files to external editor from file
+ compare</simpara>
</listitem>
<listitem>
- <simpara>Punctuation characters can break diffs in line differences (so
- numbers separated by commas get properly highlighted as
+ <simpara>Punctuation characters can break diffs in line differences
+ (so numbers separated by commas get properly highlighted as
diffs)</simpara>
</listitem>
</itemizedlist>
@@ -281,8 +281,9 @@
<itemizedlist>
<listitem>
- <simpara>More columns have been added (e.g. file sizes and attributes),
- and columns may be reordered, hidden, and displayed.</simpara>
+ <simpara>More columns have been added (e.g. file sizes and
+ attributes), and columns may be reordered, hidden, and
+ displayed.</simpara>
</listitem>
<listitem>
@@ -292,9 +293,9 @@
</listitem>
<listitem>
- <simpara>There is a new floating statusbar during the compare process,
- and comparison may be aborted, and the the files/dirs compared so
- far are shown.</simpara>
+ <simpara>There is a new floating statusbar during the compare
+ process, and comparison may be aborted, and the the files/dirs
+ compared so far are shown.</simpara>
</listitem>
<listitem>
@@ -308,7 +309,8 @@
</listitem>
<listitem>
- <simpara>The number of selected items is shown in the statusbar.</simpara>
+ <simpara>The number of selected items is shown in the
+ statusbar.</simpara>
</listitem>
</itemizedlist>
</sect3>
@@ -329,8 +331,8 @@
</listitem>
<listitem>
- <simpara>Enhanced EOL handling (files can contain different EOL styles
- in one file).</simpara>
+ <simpara>Enhanced EOL handling (files can contain different EOL
+ styles in one file).</simpara>
</listitem>
<listitem>
@@ -339,8 +341,8 @@
</listitem>
<listitem>
- <simpara>One ot both files can be set read-only to prevent accidental
- edits.</simpara>
+ <simpara>One ot both files can be set read-only to prevent
+ accidental edits.</simpara>
</listitem>
<listitem>
@@ -368,18 +370,18 @@
</listitem>
<listitem>
- <simpara>Location pane showing overall picture from files and allowing
- moving to location by double-clicking.</simpara>
+ <simpara>Location pane showing overall picture from files and
+ allowing moving to location by double-clicking.</simpara>
</listitem>
<listitem>
- <simpara>Moved lines detection. Moved lines can be shown with different
- color in file area and location pane.</simpara>
+ <simpara>Moved lines detection. Moved lines can be shown with
+ different color in file area and location pane.</simpara>
</listitem>
<listitem>
- <simpara>More color options. Text color, missing line colors and moved
- line colors can be configured.</simpara>
+ <simpara>More color options. Text color, missing line colors and
+ moved line colors can be configured.</simpara>
</listitem>
</itemizedlist>
</sect3>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-10 15:39:28
|
Revision: 3700
http://svn.sourceforge.net/winmerge/?rev=3700&view=rev
Author: kimmov
Date: 2006-10-10 08:39:18 -0700 (Tue, 10 Oct 2006)
Log Message:
-----------
PATCH: [ 1573938 ] Manual: Update whatsnew for 2.6 release
Modified Paths:
--------------
trunk/Docs/Users/Manual/Changes.txt
trunk/Docs/Users/Manual/Whatsnew.xml
Modified: trunk/Docs/Users/Manual/Changes.txt
===================================================================
--- trunk/Docs/Users/Manual/Changes.txt 2006-10-10 15:36:04 UTC (rev 3699)
+++ trunk/Docs/Users/Manual/Changes.txt 2006-10-10 15:39:18 UTC (rev 3700)
@@ -1,6 +1,8 @@
2006-10-10 Kimmo
PATCH: [ 1573933 ] Manual: Update introduction chapter
Manual: Introduction.xml
+ PATCH: [ 1573938 ] Manual: Update whatsnew for 2.6 release
+ Manual: Whatsnew.xml
2006-10-07 Tim
BUG: [ 1572388 ] Wrong link to regex.pdf
Modified: trunk/Docs/Users/Manual/Whatsnew.xml
===================================================================
--- trunk/Docs/Users/Manual/Whatsnew.xml 2006-10-10 15:36:04 UTC (rev 3699)
+++ trunk/Docs/Users/Manual/Whatsnew.xml 2006-10-10 15:39:18 UTC (rev 3700)
@@ -3,11 +3,10 @@
<title>What's new in release</title>
<sect2>
- <title>What's new in 2.5</title>
+ <title>What's new in 2.6</title>
- <para>WinMerge 2.5 is our development version. It contains lots of fixes
- and improvements done after 2.4 releases. This list contains few most
- important ones:</para>
+ <para>WinMerge 2.6 release has some long-waited new features plus
+ important usability and stability fixes.</para>
<itemizedlist>
<listitem>
@@ -119,8 +118,8 @@
</listitem>
<listitem>
- <simpara>Path to archive file and path inside archive is shown instead
- of path to temporary folder</simpara>
+ <simpara>Path to archive file and path inside archive is shown
+ instead of path to temporary folder</simpara>
</listitem>
</itemizedlist>
</sect3>
@@ -142,8 +141,8 @@
</listitem>
<listitem>
- <simpara>Compare statepane shows progressbar and compared/total amount
- of items</simpara>
+ <simpara>Compare statepane shows progressbar and compared/total
+ amount of items</simpara>
</listitem>
<listitem>
@@ -183,12 +182,13 @@
</listitem>
<listitem>
- <simpara>Opening files to external editor from file compare</simpara>
+ <simpara>Opening files to external editor from file
+ compare</simpara>
</listitem>
<listitem>
- <simpara>Punctuation characters can break diffs in line differences (so
- numbers separated by commas get properly highlighted as
+ <simpara>Punctuation characters can break diffs in line differences
+ (so numbers separated by commas get properly highlighted as
diffs)</simpara>
</listitem>
</itemizedlist>
@@ -281,8 +281,9 @@
<itemizedlist>
<listitem>
- <simpara>More columns have been added (e.g. file sizes and attributes),
- and columns may be reordered, hidden, and displayed.</simpara>
+ <simpara>More columns have been added (e.g. file sizes and
+ attributes), and columns may be reordered, hidden, and
+ displayed.</simpara>
</listitem>
<listitem>
@@ -292,9 +293,9 @@
</listitem>
<listitem>
- <simpara>There is a new floating statusbar during the compare process,
- and comparison may be aborted, and the the files/dirs compared so
- far are shown.</simpara>
+ <simpara>There is a new floating statusbar during the compare
+ process, and comparison may be aborted, and the the files/dirs
+ compared so far are shown.</simpara>
</listitem>
<listitem>
@@ -308,7 +309,8 @@
</listitem>
<listitem>
- <simpara>The number of selected items is shown in the statusbar.</simpara>
+ <simpara>The number of selected items is shown in the
+ statusbar.</simpara>
</listitem>
</itemizedlist>
</sect3>
@@ -329,8 +331,8 @@
</listitem>
<listitem>
- <simpara>Enhanced EOL handling (files can contain different EOL styles
- in one file).</simpara>
+ <simpara>Enhanced EOL handling (files can contain different EOL
+ styles in one file).</simpara>
</listitem>
<listitem>
@@ -339,8 +341,8 @@
</listitem>
<listitem>
- <simpara>One ot both files can be set read-only to prevent accidental
- edits.</simpara>
+ <simpara>One ot both files can be set read-only to prevent
+ accidental edits.</simpara>
</listitem>
<listitem>
@@ -368,18 +370,18 @@
</listitem>
<listitem>
- <simpara>Location pane showing overall picture from files and allowing
- moving to location by double-clicking.</simpara>
+ <simpara>Location pane showing overall picture from files and
+ allowing moving to location by double-clicking.</simpara>
</listitem>
<listitem>
- <simpara>Moved lines detection. Moved lines can be shown with different
- color in file area and location pane.</simpara>
+ <simpara>Moved lines detection. Moved lines can be shown with
+ different color in file area and location pane.</simpara>
</listitem>
<listitem>
- <simpara>More color options. Text color, missing line colors and moved
- line colors can be configured.</simpara>
+ <simpara>More color options. Text color, missing line colors and
+ moved line colors can be configured.</simpara>
</listitem>
</itemizedlist>
</sect3>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-10 15:36:14
|
Revision: 3699
http://svn.sourceforge.net/winmerge/?rev=3699&view=rev
Author: kimmov
Date: 2006-10-10 08:36:04 -0700 (Tue, 10 Oct 2006)
Log Message:
-----------
PATCH: [ 1573933 ] Manual: Update introduction chapter
Modified Paths:
--------------
branches/R2_6/Docs/Users/Manual/Changes.txt
branches/R2_6/Docs/Users/Manual/Introduction.xml
Modified: branches/R2_6/Docs/Users/Manual/Changes.txt
===================================================================
--- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-10 15:33:12 UTC (rev 3698)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-10 15:36:04 UTC (rev 3699)
@@ -1,3 +1,7 @@
+2006-10-10 Kimmo
+ PATCH: [ 1573933 ] Manual: Update introduction chapter
+ Manual: Introduction.xml
+
2006-10-07 Tim
BUG: [ 1572388 ] Wrong link to regex.pdf
Manual: Filters.xml
Modified: branches/R2_6/Docs/Users/Manual/Introduction.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Introduction.xml 2006-10-10 15:33:12 UTC (rev 3698)
+++ branches/R2_6/Docs/Users/Manual/Introduction.xml 2006-10-10 15:36:04 UTC (rev 3699)
@@ -4,8 +4,8 @@
<para>WinMerge is an <ulink url="http://www.opensource.org/">Open
Source</ulink> visual text file differencing and merging tool for Win32
- platforms. WinMerge can compare directories and files and present
- differences in easy to understand and handle format.</para>
+ platforms. WinMerge can compare folders and files and present differences in
+ easy to understand and handle format.</para>
<para>WinMerge is highly useful for determining what has changed between
project versions, and then merging changes between versions. WinMerge can be
@@ -23,10 +23,8 @@
<para>Goal of WinMerge development is to make comparing and synch/merge of
directories and files easy and fast. While maintaining maximum reliability.
- Easiness reduces user errors. Latest 2.4 version was already good and
- popular version. In-development version 2.5 still improves in many areas.
- Note that 2.5 releases (beta or experimental) are not yet considered
- production-level releases.</para>
+ Easy of use reduces errors. Latest 2.6 version is considered a stable and
+ reliable program to use.</para>
<para>Please note that WinMerge is not a freeware, but it is <ulink
url="http://www.gnu.org/copyleft/gpl.html">GPL</ulink> licenced. We have
@@ -114,8 +112,8 @@
versions relate to each other. Development always happens with
development versions (experimental versions and beta versions). At
proper points we create a new branch for stable releases. In above
- picture arrows for 2.2.x and 2.4.x are two current stable
- branches.</para>
+ picture arrows for 2.2.x and 2.4.x are two current stable branches.
+ Picture does not show 2.6 which is the latest stable branch.</para>
<important>
<para>Branch always means a separate development. There is no any
@@ -134,10 +132,9 @@
<para>What this branching also means is that stable versions don't get
many new features after a branch is created. Stable versions 2.4.0 and
- 2.4.6 are pretty much similar feature-wise. Next time the new features
- appear in stable release is in version 2.6.0 for which we create a new
- stable branch. Downside here is that it may be over an year between the
- stable branches.</para>
+ 2.4.6 are pretty much similar feature-wise. After 2.4 stable branch we
+ have already a created new stable branch 2.6. It has many imrovements
+ and fixes done after 2.4 branch was created.</para>
<para>Many software vendors always increase their version numbers and
say version with biggest version number is what people should use. If
@@ -205,7 +202,7 @@
<para>WinMerge source codes are available in <ulink
url="https://sourceforge.net/project/showfiles.php?group_id=13216">downloads</ulink>
page and from <ulink
- url="https://sourceforge.net/cvs/?group_id=13216">public CVS
+ url="https://sourceforge.net/cvs/?group_id=13216">public Subversion
server</ulink>. We welcome everybody to download the sources, study them
and alter them. If you find (and fix) bugs, improve something etc, please
submit your changes back to us as <ulink
@@ -231,14 +228,16 @@
<para><ulink
url="http://winmerge.sourceforge.net/developer/index.php">Developer
- pages</ulink> are good start if you want to help with
- development.</para>
+ pages</ulink> are good start if you want to help with development. We
+ have also created a <link linkend="???"><ulink
+ url="http://wiki.winmerge.org/">Developers-Wiki</ulink></link> for
+ developer documentation.</para>
- <para><ulink
- url="http://sourceforge.net/forum/forum.php?forum_id=41639">Developers-forum</ulink>
- is best place to discuss about development. If you are interested in
- helping with WinMerge development, let us know. If you want to fix one
- of our <ulink
+ <para><ulink url="???">Development-mailing</ulink> list is the preferred
+ place for development discussions. Another place is in <ulink
+ url="http://sourceforge.net/forum/forum.php?forum_id=41639">Developers-forum</ulink>.
+ If you are interested in helping with WinMerge development, let us know.
+ If you want to fix one of our <ulink
url="http://sourceforge.net/tracker/?group_id=13216&atid=113216"
userlevel="">bugs</ulink> or implement a <ulink
url="http://sourceforge.net/tracker/?group_id=13216&atid=363216">new
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
