|
From: <gr...@us...> - 2006-09-02 16:48:23
|
Revision: 3515
http://svn.sourceforge.net/winmerge/?rev=3515&view=rev
Author: grimmdp
Date: 2006-09-02 09:48:18 -0700 (Sat, 02 Sep 2006)
Log Message:
-----------
Edited text
Modified Paths:
--------------
trunk/Web/developer/index.php
trunk/Web/downloads.php
trunk/Web/index.php
Modified: trunk/Web/developer/index.php
===================================================================
--- trunk/Web/developer/index.php 2006-09-01 12:55:04 UTC (rev 3514)
+++ trunk/Web/developer/index.php 2006-09-02 16:48:18 UTC (rev 3515)
@@ -5,7 +5,7 @@
$page->printHead('WinMerge: Developers', WINMERGE_DEV);
?>
<h2>WinMerge developers</h2>
-<p>This is a list of some of the current developers on WinMerge</p>
+<p>Following is a list of the current developers on the WinMerge project:</p>
<?php
$xmlarray = $page->convertXml2Array('developers.xml');
@@ -36,9 +36,9 @@
}
print("</ul>\n");
?>
-<p>Look how to <a href="needed.php">develop</a> and
-<a href="l10n/index.php">translate WinMerge</a>
-and get some hints for <a href="wincvs.php">WinCVS</a>.</p>
+<p>Look here for more information on how to <a href="needed.php">develop</a> and/or
+<a href="l10n/index.php">translate</a> WinMerge,
+and read how to use <a href="wincvs.php">WinCVS</a> with our project.</p>
<?php
$page->printFoot();
?>
\ No newline at end of file
Modified: trunk/Web/downloads.php
===================================================================
--- trunk/Web/downloads.php 2006-09-01 12:55:04 UTC (rev 3514)
+++ trunk/Web/downloads.php 2006-09-02 16:48:18 UTC (rev 3515)
@@ -19,7 +19,7 @@
<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 from our Manual in archive files (<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>
+ <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();
Modified: trunk/Web/index.php
===================================================================
--- trunk/Web/index.php 2006-09-01 12:55:04 UTC (rev 3514)
+++ trunk/Web/index.php 2006-09-02 16:48:18 UTC (rev 3515)
@@ -13,13 +13,13 @@
<li>Unicode support</li>
<li>Difference pane shows current difference in two vertical panes</li>
<li>Location pane shows map of files compared</li>
- <li>Highlights differences inside lines</li>
- <li>File filters in directory diff</li>
- <li>Moved lines detection in file compare</li>
+ <li>Highlights differences inside the lines</li>
+ <li>File filters in directory pane</li>
+ <li>Moved lines detection in file compare pane</li>
<li>Shell Integration</li>
<li>Rudimentary Visual SourceSafe and Rational ClearCase integration</li>
<li>Archive file support using 7-zip</li>
- <li>Plugins</li>
+ <li>Plugin support</li>
<li>Localizable interface via resource DLL</li>
<li>HTML-based <a href="2.4/manual/index.html">Manual</a></li>
</ul>
@@ -29,7 +29,7 @@
<p>See the <a href="2.4/screenshots.php">screenshots page</a> for more screenshots.</p>
<h2>WinMerge 2.4.10 - latest stable version</h2>
-<p><a href="2.4/index.php">WinMerge 2.4.10</a> is the latest stable version, and it is recommended for most users.</p>
+<p><a href="2.4/index.php">WinMerge 2.4.10</a> is the latest stable version, and is recommended for most users.</p>
<p><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.10-Setup.exe">Download WinMerge 2.4.10 Installer</a></p>
<h2>WinMerge 2.2.4 - older stable version</h2>
@@ -50,11 +50,11 @@
<p>Just download the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.10-Setup.exe">installer</a> and double-click it.</p>
<p>Or you may simply unzip the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.10-exe.zip">binary zip package</a> into the desired location, and run
<code>WinMerge.exe</code> or <code>WinMergeU.exe</code> (the latter is the Unicode version, only for use on NT/2000/XP).</p>
-<p>For more details please look at the <a href="2.4/manual/installing.html">Installation section</a> from the <a href="2.4/manual/index.html">Manual</a>.</p>
+<p>For more information, please see the <a href="2.4/manual/installing.html">Installation section</a> of the <a href="2.4/manual/index.html">Manual</a>.</p>
<h2>Using WinMerge</h2>
-<p>You can use the <a href="2.4/manual/index.html">online Manual</a>, or you can
-<a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11254&release_id=331358">download</a> a copy.</p>
+<p>For information on using WinMerge, see our <a href="2.4/manual/index.html">online Manual</a>, or you can
+<a href="http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=11254&release_id=331358">download</a> a copy of the documentation for offline use.</p>
<h2>Support</h2>
<p>WinMerge is an Open Source project, that is covered
@@ -79,12 +79,11 @@
to support the continued development of WinMerge.</p>
<h2>Developers</h2>
-<p>On the <a href="developer/index.php">developer page</a>
-you get more information about the development for WinMerge.</p>
-<p>You get a list from the current developers, how to
-<a href="developer/needed.php">develop</a> and
-<a href="developer/translate.php">translate WinMerge</a>
-and some hints for <a href="developer/wincvs.php">WinCVS</a>.</p>
+<p>As we said, WinMerge is an open source project, which means that the program is maintained and developed by
+volunteers. If you''re interested in contributing work to the project, see our <a href="developer/needed.php">developer page</a>
+for forther information on how you may contribute.</p>
+<p>In addition, WinMerge is translated into a number of different languages. <a href="developer/translate.php">Click here for more information on translating WinMerge</a> into your own language.</p>
+<p><a href="developer/index.php">The WinMerge Development Team</a></p>
<?php
$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: <ge...@us...> - 2006-09-03 17:23:36
|
Revision: 3518
http://svn.sourceforge.net/winmerge/?rev=3518&view=rev
Author: gerundt
Date: 2006-09-03 10:23:25 -0700 (Sun, 03 Sep 2006)
Log Message:
-----------
PATCH: [ 1551217 ] Web: Tracker shortcuts
Modified Paths:
--------------
trunk/Web/.htaccess
trunk/Web/Changes.txt
Modified: trunk/Web/.htaccess
===================================================================
--- trunk/Web/.htaccess 2006-09-02 20:35:37 UTC (rev 3517)
+++ trunk/Web/.htaccess 2006-09-03 17:23:25 UTC (rev 3518)
@@ -14,4 +14,11 @@
Redirect permanent /images/screenshot.png http://winmerge.org/2.0/images/screenshot.png
Redirect permanent /images/winmerge.gif http://winmerge.org/2.0/images/icon.gif
Redirect permanent /images/winmerge22.gif http://winmerge.org/2.2/images/icon.gif
-Redirect permanent /2.2/images/filecomp1.gif http://winmerge.org/2.2/images/screenshot.gif
\ No newline at end of file
+Redirect permanent /2.2/images/filecomp1.gif http://winmerge.org/2.2/images/screenshot.gif
+
+#Tracker shortcuts...
+RedirectMatch permanent /bug/([0-9]+) http://sourceforge.net/tracker/index.php?func=detail\&aid=$1\&group_id=13216\&atid=113216
+RedirectMatch permanent /patch/([0-9]+) http://sourceforge.net/tracker/index.php?func=detail\&aid=$1\&group_id=13216\&atid=313216
+RedirectMatch permanent /support/([0-9]+) http://sourceforge.net/tracker/index.php?func=detail\&aid=$1\&group_id=13216\&atid=213216
+RedirectMatch permanent /rfe/([0-9]+) http://sourceforge.net/tracker/index.php?func=detail\&aid=$1\&group_id=13216\&atid=363216
+RedirectMatch permanent /todo/([0-9]+) http://sourceforge.net/tracker/index.php?func=detail\&aid=$1\&group_id=13216\&atid=759426
\ No newline at end of file
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-09-02 20:35:37 UTC (rev 3517)
+++ trunk/Web/Changes.txt 2006-09-03 17:23:25 UTC (rev 3518)
@@ -1,3 +1,18 @@
+2006-09-03 Tim
+ PATCH: [ 1551217 ] Web: Tracker shortcuts
+ Web: .htaccess
+
+2006-09-02 Tim
+ Fix the download link of the HTML manual.
+ Web: index.php
+ Use Dean's text changes for 2.4 subdirectory too.
+ Web\2.4: index.php
+
+2006-09-02 Dean
+ Edited text
+ Web: downloads.php index.php
+ Web\developer: index.php
+
2006-08-26 Tim
PATCH: [ 1547117 ] Web: Remove Ads
Web: page.inc
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-09-04 20:48:28
|
Revision: 3522
http://svn.sourceforge.net/winmerge/?rev=3522&view=rev
Author: gerundt
Date: 2006-09-04 13:48:17 -0700 (Mon, 04 Sep 2006)
Log Message:
-----------
PATCH: [ 1552144 ] Web: Fixes to developers-needed -page
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/developer/needed.php
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-09-04 19:16:56 UTC (rev 3521)
+++ trunk/Web/Changes.txt 2006-09-04 20:48:17 UTC (rev 3522)
@@ -1,3 +1,7 @@
+2006-09-04 Tim
+ PATCH: [ 1552144 ] Web: Fixes to developers-needed -page
+ Web\developer: needed.php
+
2006-09-03 Tim
PATCH: [ 1551217 ] Web: Tracker shortcuts
Web: .htaccess
Modified: trunk/Web/developer/needed.php
===================================================================
--- trunk/Web/developer/needed.php 2006-09-04 19:16:56 UTC (rev 3521)
+++ trunk/Web/developer/needed.php 2006-09-04 20:48:17 UTC (rev 3522)
@@ -7,27 +7,29 @@
<h2>Developers Needed!</h2>
<p>One of the reasons WinMerge is on <a href="http://sourceforge.net/projects/winmerge">SourceForge</a> is so other
developers can get involved. If you have some free time, are
-proficient with DeveloperStudio 6 and MFC, and would like to contribute,
+proficient with MS Visual Studio and MFC, and would like to contribute,
then check out the list of items to be done from the
-<a href="http://sourceforge.net/tracker/?group_id=13216&atid=113216">Bugs</a> and
-<a href="http://sourceforge.net/tracker/?group_id=13216&atid=363216">RFE</a> lists.
+<a href="http://sourceforge.net/tracker/?group_id=13216&atid=113216">Bugs</a>,
+<a href="http://sourceforge.net/tracker/?group_id=13216&atid=363216">Feature Requests</a> and
+<a href="http://sourceforge.net/tracker/?group_id=13216&atid=759426">Todo</a>
+lists.
If you see something in there that you think
you can handle, <a href="http://sourceforge.net/forum/forum.php?forum_id=41639">let us know</a>
or leave a comment at the item.</p>
<p>Then grab a copy of the WinMerge source from
-<a href="http://sourceforge.net/cvs/?group_id=13216">anonymous CVS</a>
+<a href="http://sourceforge.net/svn/?group_id=13216">Subversion</a>
or you can download a <a href="http://sourceforge.net/project/showfiles.php?group_id=13216">zipped version</a> of the source,
write your code, and then upload the changed code <a href="http://sourceforge.net/tracker/?group_id=13216&atid=313216">as a patch</a>
(we prefer the original and changed codes in one zip file).
Then we will merge them back into the main codebase.</p>
-<p>You find more informations about programming WinMerge in the CVS directory
-<a href="http://cvs.sourceforge.net/viewcvs.py/winmerge/WinMerge/Docs/Developers/">Docs/Developers/</a>.</p>
+<p>You find more informations about programming WinMerge in the Subversion directory
+<a href="http://svn.sourceforge.net/viewvc/winmerge/trunk/Docs/Developers/">Docs/Developers/</a>.</p>
-<p>The general plan is to start people with anonymous CVS access and let the regular developers commit
-their changes to the CVS repository. Those developers that
-continue to contribute will be considered for read-write CVS access.</p>
+<p>The general plan is to start people with anonymous Subversion access and let the regular developers commit
+their changes to the Subversion repository. Those developers that
+continue to contribute will be considered for write Subversion access.</p>
<?php
$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: <ge...@us...> - 2006-09-04 21:27:23
|
Revision: 3523
http://svn.sourceforge.net/winmerge/?rev=3523&view=rev
Author: gerundt
Date: 2006-09-04 14:27:14 -0700 (Mon, 04 Sep 2006)
Log Message:
-----------
Remove download links to old stable versions.
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/index.php
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-09-04 20:48:17 UTC (rev 3522)
+++ trunk/Web/Changes.txt 2006-09-04 21:27:14 UTC (rev 3523)
@@ -1,6 +1,8 @@
2006-09-04 Tim
PATCH: [ 1552144 ] Web: Fixes to developers-needed -page
Web\developer: needed.php
+ Remove download links to old stable versions.
+ Web: index.php
2006-09-03 Tim
PATCH: [ 1551217 ] Web: Tracker shortcuts
Modified: trunk/Web/index.php
===================================================================
--- trunk/Web/index.php 2006-09-04 20:48:17 UTC (rev 3522)
+++ trunk/Web/index.php 2006-09-04 21:27:14 UTC (rev 3523)
@@ -32,20 +32,6 @@
<p><a href="2.4/index.php">WinMerge 2.4.10</a> is the latest stable version, and is recommended for most users.</p>
<p><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.10-Setup.exe">Download WinMerge 2.4.10 Installer</a></p>
-<h2>WinMerge 2.2.4 - older stable version</h2>
-<p><a href="2.2/index.php">WinMerge 2.2.4</a> is an older version.</p>
-<p><a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.2.4-Setup.exe">Download WinMerge 2.2.4 Installer</a></p>
-
-<h2>WinMerge 2.0.2 - much older stable version</h2>
-<p><a href="2.0/index.php">WinMerge 2.0.2</a> is an much older version.</p>
-<p><a href="http://prdownloads.sourceforge.net/winmerge/WinMergeSetup202.exe">Download WinMerge 2.0.2 Installer</a></p>
-
-<!--
-<h2>WinMerge 1.7 - much older stable version</h2>
-<p><a href="1.7/index.php">WinMerge 1.7</a> is an much older and simpler version, from before the integrated editor was introduced.</p>
-<p><a href="http://prdownloads.sourceforge.net/winmerge/WinMergeSetup.exe">Download WinMerge 1.7 Installer</a></p>
--->
-
<h2>Installation</h2>
<p>Just download the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.10-Setup.exe">installer</a> and double-click it.</p>
<p>Or you may simply unzip the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.10-exe.zip">binary zip package</a> into the desired location, and run
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-09-05 20:40:11
|
Revision: 3528
http://svn.sourceforge.net/winmerge/?rev=3528&view=rev
Author: gerundt
Date: 2006-09-05 13:39:51 -0700 (Tue, 05 Sep 2006)
Log Message:
-----------
BUG: [ 1552149 ] Web: CVS link in sidebar
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/developer/index.php
trunk/Web/developer/l10n/instructions.php
trunk/Web/links.php
trunk/Web/page.inc
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-09-05 18:27:01 UTC (rev 3527)
+++ trunk/Web/Changes.txt 2006-09-05 20:39:51 UTC (rev 3528)
@@ -1,3 +1,9 @@
+2006-09-05 Tim
+ BUG: [ 1552149 ] Web: CVS link in sidebar
+ Web: links.php page.inc
+ Web\developer: index.php
+ Web\developer\l10n: instructions.php
+
2006-09-04 Tim
PATCH: [ 1552144 ] Web: Fixes to developers-needed -page
Web\developer: needed.php
Modified: trunk/Web/developer/index.php
===================================================================
--- trunk/Web/developer/index.php 2006-09-05 18:27:01 UTC (rev 3527)
+++ trunk/Web/developer/index.php 2006-09-05 20:39:51 UTC (rev 3528)
@@ -37,8 +37,7 @@
print("</ul>\n");
?>
<p>Look here for more information on how to <a href="needed.php">develop</a> and/or
-<a href="l10n/index.php">translate</a> WinMerge,
-and read how to use <a href="wincvs.php">WinCVS</a> with our project.</p>
+<a href="l10n/index.php">translate</a> WinMerge.</p>
<?php
$page->printFoot();
?>
\ No newline at end of file
Modified: trunk/Web/developer/l10n/instructions.php
===================================================================
--- trunk/Web/developer/l10n/instructions.php 2006-09-05 18:27:01 UTC (rev 3527)
+++ trunk/Web/developer/l10n/instructions.php 2006-09-05 20:39:51 UTC (rev 3528)
@@ -8,7 +8,7 @@
<h2>Translations instructions</h2>
<ul>
<li><a href="#translate">I want to translate into my own language</a></li>
- <li><a href="#developer">Instructions for those who know CVS and Visual C++</a></li>
+ <li><a href="#developer">Instructions for those who know Subversion and Visual C++</a></li>
<li><a href="#everybody">Instructions for everybody else</a></li>
<li><a href="#shellextension">ShellExtension</a></li>
<li><a href="#installer">Translating Installer</a></li>
@@ -24,10 +24,10 @@
<p class="important">Please remember WinMerge is an Open Source project. Send translation updates to us as <code>.rc</code> file source patches. We WON't accept modified <code>.lang</code> binary files. We need the sources.</p>
-<h3><a name="developer">Instructions for those who know CVS and Visual C++</a></h3>
-<p>Grab a copy of the source from CVS (<a href="../wincvs.php">WinCVS Hints</a>).</p>
+<h3><a name="developer">Instructions for those who know Subversion and Visual C++</a></h3>
+<p>Grab a copy of the source from <a href="http://sourceforge.net/svn/?group_id=13216">Subversion</a>.</p>
<p>You will need to translate all the strings in <code>Merge.rc</code> to your language. Make a <code>MergeYourLanguage.rc</code> and upload it to SF.net as a patch <a href="http://sourceforge.net/tracker/?group_id=13216&atid=313216">here</a>.
-<p>Then one of the developers will commit it to CVS and it will be released with the next release.</p>
+<p>Then one of the developers will commit it to Subversion and it will be released with the next release.</p>
<p class="note">Please try to avoid changing dialog layout when translating.
The layout should be shared by all translations as much as possible, to make merging (and future translation changes) easier.
You can of course make controls wider to fit longer texts, but you should not move buttons and other controls if not really necessary.<br /><br />
@@ -83,11 +83,11 @@
<h3><a name="shellextension">ShellExtension</a></h3>
<p>ShellExtension can be translated by translating <code>.rc</code> resource file similarly to WinMerge executable.
-ShellExtension resource files are in <code><a href="http://cvs.sourceforge.net/viewcvs.py/winmerge/WinMerge/ShellExtension/Languages/">WinMerge\ShellExtension\Languages\</a></code> folder.
+ShellExtension resource files are in <code><a href="http://svn.sourceforge.net/winmerge/trunk/ShellExtension/Languages/">WinMerge\ShellExtension\Languages\</a></code> folder.
There are only few strings to translate so it should be fast to do.</p>
<h3><a name="installer">Translating Installer</a></h3>
-<p>Installer translation files are in <code><a href="http://cvs.sourceforge.net/viewcvs.py/winmerge/WinMerge/InnoSetup/Languages/">WinMerge\InnoSetup\Languages\</a></code> folder.
+<p>Installer translation files are in <code><a href="http://svn.sourceforge.net/winmerge/trunk/Installer/InnoSetup/Languages/">WinMerge\Installer\InnoSetup\Languages\</a></code> folder.
Look for a file named by your language. If one does not yet exist, you should look for InnoSetup translations in <a href="http://www.jrsoftware.org/files/istrans/">http://www.jrsoftware.org/files/istrans/</a>.</p>
<p>After you open the file, scroll to end of it, there are few custom strings you
@@ -101,8 +101,8 @@
<h3><a name="readme">Translating ReadMe.txt</a></h3>
<p>Please consider translating also <code>ReadMe.txt</code> file - it is shown in end of installer
and is added to Start-menu. Translated versions of <code>ReadMe.txt</code> are
-in <code><a href="http://cvs.sourceforge.net/viewcvs.py/winmerge/WinMerge/Docs/Users/Languages/">WinMerge\Docs\Users\Languages\</a></code> folder. And master <code>ReadMe.txt</code> is
-in <code><a href="http://cvs.sourceforge.net/viewcvs.py/winmerge/WinMerge/Docs/Users/ReadMe.txt">WinMerge\Docs\Users\ReadMe.txt</a></code>.</p>
+in <code><a href="http://svn.sourceforge.net/winmerge/trunk/Docs/Users/Languages/">WinMerge\Docs\Users\Languages\</a></code> folder. And master <code>ReadMe.txt</code> is
+in <code><a href="http://svn.sourceforge.net/winmerge/trunk/Docs/Users/ReadMe.txt">WinMerge\Docs\Users\ReadMe.txt</a></code>.</p>
<?php
$page->printFoot();
Modified: trunk/Web/links.php
===================================================================
--- trunk/Web/links.php 2006-09-05 18:27:01 UTC (rev 3527)
+++ trunk/Web/links.php 2006-09-05 20:39:51 UTC (rev 3528)
@@ -15,14 +15,9 @@
<dd><b>GnuWin32</b> provides Win32 ports of tools with a <a href="http://www.gnu.org/">GNU</a> or similar <a href="http://opensource.org/licenses/">open source license</a>.</dd>
<dt><a href="https://sourceforge.net/projects/externaldiff">External diff Tool</a></dt>
<dd><b>External diff Tool</b> is an <a href="http://www.eclipse.org/">Eclipse</a> Plugin</a> that allows the launch of WinMerge (or an other external diff tool) for file compares rather than the default built-in Eclipse diff tool.</dd>
+ <dt><a href="http://tortoisesvn.tigris.org/">TortoiseSVN</a></dt>
+ <dd><b>TortoiseSVN</b> lets you work with files under <em>Subversion</em> version control directly from Windows Explorer.</dd>
</dl>
-<h3>CVS</h3>
-<dl>
- <dt><a href="http://cvsgui.sourceforge.net/">WinCVS</a></dt>
- <dd><b>WinCVS</b> is a GUI front-end for <acronym title="Concurrent Versions System">CVS</acronym>.</dd>
- <dt><a href="http://www.tortoisecvs.org/">TortoiseCVS</a></dt>
- <dd><b>TortoiseCVS</b> lets you work with files under <acronym title="Concurrent Versions System">CVS</acronym> version control directly from Windows Explorer.</dd>
-</dl>
<h3>Regular expressions</h3>
<dl>
<dt><a href="http://www.regular-expressions.info/">regular-expressions.info</a></dt>
Modified: trunk/Web/page.inc
===================================================================
--- trunk/Web/page.inc 2006-09-05 18:27:01 UTC (rev 3527)
+++ trunk/Web/page.inc 2006-09-05 20:39:51 UTC (rev 3528)
@@ -232,10 +232,10 @@
$temp .= "<h2><a href=\"/developer/index.php\">Developers</a></h2>\n";
$temp .= "<ul>\n";
$temp .= " <li><a href=\"http://sourceforge.net/projects/winmerge/\">Project Home</a></li>\n";
- $temp .= " <li>CVS\n";
+ $temp .= " <li>Subversion\n";
$temp .= " <ul>\n";
- $temp .= " <li><a href=\"http://winmerge.cvs.sourceforge.net/winmerge/\">Browse CVS Tree</a></li>\n";
- $temp .= " <li><a href=\"http://sourceforge.net/cvs/?group_id=13216\">CVS Client Access</a></li>\n";
+ $temp .= " <li><a href=\"http://svn.sourceforge.net/winmerge\">Browse Subversion Tree</a></li>\n";
+ $temp .= " <li><a href=\"http://sourceforge.net/svn/?group_id=13216\">Subversion Access</a></li>\n";
$temp .= " </ul>\n";
$temp .= " </li>\n";
$temp .= " <li><a href=\"/developer/l10n/index.php\">Translations</a>\n";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-09-10 20:07:58
|
Revision: 3543
http://svn.sourceforge.net/winmerge/?rev=3543&view=rev
Author: gerundt
Date: 2006-09-10 13:07:36 -0700 (Sun, 10 Sep 2006)
Log Message:
-----------
PATCH: [ 1555810 ] Bulgarian translation status/translator update
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/developer/l10n/status.xml
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-09-10 16:34:36 UTC (rev 3542)
+++ trunk/Web/Changes.txt 2006-09-10 20:07:36 UTC (rev 3543)
@@ -1,3 +1,7 @@
+2006-09-10 Tim
+ PATCH: [ 1555810 ] Bulgarian translation status/translator update
+ Web\developer\l10n: status.xml
+
2006-09-05 Tim
BUG: [ 1552149 ] Web: CVS link in sidebar
Web: links.php page.inc
Modified: trunk/Web/developer/l10n/status.xml
===================================================================
--- trunk/Web/developer/l10n/status.xml 2006-09-10 16:34:36 UTC (rev 3542)
+++ trunk/Web/developer/l10n/status.xml 2006-09-10 20:07:36 UTC (rev 3543)
@@ -29,9 +29,15 @@
<email>sld at mail dot bg</email>
<comment>2.1</comment>
</author>
+ <author>
+ <name>tigertron</name>
+ <email>tig...@di...</email>
+ <comment>2.5</comment>
+ </author>
</authors>
<versions>
<version>2.1</version>
+ <version>2.5</version>
</versions>
</language>
<language>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-09-11 21:23:39
|
Revision: 3555
http://svn.sourceforge.net/winmerge/?rev=3555&view=rev
Author: gerundt
Date: 2006-09-11 14:23:26 -0700 (Mon, 11 Sep 2006)
Log Message:
-----------
RFE: [ 1552813 ] Web: Mark developers active/inactive
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/developer/developers.xml
trunk/Web/developer/index.php
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-09-11 15:38:26 UTC (rev 3554)
+++ trunk/Web/Changes.txt 2006-09-11 21:23:26 UTC (rev 3555)
@@ -1,3 +1,7 @@
+2006-09-11 Tim
+ RFE: [ 1552813 ] Web: Mark developers active/inactive
+ Web\developer: developers.xml index.php
+
2006-09-10 Tim
PATCH: [ 1555810 ] Bulgarian translation status/translator update
Web\developer\l10n: status.xml
Modified: trunk/Web/developer/developers.xml
===================================================================
--- trunk/Web/developer/developers.xml 2006-09-11 15:38:26 UTC (rev 3554)
+++ trunk/Web/developer/developers.xml 2006-09-11 21:23:26 UTC (rev 3555)
@@ -13,13 +13,13 @@
<role>1</role>
<email>list1974 at hotmail dot com</email>
</developer>
- <developer>
+ <developer inactive="1">
<name>Chris Mumford</name>
<username>cmumford</username>
<role>2</role>
<email>cmumford at users.sourceforge.net</email>
</developer>
- <developer>
+ <developer inactive="1">
<name>Dennis Lim</name>
<username>dlkj</username>
<role>2</role>
@@ -55,13 +55,13 @@
<role>2</role>
<email>kimmov at users.sourceforge.net</email>
</developer>
- <developer>
+ <developer inactive="1">
<name>Laurent Ganier</name>
<username>laoran</username>
<role>2</role>
<email>ccganier at club-internet dot fr</email>
</developer>
- <developer>
+ <developer inactive="1">
<name>Perry Rapp</name>
<username>elsapo</username>
<role>2</role>
@@ -73,7 +73,7 @@
<role>2</role>
<email>sdottaka at users.sourceforge.net</email>
</developer>
- <developer>
+ <developer inactive="1">
<name>Christian Blackburn</name>
<username>seier</username>
<role>3</role>
Modified: trunk/Web/developer/index.php
===================================================================
--- trunk/Web/developer/index.php 2006-09-11 15:38:26 UTC (rev 3554)
+++ trunk/Web/developer/index.php 2006-09-11 21:23:26 UTC (rev 3555)
@@ -9,32 +9,44 @@
<?php
$xmlarray = $page->convertXml2Array('developers.xml');
- print("<ul>\n");
+ $activelist = ''; $inactivelist = '';
$developers = $xmlarray['DEVELOPERS'][0]['DEVELOPER'];
$developers = $page->multisortArray($developers, 'NAME', SORT_ASC);
for ($i = 0; $i < count($developers); $i++) { //For all developers...
$developer = $developers[$i];
+ $developer_inactive = $developer['ATTRIBUTES']['INACTIVE'];
$developer_name = $developer['NAME'][0]['VALUE'];
$developer_username = $developer['USERNAME'][0]['VALUE'];
$developer_role = $developer['ROLE'][0]['VALUE'];
$developer_email = $developer['EMAIL'][0]['VALUE'];
+ $li = '';
switch ($developer_role) {
case 1: //Project Manager
- print(" <li><strong><a href=\"mailto:" . $developer_email . "\" title=\"Project Manager: " . $developer_name . " <" . $developer_email . ">\">" . $developer_name . "</a></strong></li>");
+ $li = " <li><strong><a href=\"mailto:" . $developer_email . "\" title=\"Project Manager: " . $developer_name . " <" . $developer_email . ">\">" . $developer_name . "</a></strong></li>";
break;
case 2: //Developer
- print(" <li><a href=\"mailto:" . $developer_email . "\" title=\"Developer: " . $developer_name . " <" . $developer_email . ">\">" . $developer_name . "</a></li>");
+ $li = " <li><a href=\"mailto:" . $developer_email . "\" title=\"Developer: " . $developer_name . " <" . $developer_email . ">\">" . $developer_name . "</a></li>";
break;
case 3: //Packager
- print(" <li><a href=\"mailto:" . $developer_email . "\" title=\"Packager: " . $developer_name . " <" . $developer_email . ">\">" . $developer_name . "</a></li>");
+ $li = " <li><a href=\"mailto:" . $developer_email . "\" title=\"Packager: " . $developer_name . " <" . $developer_email . ">\">" . $developer_name . "</a></li>";
break;
case 4: //Web Designer
- print(" <li><a href=\"mailto:" . $developer_email . "\" title=\"Web Designer: " . $developer_name . " <" . $developer_email . ">\">" . $developer_name . "</a></li>");
+ $li = " <li><a href=\"mailto:" . $developer_email . "\" title=\"Web Designer: " . $developer_name . " <" . $developer_email . ">\">" . $developer_name . "</a></li>";
break;
}
+ if ($developer_inactive != '1') $activelist .= $li; else $inactivelist .= $li;
}
+ print("<ul>\n");
+ print($activelist);
print("</ul>\n");
+
+ if ($inactivelist != '') {
+ print("<h3>Inactive/past developers:</h3>\n");
+ print("<ul>\n");
+ print($inactivelist);
+ print("</ul>\n");
+ }
?>
<p>Look here for more information on how to <a href="needed.php">develop</a> and/or
<a href="l10n/index.php">translate</a> WinMerge.</p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-09-12 21:03:05
|
Revision: 3557
http://svn.sourceforge.net/winmerge/?rev=3557&view=rev
Author: gerundt
Date: 2006-09-12 14:02:54 -0700 (Tue, 12 Sep 2006)
Log Message:
-----------
PATCH: [ 1557373 ] Japanese and Swedish translations are ready for 2.6
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/developer/l10n/status.php
trunk/Web/developer/l10n/status.xml
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-09-12 18:40:52 UTC (rev 3556)
+++ trunk/Web/Changes.txt 2006-09-12 21:02:54 UTC (rev 3557)
@@ -1,3 +1,7 @@
+2006-09-12 Tim
+ PATCH: [ 1557373 ] Japanese and Swedish translations are ready for 2.6
+ Web\developer\l10n: status.php status.xml
+
2006-09-11 Tim
RFE: [ 1552813 ] Web: Mark developers active/inactive
Web\developer: developers.xml index.php
Modified: trunk/Web/developer/l10n/status.php
===================================================================
--- trunk/Web/developer/l10n/status.php 2006-09-12 18:40:52 UTC (rev 3556)
+++ trunk/Web/developer/l10n/status.php 2006-09-12 21:02:54 UTC (rev 3557)
@@ -36,7 +36,7 @@
print(" <th class=\"left\">Language</th>\n");
print(" <th class=\"left\">Status</th>\n");
print(" <th class=\"left\">Author</th>\n");
- print(" <th class=\"center\" colspan=\"5\">Versions</th>\n");
+ print(" <th class=\"center\" colspan=\"6\">Versions</th>\n");
print(" </tr>\n");
$languages = $status['L10N'][0]['LANGUAGE'];
$languages = $page->multisortArray($languages, 'NAME', SORT_ASC);
@@ -85,6 +85,7 @@
}
print("</td>\n");
+ $version_26 = ' ';
$version_25 = ' ';
$version_24 = ' ';
$version_22 = ' ';
@@ -94,6 +95,9 @@
$version = $versions[$j]['VALUE'];
switch ($version) {
+ case '2.6':
+ $version_26 = '<span title="upcoming stable version">2.6</span>';
+ break;
case '2.5':
$version_25 = '<span title="latest development version">2.5</span>';
break;
@@ -111,6 +115,7 @@
break;
}
}
+ print(" <td class=\"center\">" . $version_26 . "</td>\n");
print(" <td class=\"center\">" . $version_25 . "</td>\n");
print(" <td class=\"center\">" . $version_24 . "</td>\n");
print(" <td class=\"center\">" . $version_22 . "</td>\n");
Modified: trunk/Web/developer/l10n/status.xml
===================================================================
--- trunk/Web/developer/l10n/status.xml 2006-09-12 18:40:52 UTC (rev 3556)
+++ trunk/Web/developer/l10n/status.xml 2006-09-12 21:02:54 UTC (rev 3557)
@@ -256,6 +256,7 @@
</author>
</authors>
<versions>
+ <version>2.6</version>
<version>2.4</version>
<version>2.3</version>
<version>2.2</version>
@@ -372,10 +373,11 @@
<author>
<name>Hans Eriksson</name>
<email>hans dot ericson at bredband dot net</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-09-14 21:23:06
|
Revision: 3562
http://svn.sourceforge.net/winmerge/?rev=3562&view=rev
Author: gerundt
Date: 2006-09-14 14:22:50 -0700 (Thu, 14 Sep 2006)
Log Message:
-----------
PATCH: [ 1558862 ] Web: Tidying web-pages (Part 1)
Modified Paths:
--------------
trunk/Web/2.0/index.php
trunk/Web/2.2/index.php
trunk/Web/2.4/index.php
trunk/Web/Changes.txt
trunk/Web/index.php
Modified: trunk/Web/2.0/index.php
===================================================================
--- trunk/Web/2.0/index.php 2006-09-13 21:36:42 UTC (rev 3561)
+++ trunk/Web/2.0/index.php 2006-09-14 21:22:50 UTC (rev 3562)
@@ -30,7 +30,7 @@
<h2>Installation</h2>
<p>Just download the <a href="http://prdownloads.sourceforge.net/winmerge/WinMergeSetup202.exe">installer</a> and double-click it.</p>
<p>Or you may simply unzip the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge202-exe.zip">binary zip package</a> into the desired location, and run
-<code>WinMerge.exe</code> or <code>WinMergeU.exe</code> (the latter is the Unicode version, only for use on NT/2000/XP).</p>
+<code>WinMergeU.exe</code> (except for Windows 98/ME users who should use <code>WinMerge.exe</code>).</p>
<h2>Using WinMerge</h2>
<p>You can use the <a href="docs/index.html">online User's Guide</a>, or you can
@@ -43,7 +43,7 @@
subscription to the <a href="http://lists.sourceforge.net/lists/listinfo/winmerge-support">WinMerge-support mailing list</a>.
In addition, SourceForge has bug tracking capabilities, so please report any
bugs <a href="http://sourceforge.net/bugs/?group_id=13216">here</a>. Wish list items on the
-<a href="http://sourceforge.net/tracker/?group_id=13216&atid=363216">RFE list</a> will also be considered, but we make
+<a href="http://sourceforge.net/tracker/?group_id=13216&atid=363216">feature request list</a> will also be considered, but we make
absolutely no promises.</p>
<p>Here is the current <a href="changes.php">change history</a>.</p>
Modified: trunk/Web/2.2/index.php
===================================================================
--- trunk/Web/2.2/index.php 2006-09-13 21:36:42 UTC (rev 3561)
+++ trunk/Web/2.2/index.php 2006-09-14 21:22:50 UTC (rev 3562)
@@ -32,7 +32,7 @@
<h2>Installation</h2>
<p>Just download the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.2.4-Setup.exe">installer</a> and double-click it.</p>
<p>Or you may simply unzip the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.2.4-exe.zip">binary zip package</a> into the desired location, and run
-<code>WinMerge.exe</code> or <code>WinMergeU.exe</code> (the latter is the Unicode version, only for use on NT/2000/XP).</p>
+<code>WinMergeU.exe</code> (except for Windows 98/ME users who should use <code>WinMerge.exe</code>).</p>
<p>For more details please look at the <a href="manual/installing.html">Installation section</a> from the <a href="manual/index.html">Manual</a>.</p>
<h2>Using WinMerge</h2>
@@ -46,7 +46,7 @@
subscription to the <a href="http://lists.sourceforge.net/lists/listinfo/winmerge-support">WinMerge-support mailing list</a>.
In addition, SourceForge has bug tracking capabilities, so please report any
bugs <a href="http://sourceforge.net/bugs/?group_id=13216">here</a>. Wish list items on the
-<a href="http://sourceforge.net/tracker/?group_id=13216&atid=363216">RFE list</a> will also be considered, but we make
+<a href="http://sourceforge.net/tracker/?group_id=13216&atid=363216">feature request list</a> will also be considered, but we make
absolutely no promises.</p>
<p>Here is the current <a href="changes.php">change history</a>.</p>
Modified: trunk/Web/2.4/index.php
===================================================================
--- trunk/Web/2.4/index.php 2006-09-13 21:36:42 UTC (rev 3561)
+++ trunk/Web/2.4/index.php 2006-09-14 21:22:50 UTC (rev 3562)
@@ -31,7 +31,7 @@
<h2>Installation</h2>
<p>Just download the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.10-Setup.exe">installer</a> and double-click it.</p>
<p>Or you may simply unzip the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.10-exe.zip">binary zip package</a> into the desired location, and run
-<code>WinMerge.exe</code> or <code>WinMergeU.exe</code> (the latter is the Unicode version, only for use on NT/2000/XP).</p>
+<code>WinMergeU.exe</code> (except for Windows 98/ME users who should use <code>WinMerge.exe</code>).</p>
<p>For more information, please see the <a href="manual/installing.html">Installation section</a> of the <a href="manual/index.html">Manual</a>.</p>
<h2>Using WinMerge</h2>
@@ -45,7 +45,7 @@
subscription to the <a href="http://lists.sourceforge.net/lists/listinfo/winmerge-support">WinMerge-support mailing list</a>.
In addition, SourceForge has bug tracking capabilities, so please report any
bugs <a href="http://sourceforge.net/bugs/?group_id=13216">here</a>. Wish list items on the
-<a href="http://sourceforge.net/tracker/?group_id=13216&atid=363216">RFE list</a> will also be considered, but we make
+<a href="http://sourceforge.net/tracker/?group_id=13216&atid=363216">feature request list</a> will also be considered, but we make
absolutely no promises.</p>
<p>We prefer that you <a href="http://sourceforge.net/account/newuser_emailverify.php">register</a>
with <a href="http://sourceforge.net/">SourceForge</a> before posting a bug report (registration is
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-09-13 21:36:42 UTC (rev 3561)
+++ trunk/Web/Changes.txt 2006-09-14 21:22:50 UTC (rev 3562)
@@ -1,3 +1,10 @@
+2006-09-14 Tim
+ PATCH: [ 1558862 ] Web: Tidying web-pages (Part 1)
+ Web: index.php
+ Web\2.4: index.php
+ Web\2.2: index.php
+ Web\2.0: index.php
+
2006-09-12 Tim
PATCH: [ 1557373 ] Japanese and Swedish translations are ready for 2.6
Web\developer\l10n: status.php status.xml
Modified: trunk/Web/index.php
===================================================================
--- trunk/Web/index.php 2006-09-13 21:36:42 UTC (rev 3561)
+++ trunk/Web/index.php 2006-09-14 21:22:50 UTC (rev 3562)
@@ -35,7 +35,7 @@
<h2>Installation</h2>
<p>Just download the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.10-Setup.exe">installer</a> and double-click it.</p>
<p>Or you may simply unzip the <a href="http://prdownloads.sourceforge.net/winmerge/WinMerge-2.4.10-exe.zip">binary zip package</a> into the desired location, and run
-<code>WinMerge.exe</code> or <code>WinMergeU.exe</code> (the latter is the Unicode version, only for use on NT/2000/XP).</p>
+<code>WinMergeU.exe</code> (except for Windows 98/ME users who should use <code>WinMerge.exe</code>).</p>
<p>For more information, please see the <a href="2.4/manual/installing.html">Installation section</a> of the <a href="2.4/manual/index.html">Manual</a>.</p>
<h2>Using WinMerge</h2>
@@ -49,7 +49,7 @@
subscription to the <a href="http://lists.sourceforge.net/lists/listinfo/winmerge-support">WinMerge-support mailing list</a>.
In addition, SourceForge has bug tracking capabilities, so please report any
bugs <a href="http://sourceforge.net/bugs/?group_id=13216">here</a>. Wish list items on the
-<a href="http://sourceforge.net/tracker/?group_id=13216&atid=363216">RFE list</a> will also be considered, but we make
+<a href="http://sourceforge.net/tracker/?group_id=13216&atid=363216">feature request list</a> will also be considered, but we make
absolutely no promises.</p>
<p>We prefer that you <a href="http://sourceforge.net/account/newuser_emailverify.php">register</a>
with <a href="http://sourceforge.net/">SourceForge</a> before posting a bug report (registration is
@@ -65,7 +65,7 @@
to support the continued development of WinMerge.</p>
<h2>Developers</h2>
-<p>As we said, WinMerge is an open source project, which means that the program is maintained and developed by
+<p>WinMerge is an open source project, which means that the program is maintained and developed by
volunteers. If you''re interested in contributing work to the project, see our <a href="developer/needed.php">developer page</a>
for forther information on how you may contribute.</p>
<p>In addition, WinMerge is translated into a number of different languages. <a href="developer/translate.php">Click here for more information on translating WinMerge</a> into your own language.</p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-09-18 19:58:49
|
Revision: 3578
http://svn.sourceforge.net/winmerge/?rev=3578&view=rev
Author: gerundt
Date: 2006-09-18 12:58:38 -0700 (Mon, 18 Sep 2006)
Log Message:
-----------
PATCH: [ 1559508 ] Change kimmov's email address
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/developer/developers.xml
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-09-18 19:35:24 UTC (rev 3577)
+++ trunk/Web/Changes.txt 2006-09-18 19:58:38 UTC (rev 3578)
@@ -1,3 +1,7 @@
+2006-09-18 Tim
+ PATCH: [ 1559508 ] Change kimmov's email address
+ Web\developer: developers.xml
+
2006-09-16 Christian
PATCH: [ 1543687 ] Google AdSense setup
Re-inserted the ads, after change to our own site
Modified: trunk/Web/developer/developers.xml
===================================================================
--- trunk/Web/developer/developers.xml 2006-09-18 19:35:24 UTC (rev 3577)
+++ trunk/Web/developer/developers.xml 2006-09-18 19:58:38 UTC (rev 3578)
@@ -53,7 +53,7 @@
<name>Kimmo Varis</name>
<username>kimmov</username>
<role>2</role>
- <email>kimmov at users.sourceforge.net</email>
+ <email>kimmov at winmerge.org</email>
</developer>
<developer inactive="1">
<name>Laurent Ganier</name>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-09-23 12:40:20
|
Revision: 3624
http://svn.sourceforge.net/winmerge/?rev=3624&view=rev
Author: gerundt
Date: 2006-09-23 05:40:09 -0700 (Sat, 23 Sep 2006)
Log Message:
-----------
[ 1561419 ] Web: Don't print ads
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/css/print.css
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-09-23 07:35:20 UTC (rev 3623)
+++ trunk/Web/Changes.txt 2006-09-23 12:40:09 UTC (rev 3624)
@@ -1,3 +1,7 @@
+2006-09-23 Tim
+ PATCH: [ 1561419 ] Web: Don't print ads
+ Web\css: print.css
+
2006-09-18 Tim
PATCH: [ 1559508 ] Change kimmov's email address
Web\developer: developers.xml
Modified: trunk/Web/css/print.css
===================================================================
--- trunk/Web/css/print.css 2006-09-23 07:35:20 UTC (rev 3623)
+++ trunk/Web/css/print.css 2006-09-23 12:40:09 UTC (rev 3624)
@@ -25,6 +25,10 @@
display: none;
}
+#ads {
+ display: none;
+}
+
#content {
margin: 0;
padding: 5px;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-09-25 21:41:32
|
Revision: 3639
http://svn.sourceforge.net/winmerge/?rev=3639&view=rev
Author: gerundt
Date: 2006-09-25 14:41:23 -0700 (Mon, 25 Sep 2006)
Log Message:
-----------
PATCH: [ 1564395 ] Update Spanish translation status
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/developer/l10n/status.xml
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-09-25 20:55:54 UTC (rev 3638)
+++ trunk/Web/Changes.txt 2006-09-25 21:41:23 UTC (rev 3639)
@@ -1,3 +1,7 @@
+2006-09-25 Tim
+ PATCH: [ 1564395 ] Update Spanish translation status
+ Web\developer\l10n: status.xml
+
2006-09-23 Tim
PATCH: [ 1561419 ] Web: Don't print ads
Web\css: print.css
Modified: trunk/Web/developer/l10n/status.xml
===================================================================
--- trunk/Web/developer/l10n/status.xml 2006-09-25 20:55:54 UTC (rev 3638)
+++ trunk/Web/developer/l10n/status.xml 2006-09-25 21:41:23 UTC (rev 3639)
@@ -352,10 +352,12 @@
<author>
<name>Jes\xFAs M. Delgado 'MacK'</name>
<email>mack_ at users dot sourceforge dot net</email>
- <comment>2.3 & 2.2</comment>
+ <comment>2.6 - 2.2</comment>
</author>
</authors>
<versions>
+ <version>2.6</version>
+ <version>2.4</version>
<version>2.3</version>
<version>2.2</version>
<version>1.7</version>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-09-26 20:35:01
|
Revision: 3649
http://svn.sourceforge.net/winmerge/?rev=3649&view=rev
Author: gerundt
Date: 2006-09-26 13:34:48 -0700 (Tue, 26 Sep 2006)
Log Message:
-----------
PATCH [ 1565841 ] Web: Catalan translation is updated
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/developer/l10n/status.xml
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-09-26 19:52:40 UTC (rev 3648)
+++ trunk/Web/Changes.txt 2006-09-26 20:34:48 UTC (rev 3649)
@@ -1,3 +1,7 @@
+2006-09-26 Tim
+ PATCH [ 1565841 ] Web: Catalan translation is updated
+ Web\developer\l10n: status.xml
+
2006-09-25 Tim
PATCH: [ 1564395 ] Update Spanish translation status
Web\developer\l10n: status.xml
Modified: trunk/Web/developer/l10n/status.xml
===================================================================
--- trunk/Web/developer/l10n/status.xml 2006-09-26 19:52:40 UTC (rev 3648)
+++ trunk/Web/developer/l10n/status.xml 2006-09-26 20:34:48 UTC (rev 3649)
@@ -50,6 +50,7 @@
</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-09-30 23:32:47
|
Revision: 3661
http://svn.sourceforge.net/winmerge/?rev=3661&view=rev
Author: gerundt
Date: 2006-09-30 16:32:35 -0700 (Sat, 30 Sep 2006)
Log Message:
-----------
PATCH [ 1566474 ] Web: Improve translations index page
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/developer/l10n/index.php
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-09-29 16:17:28 UTC (rev 3660)
+++ trunk/Web/Changes.txt 2006-09-30 23:32:35 UTC (rev 3661)
@@ -1,3 +1,7 @@
+2006-10-01 Tim
+ PATCH [ 1566474 ] Web: Improve translations index page
+ Web\developer\l10n: index.php
+
2006-09-26 Tim
PATCH [ 1565841 ] Web: Catalan translation is updated
Web\developer\l10n: status.xml
Modified: trunk/Web/developer/l10n/index.php
===================================================================
--- trunk/Web/developer/l10n/index.php 2006-09-29 16:17:28 UTC (rev 3660)
+++ trunk/Web/developer/l10n/index.php 2006-09-30 23:32:35 UTC (rev 3661)
@@ -19,14 +19,20 @@
}
print("</ul>\n");
?>
-<p>To change languages, select the desired language from the View->Languages menu choice; language names are shown in both languages (native language and current WinMerge language).</p>
-<p>
-If the desired language is not present, then you are missing a translation dll.
-For example, for simplified Chinese, you need to have the file <code>MergeSimplifiedChinese.dll</code> in the <code>Languages</code> subdirectory next to your <code>WinMerge.exe</code> and/or <code>WinMergeU.exe</code> program files.
-These would normally be installed for you, if you did a <em>Full Installation</em> from the normal WinMerge setup program.
-If you did not install in that fashion, you may simply copy the desired DLL into the correct directory, and restart <code>WinMerge(U).exe</code>.
-</p>
-<p>If you would like to update any of these translations or add another translation, then please follow <a href="instructions.php">these instructions</a>.</p>
+<p>To change languages, select the desired language from the View->Languages
+menu choice; language names are shown in both languages (native language and
+current WinMerge language).</p>
+<p>If the desired language is not present, then you are missing a language file.
+Language files are names as <code>Merge</code> + <code><var>language name</var></code>
++ <code>.lang</code> as filename extension. For example, for Catalan, you need
+to have the file <code>MergeCatalan.lang</code> in the <code>Languages</code>
+subfolder of WinMerge folder. These would normally be installed for you by
+installer, if you did a <em>Full Installation</em>. Installer also allows to
+select individual translations to install. If you did not install translation(s)
+with installer you can copy the desired language file into the correct folder,
+and restart WinMerge.</p>
+<p>If you would like to update any of these translations or add another translation,
+then please follow <a href="instructions.php">these instructions</a>.</p>
<p>You can also take a look at the <a href="status.php">status of the translations</a>.</p>
<?php
$page->printFoot();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-09-30 23:37:29
|
Revision: 3662
http://svn.sourceforge.net/winmerge/?rev=3662&view=rev
Author: gerundt
Date: 2006-09-30 16:37:17 -0700 (Sat, 30 Sep 2006)
Log Message:
-----------
PATCH: [ 1566613 ] Web: Improve Developers Needed -page
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/developer/needed.php
trunk/Web/page.inc
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-09-30 23:32:35 UTC (rev 3661)
+++ trunk/Web/Changes.txt 2006-09-30 23:37:17 UTC (rev 3662)
@@ -1,6 +1,9 @@
2006-10-01 Tim
- PATCH [ 1566474 ] Web: Improve translations index page
+ PATCH: [ 1566474 ] Web: Improve translations index page
Web\developer\l10n: index.php
+ PATCH: [ 1566613 ] Web: Improve Developers Needed -page
+ Web: page.inc
+ Web\developer: needed.php
2006-09-26 Tim
PATCH [ 1565841 ] Web: Catalan translation is updated
Modified: trunk/Web/developer/needed.php
===================================================================
--- trunk/Web/developer/needed.php 2006-09-30 23:32:35 UTC (rev 3661)
+++ trunk/Web/developer/needed.php 2006-09-30 23:37:17 UTC (rev 3662)
@@ -4,25 +4,54 @@
$page = new Page;
$page->printHead('WinMerge: Developers Needed!', WINMERGE_DEV);
?>
-<h2>Developers Needed!</h2>
-<p>One of the reasons WinMerge is on <a href="http://sourceforge.net/projects/winmerge">SourceForge</a> is so other
-developers can get involved. If you have some free time, are
-proficient with MS Visual Studio and MFC, and would like to contribute,
-then check out the list of items to be done from the
+<h2>Help Needed!</h2>
+<p>WinMerge is an <a href="http://en.wikipedia.org/wiki/Open_source">Open Source Software</a>.
+This means everybody can download WinMerge source code, including documentation,
+web pages etc. And improve and modify them. Only thing we ask is that people
+submit their improvements and modifications back to us. This is the way the
+WinMerge gets improved.</p>
+
+<p>There is a small group of active developers, as listed in <a href="http://winmerge.org/developer/index.php">
+Developers-page</a>. Unfortunately WinMerge has grown over years and requires
+more and more work to be done. So we are constantly hoping new people to step
+up and start working with us to improve WinMerge.</p>
+
+<p>Coding is not the only thing we need more people for, you can:</p>
+<ul>
+ <li>write code</li>
+ <li>test</li>
+ <li>write documentation (user- and developer-)</li>
+ <li>translate WinMerge</li>
+ <li>improve installer</li>
+</ul>
+
+<p>WinMerge is mostly C/C++ code and is compiled with Visual Studio (VC6 and
+later work) and GUI code uses MFC heavily. However, C/C++ wizardry or deep
+knowledge of MFC is not required to work with WinMerge. There is a lot of low
+level code for file handling, unicode etc.</p>
+
+<p>Our tracker items are good starting point for looking things to do:
<a href="http://sourceforge.net/tracker/?group_id=13216&atid=113216">Bugs</a>,
<a href="http://sourceforge.net/tracker/?group_id=13216&atid=363216">Feature Requests</a> and
<a href="http://sourceforge.net/tracker/?group_id=13216&atid=759426">Todo</a>
-lists.
-If you see something in there that you think
-you can handle, <a href="http://sourceforge.net/forum/forum.php?forum_id=41639">let us know</a>
-or leave a comment at the item.</p>
+lists. If you see something in there that you think
+you can handle, let us know (see contacting developers below) or leave a
+comment at the item. If you want to do something not in those lists, please
+submit it as a new item and/or let us know about it other ways (see below).</p>
-<p>Then grab a copy of the WinMerge source from
+<p>The best way to contact developers is posting a message to
+<a href="http://sourceforge.net/forum/forum.php?forum_id=41639">Developers-forum</a>
+or to winmerge-development <a href="http://sourceforge.net/mail/?group_id=13216">
+mailing list</a>. We try to answer as soon as possible, but sometimes it may take
+even days to anybody to answer. Be patient.</p>
+
+<p>When you have decided to do something, grab a copy of the WinMerge source from
<a href="http://sourceforge.net/svn/?group_id=13216">Subversion</a>
-or you can download a <a href="http://sourceforge.net/project/showfiles.php?group_id=13216">zipped version</a> of the source,
-write your code, and then upload the changed code <a href="http://sourceforge.net/tracker/?group_id=13216&atid=313216">as a patch</a>
-(we prefer the original and changed codes in one zip file).
-Then we will merge them back into the main codebase.</p>
+or you can download a <a href="http://sourceforge.net/project/showfiles.php?group_id=13216">zipped version</a>
+of the source tree, do your changes, and then upload the changes
+<a href="http://sourceforge.net/tracker/?group_id=13216&atid=313216">as a patch</a>
+(we prefer the original and changed codes in one zip file). Then we will commit
+them into the subversion repository.</p>
<p>You find more informations about programming WinMerge in the Subversion directory
<a href="http://svn.sourceforge.net/viewvc/winmerge/trunk/Docs/Developers/">Docs/Developers/</a>.</p>
Modified: trunk/Web/page.inc
===================================================================
--- trunk/Web/page.inc 2006-09-30 23:32:35 UTC (rev 3661)
+++ trunk/Web/page.inc 2006-09-30 23:37:17 UTC (rev 3662)
@@ -278,6 +278,7 @@
$temp .= " <li><a href=\"http://sourceforge.net/project/showfiles.php?group_id=13216&package_id=92246\">Experimental builds</a></li>\n";
$temp .= " </ul>\n";
$temp .= " </li>\n";
+ $temp .= " <li><a href=\"/developer/needed.php\">Help Needed!</a></li>\n";
$temp .= "</ul>\n";
break;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-09-30 23:42:16
|
Revision: 3663
http://svn.sourceforge.net/winmerge/?rev=3663&view=rev
Author: gerundt
Date: 2006-09-30 16:42:08 -0700 (Sat, 30 Sep 2006)
Log Message:
-----------
BUG: [ 1566593 ] Download .exe file for 7-Zip Plugin
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/downloads.php
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-09-30 23:37:17 UTC (rev 3662)
+++ trunk/Web/Changes.txt 2006-09-30 23:42:08 UTC (rev 3663)
@@ -4,6 +4,8 @@
PATCH: [ 1566613 ] Web: Improve Developers Needed -page
Web: page.inc
Web\developer: needed.php
+ BUG: [ 1566593 ] Download .exe file for 7-Zip Plugin
+ Web: downloads.php
2006-09-26 Tim
PATCH [ 1565841 ] Web: Catalan translation is updated
Modified: trunk/Web/downloads.php
===================================================================
--- trunk/Web/downloads.php 2006-09-30 23:37:17 UTC (rev 3662)
+++ trunk/Web/downloads.php 2006-09-30 23:42:08 UTC (rev 3663)
@@ -13,7 +13,7 @@
<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/Merge7z0018-311-442.7z">7-Zip Plugin</a> (DllBuild 0018)</dt>
+ <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>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-09-30 23:50:59
|
Revision: 3664
http://svn.sourceforge.net/winmerge/?rev=3664&view=rev
Author: gerundt
Date: 2006-09-30 16:50:47 -0700 (Sat, 30 Sep 2006)
Log Message:
-----------
Add "Vaild HTML/CSS" images again.
Modified Paths:
--------------
trunk/Web/Changes.txt
Added Paths:
-----------
trunk/Web/images/valid-css.gif
trunk/Web/images/valid-html401.gif
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-09-30 23:42:08 UTC (rev 3663)
+++ trunk/Web/Changes.txt 2006-09-30 23:50:47 UTC (rev 3664)
@@ -6,6 +6,8 @@
Web\developer: needed.php
BUG: [ 1566593 ] Download .exe file for 7-Zip Plugin
Web: downloads.php
+ Add "Vaild HTML/CSS" images again.
+ Web\images: added valid-css.gif valid-html401.gif
2006-09-26 Tim
PATCH [ 1565841 ] Web: Catalan translation is updated
Added: trunk/Web/images/valid-css.gif
===================================================================
(Binary files differ)
Property changes on: trunk/Web/images/valid-css.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/Web/images/valid-html401.gif
===================================================================
(Binary files differ)
Property changes on: trunk/Web/images/valid-html401.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-10-03 20:30:55
|
Revision: 3679
http://svn.sourceforge.net/winmerge/?rev=3679&view=rev
Author: gerundt
Date: 2006-10-03 13:30:37 -0700 (Tue, 03 Oct 2006)
Log Message:
-----------
PATCH: [ 1569431 ] Couple of typos in Translations -page
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/developer/l10n/index.php
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-10-03 19:06:48 UTC (rev 3678)
+++ trunk/Web/Changes.txt 2006-10-03 20:30:37 UTC (rev 3679)
@@ -1,3 +1,7 @@
+2006-10-03 Tim
+ PATCH: [ 1569431 ] Couple of typos in Translations -page
+ Web\developer\l10n: index.php
+
2006-10-01 Tim
PATCH: [ 1566474 ] Web: Improve translations index page
Web\developer\l10n: index.php
Modified: trunk/Web/developer/l10n/index.php
===================================================================
--- trunk/Web/developer/l10n/index.php 2006-10-03 19:06:48 UTC (rev 3678)
+++ trunk/Web/developer/l10n/index.php 2006-10-03 20:30:37 UTC (rev 3679)
@@ -19,12 +19,12 @@
}
print("</ul>\n");
?>
-<p>To change languages, select the desired language from the View->Languages
+<p>To change a language, select the desired language from the View->Languages
menu choice; language names are shown in both languages (native language and
current WinMerge language).</p>
<p>If the desired language is not present, then you are missing a language file.
-Language files are names as <code>Merge</code> + <code><var>language name</var></code>
-+ <code>.lang</code> as filename extension. For example, for Catalan, you need
+Language files are named as <code>Merge</code> + <code><var>language name</var></code>
++ <code>.lang</code>, <code><em>.lang</em></code> as filename extension. For example, for Catalan, you need
to have the file <code>MergeCatalan.lang</code> in the <code>Languages</code>
subfolder of WinMerge folder. These would normally be installed for you by
installer, if you did a <em>Full Installation</em>. Installer also allows to
@@ -32,7 +32,7 @@
with installer you can copy the desired language file into the correct folder,
and restart WinMerge.</p>
<p>If you would like to update any of these translations or add another translation,
-then please follow <a href="instructions.php">these instructions</a>.</p>
+please follow <a href="instructions.php">these instructions</a>.</p>
<p>You can also take a look at the <a href="status.php">status of the translations</a>.</p>
<?php
$page->printFoot();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-10-07 08:59:45
|
Revision: 3686
http://svn.sourceforge.net/winmerge/?rev=3686&view=rev
Author: gerundt
Date: 2006-10-07 01:59:36 -0700 (Sat, 07 Oct 2006)
Log Message:
-----------
BUG: [ 1572388 ] Wrong link to regex.pdf
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/links.php
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-10-07 08:55:12 UTC (rev 3685)
+++ trunk/Web/Changes.txt 2006-10-07 08:59:36 UTC (rev 3686)
@@ -1,3 +1,7 @@
+2006-10-07 Tim
+ BUG: [ 1572388 ] Wrong link to regex.pdf
+ Web: links.php
+
2006-10-03 Tim
PATCH: [ 1569431 ] Couple of typos in Translations -page
Web\developer\l10n: index.php
Modified: trunk/Web/links.php
===================================================================
--- trunk/Web/links.php 2006-10-07 08:55:12 UTC (rev 3685)
+++ trunk/Web/links.php 2006-10-07 08:59:36 UTC (rev 3686)
@@ -27,7 +27,7 @@
<dd>Good HOWTO document for regular expressions</dd>
<dt><a href="http://www.zvon.org/other/PerlTutorial/Output/index.html">Tutorial</a></dt>
<dd>Regular expressions tutorial</dd>
- <dt><a href="http://gmckinney.info/resources/regex.pdf">regex.pdf</a></dt>
+ <dt><a href="http://www.night-ray.com/regex.pdf">regex.pdf</a></dt>
<dd>PDF quick reference</dd>
</dl>
<?php
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-10-07 09:42:26
|
Revision: 3687
http://svn.sourceforge.net/winmerge/?rev=3687&view=rev
Author: gerundt
Date: 2006-10-07 02:42:17 -0700 (Sat, 07 Oct 2006)
Log Message:
-----------
Cool, Perry is back! :)
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/developer/developers.xml
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-10-07 08:59:36 UTC (rev 3686)
+++ trunk/Web/Changes.txt 2006-10-07 09:42:17 UTC (rev 3687)
@@ -1,6 +1,8 @@
2006-10-07 Tim
BUG: [ 1572388 ] Wrong link to regex.pdf
Web: links.php
+ Cool, Perry is back! :)
+ Web\developer: developers.xml
2006-10-03 Tim
PATCH: [ 1569431 ] Couple of typos in Translations -page
Modified: trunk/Web/developer/developers.xml
===================================================================
--- trunk/Web/developer/developers.xml 2006-10-07 08:59:36 UTC (rev 3686)
+++ trunk/Web/developer/developers.xml 2006-10-07 09:42:17 UTC (rev 3687)
@@ -61,7 +61,7 @@
<role>2</role>
<email>ccganier at club-internet dot fr</email>
</developer>
- <developer inactive="1">
+ <developer>
<name>Perry Rapp</name>
<username>elsapo</username>
<role>2</role>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-10-08 20:24:22
|
Revision: 3693
http://svn.sourceforge.net/winmerge/?rev=3693&view=rev
Author: gerundt
Date: 2006-10-08 13:24:11 -0700 (Sun, 08 Oct 2006)
Log Message:
-----------
PATCH: [ 1573243 ] Web: Add info and link for developers-wiki
Modified Paths:
--------------
trunk/Web/Changes.txt
trunk/Web/developer/needed.php
Modified: trunk/Web/Changes.txt
===================================================================
--- trunk/Web/Changes.txt 2006-10-08 14:59:46 UTC (rev 3692)
+++ trunk/Web/Changes.txt 2006-10-08 20:24:11 UTC (rev 3693)
@@ -1,3 +1,7 @@
+2006-10-08 Tim
+ PATCH: [ 1573243 ] Web: Add info and link for developers-wiki
+ Web\developer: needed.php
+
2006-10-07 Tim
BUG: [ 1572388 ] Wrong link to regex.pdf
Web: links.php
Modified: trunk/Web/developer/needed.php
===================================================================
--- trunk/Web/developer/needed.php 2006-10-08 14:59:46 UTC (rev 3692)
+++ trunk/Web/developer/needed.php 2006-10-08 20:24:11 UTC (rev 3693)
@@ -54,7 +54,9 @@
them into the subversion repository.</p>
<p>You find more informations about programming WinMerge in the Subversion directory
-<a href="http://svn.sourceforge.net/viewvc/winmerge/trunk/Docs/Developers/">Docs/Developers/</a>.</p>
+<a href="http://svn.sourceforge.net/viewvc/winmerge/trunk/Docs/Developers/">Docs/Developers/</a>.
+We have also started a <a href="http://wiki.winmerge.org">developer-wiki</a> for WinMerge.
+Our plan is to use the wiki for planning and documenting WinMerge internals.</p>
<p>The general plan is to start people with anonymous Subversion access and let the regular developers commit
their changes to the Subversion repository. Those developers that
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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: <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-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: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.
|
