You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(148) |
Oct
(84) |
Nov
(130) |
Dec
(121) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(89) |
Feb
(50) |
Mar
(81) |
Apr
(45) |
May
(42) |
Jun
(46) |
Jul
(40) |
Aug
(98) |
Sep
(80) |
Oct
(101) |
Nov
(128) |
Dec
(46) |
| 2008 |
Jan
(132) |
Feb
(117) |
Mar
(118) |
Apr
(112) |
May
(69) |
Jun
(140) |
Jul
(164) |
Aug
(159) |
Sep
(115) |
Oct
(65) |
Nov
(80) |
Dec
(128) |
| 2009 |
Jan
(145) |
Feb
(97) |
Mar
(118) |
Apr
(87) |
May
(96) |
Jun
(83) |
Jul
(50) |
Aug
(42) |
Sep
(18) |
Oct
(32) |
Nov
(12) |
Dec
(35) |
| 2010 |
Jan
(38) |
Feb
(8) |
Mar
(5) |
Apr
(19) |
May
(23) |
Jun
(39) |
Jul
(16) |
Aug
(4) |
Sep
(60) |
Oct
(100) |
Nov
(57) |
Dec
(43) |
| 2011 |
Jan
(25) |
Feb
(1) |
Mar
(3) |
Apr
|
May
(13) |
Jun
(19) |
Jul
|
Aug
(6) |
Sep
(5) |
Oct
(6) |
Nov
|
Dec
(1) |
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(2) |
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
(19) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ga...@us...> - 2006-10-02 21:00:25
|
Revision: 3674
http://svn.sourceforge.net/winmerge/?rev=3674&view=rev
Author: galh
Date: 2006-10-02 09:23:06 -0700 (Mon, 02 Oct 2006)
Log Message:
-----------
BUG: [ 1566783 ] Crash on Save Project when no file is selected
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/MainFrm.cpp
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2006-10-02 13:48:41 UTC (rev 3673)
+++ branches/R2_6/Src/Changes.txt 2006-10-02 16:23:06 UTC (rev 3674)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+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
Modified: branches/R2_6/Src/MainFrm.cpp
===================================================================
--- branches/R2_6/Src/MainFrm.cpp 2006-10-02 13:48:41 UTC (rev 3673)
+++ branches/R2_6/Src/MainFrm.cpp 2006-10-02 16:23:06 UTC (rev 3674)
@@ -3060,7 +3060,8 @@
{
CDirDoc * pDoc = (CDirDoc*)pFrame->GetActiveDocument();
CDirView *pView = pDoc->GetMainView();
- int ind = pView->GetFirstSelectedInd();
+ // Use first item if no item is selected.
+ int ind = max(pView->GetFirstSelectedInd(), 0);
const DIFFITEM item = pView->GetItemAt(ind);
left = item.getLeftFilepath(pDoc->GetLeftBasePath());
left += "\\";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-10-02 11:11:30
|
Revision: 3672
http://svn.sourceforge.net/winmerge/?rev=3672&view=rev
Author: gerundt
Date: 2006-10-02 04:11:23 -0700 (Mon, 02 Oct 2006)
Log Message:
-----------
BUG: [ 1568946 ] Manual: Wrong link in "Install.xml"
Modified Paths:
--------------
branches/R2_6/Docs/Users/Manual/Changes.txt
branches/R2_6/Docs/Users/Manual/Install.xml
Modified: branches/R2_6/Docs/Users/Manual/Changes.txt
===================================================================
--- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-02 11:10:29 UTC (rev 3671)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-02 11:11:23 UTC (rev 3672)
@@ -4,6 +4,8 @@
PATCH: [ 1568945 ] Manual: Use <simpara> for all list items in Whatsnew
Manual: WinMerge_help.xml
Manual renamed file: Whatsnew_2_1.xml to Whatsnew.xml
+ BUG: [ 1568946 ] Manual: Wrong link in "Install.xml"
+ Manual: Install.xml
2006-09-29 Kimmo
PATCH: [ 1567301 ] Manual: 64-bit ShellExtension installing
Modified: branches/R2_6/Docs/Users/Manual/Install.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Install.xml 2006-10-02 11:10:29 UTC (rev 3671)
+++ branches/R2_6/Docs/Users/Manual/Install.xml 2006-10-02 11:11:23 UTC (rev 3672)
@@ -31,7 +31,7 @@
<para>Installer requires Admin-user priviledges in Windows NT4/2000/XP.
If you don't have Admin-user priviledges you can install WinMerge by
unzipping from an archive file (see <link
- linkend="InstallingFromArchive">Installing from an
+ linkend="InstallFromArchive">Installing from an
Archive</link>).</para>
</note>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-10-02 11:10:37
|
Revision: 3671
http://svn.sourceforge.net/winmerge/?rev=3671&view=rev
Author: gerundt
Date: 2006-10-02 04:10:29 -0700 (Mon, 02 Oct 2006)
Log Message:
-----------
BUG: [ 1568946 ] Manual: Wrong link in "Install.xml"
Modified Paths:
--------------
trunk/Docs/Users/Manual/Changes.txt
trunk/Docs/Users/Manual/Install.xml
Modified: trunk/Docs/Users/Manual/Changes.txt
===================================================================
--- trunk/Docs/Users/Manual/Changes.txt 2006-10-02 11:06:21 UTC (rev 3670)
+++ trunk/Docs/Users/Manual/Changes.txt 2006-10-02 11:10:29 UTC (rev 3671)
@@ -4,6 +4,8 @@
PATCH: [ 1568945 ] Manual: Use <simpara> for all list items in Whatsnew
Manual: WinMerge_help.xml
Manual renamed file: Whatsnew_2_1.xml to Whatsnew.xml
+ BUG: [ 1568946 ] Manual: Wrong link in "Install.xml"
+ Manual: Install.xml
2006-09-29 Kimmo
PATCH: [ 1567301 ] Manual: 64-bit ShellExtension installing
Modified: trunk/Docs/Users/Manual/Install.xml
===================================================================
--- trunk/Docs/Users/Manual/Install.xml 2006-10-02 11:06:21 UTC (rev 3670)
+++ trunk/Docs/Users/Manual/Install.xml 2006-10-02 11:10:29 UTC (rev 3671)
@@ -31,7 +31,7 @@
<para>Installer requires Admin-user priviledges in Windows NT4/2000/XP.
If you don't have Admin-user priviledges you can install WinMerge by
unzipping from an archive file (see <link
- linkend="InstallingFromArchive">Installing from an
+ linkend="InstallFromArchive">Installing from an
Archive</link>).</para>
</note>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-10-02 11:06:35
|
Revision: 3670
http://svn.sourceforge.net/winmerge/?rev=3670&view=rev
Author: gerundt
Date: 2006-10-02 04:06:21 -0700 (Mon, 02 Oct 2006)
Log Message:
-----------
PATCH: [ 1568945 ] Manual: Use <simpara> for all list items in Whatsnew
Modified Paths:
--------------
branches/R2_6/Docs/Users/Manual/Changes.txt
branches/R2_6/Docs/Users/Manual/WinMerge_help.xml
Added Paths:
-----------
branches/R2_6/Docs/Users/Manual/Whatsnew.xml
Removed Paths:
-------------
branches/R2_6/Docs/Users/Manual/Whatsnew_2_1.xml
Modified: branches/R2_6/Docs/Users/Manual/Changes.txt
===================================================================
--- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-02 11:01:00 UTC (rev 3669)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-02 11:06:21 UTC (rev 3670)
@@ -1,6 +1,9 @@
2006-10-02 Tim
PATCH: [ 1568943 ] Manual: Shows error for wrong "withads" argument
Manual/build: build_html.bat
+ PATCH: [ 1568945 ] Manual: Use <simpara> for all list items in Whatsnew
+ Manual: WinMerge_help.xml
+ Manual renamed file: Whatsnew_2_1.xml to Whatsnew.xml
2006-09-29 Kimmo
PATCH: [ 1567301 ] Manual: 64-bit ShellExtension installing
Copied: branches/R2_6/Docs/Users/Manual/Whatsnew.xml (from rev 3666, branches/R2_6/Docs/Users/Manual/Whatsnew_2_1.xml)
===================================================================
--- branches/R2_6/Docs/Users/Manual/Whatsnew.xml (rev 0)
+++ branches/R2_6/Docs/Users/Manual/Whatsnew.xml 2006-10-02 11:06:21 UTC (rev 3670)
@@ -0,0 +1,387 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sect1 id="Whatsnew">
+ <title>What's new in release</title>
+
+ <sect2>
+ <title>What's new in 2.5</title>
+
+ <para>WinMerge 2.5 is our development version. It contains lots of fixes
+ and improvements done after 2.4 releases. This list contains few most
+ important ones:</para>
+
+ <itemizedlist>
+ <listitem>
+ <simpara>New icons and splash screen</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Simpler and auto-closing folder compare progress
+ bar</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Line numbers in file compare</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Word-wrap in file compare</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>GUI for bookmarks in file compare</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Better character-level difference indication in file
+ compare</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>New Short size- columns in folder compare</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Merge difference which has cursor inside it (no need to
+ select difference first)</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Improved Project file saving and editing</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Creating patch file from multiple files (selected in folder
+ compare)</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>User-defined folder for file filters</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>New folder compare types to compare by sizes or modify
+ times</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Renaming items in folder compare</simpara>
+ </listitem>
+ </itemizedlist>
+ </sect2>
+
+ <sect2>
+ <title>What's new in 2.4</title>
+
+ <para>WinMerge 2.4 is an important update to 2.2. Great new features and
+ usability improvements. And bug fixes.</para>
+
+ <sect3>
+ <title>Multi-document support</title>
+
+ <para>Now it is possible to open (after enabled from Options) several
+ folder- and file-compare windows inside one WinMerge instance. This
+ changes the way work is done with WinMerge.</para>
+ </sect3>
+
+ <sect3>
+ <title>Limit to single-instance</title>
+
+ <para>WinMerge can be now limited to one instance. Opening new files
+ from commandline, shell extension or external application opens new
+ windows instead of new instances.</para>
+ </sect3>
+
+ <sect3>
+ <title>Active compare paths are shown in WinMerge caption</title>
+
+ <para>This helps when switching between different instances in Task
+ Manager or in Task Switcher (<keycombo>
+ <keycap>Alt</keycap>
+
+ <keycap>Tab</keycap>
+ </keycombo>).</para>
+ </sect3>
+
+ <sect3>
+ <title>Improved archive files support</title>
+
+ <para>Archive file support is greatly improved:</para>
+
+ <itemizedlist>
+ <listitem>
+ <simpara>Archive files can be opened from folder compare</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>WinMerge can (optionally) detect archive files from file
+ signature. This allows for example Open Office files to be detected
+ as archive files and opened.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Path to archive file and path inside archive is shown instead
+ of path to temporary folder</simpara>
+ </listitem>
+ </itemizedlist>
+ </sect3>
+
+ <sect3>
+ <title>Faster folder compare</title>
+
+ <para>Lots of important improvements have been implemented:</para>
+
+ <itemizedlist>
+ <listitem>
+ <simpara>New <guilabel>Quick Contents</guilabel> -compare methdod
+ allows faster compares</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Available memory does not anymore restrict maximun
+ filesize</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Compare statepane shows progressbar and compared/total amount
+ of items</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Possible to re-compare only selected items (from context
+ menu)</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Items can be hidden from view</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Simple reports</simpara>
+ </listitem>
+ </itemizedlist>
+ </sect3>
+
+ <sect3>
+ <title>More usable file compare</title>
+
+ <para>Showing line difference for all diffs (enabled from View-menu) is
+ the most important change. Others include:</para>
+
+ <itemizedlist>
+ <listitem>
+ <simpara>Character difference highlighting (more fine-grained
+ differences)</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Selecting syntax highligh colors</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Merge all selected differences with normal merge commands
+ (separate commands removed)</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Opening files to external editor from file compare</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Punctuation characters can break diffs in line differences (so
+ numbers separated by commas get properly highlighted as
+ diffs)</simpara>
+ </listitem>
+ </itemizedlist>
+ </sect3>
+
+ <sect3>
+ <title>Project files user interface</title>
+
+ <para>Project files can be loaded from menu <menuchoice>
+ <guimenu>File</guimenu>
+
+ <guimenuitem>Open Project...</guimenuitem>
+ </menuchoice>. And project files can be saved from
+ <guilabel>Open</guilabel> dialog.</para>
+ </sect3>
+ </sect2>
+
+ <sect2>
+ <title>What's new in 2.2</title>
+
+ <para>WinMerge 2.2 is distributed with an ANSI executable
+ (<filename>WinMerge.exe</filename>) for Windows 95/98/ME, and a Unicode
+ executable (<filename>WinMergeU.exe</filename>) for Windows NT /200/XP.
+ The unicode executable supports UCS-2 and UTF-8 files and
+ filenames.</para>
+
+ <note>
+ <para>It is unfortunate that two executable files are needed. But there
+ is no current way to get only one executable working. MS Unicode layer
+ does not help WinMerge since WinMerge needs to be able to compare files
+ in different codepages.</para>
+ </note>
+
+ <sect3>
+ <title>Archive support</title>
+
+ <para>WinMerge 2.2 can open and save several archive types. Archive
+ support requires installing 7-zip. Refer to <filename>Read
+ Me.rtf</filename> file for info about compatible 7-zip versions. 7-zip
+ can be downloaded from <ulink
+ url="http://www.7-zip.org/">7-zip.org</ulink>.</para>
+ </sect3>
+
+ <sect3>
+ <title>Shell integration</title>
+
+ <para>WinMerge 2.2 can be integrated into the Windows Shell. Shell
+ integration adds a "<guimenuitem>WinMerge</guimenuitem>" menuitem to
+ Windows Explorer's context menu for easy and fast comparing files and
+ directories.</para>
+ </sect3>
+
+ <sect3>
+ <title>Selecting filter from commandline</title>
+
+ <para>New <option>-f</option> commandline switch allows selecting used
+ filter or mask for files.</para>
+ </sect3>
+
+ <sect3>
+ <title>Project files</title>
+
+ <para>WinMerge can read paths to open from project files. Project files
+ are simple XML files storing one or two paths, and also possibly the
+ choice of which filter to use and whether to include subfolders.</para>
+ </sect3>
+
+ <sect3>
+ <title>Generating patches</title>
+
+ <para><ulink
+ url="http://www.gnu.org/software/diffutils/diffutils.html">GNU/diffutils</ulink>
+ compatible patch files can be created from two files. Several formats
+ and compare options are supported.</para>
+ </sect3>
+
+ <sect3>
+ <title>Plugins</title>
+
+ <para>Plugins are now supported to preprocess files before actual
+ comparison, or to extend editor functionality. Plugins can be programmed
+ using several languages supporting COM. Example plugins are
+ included.</para>
+ </sect3>
+
+ <sect3>
+ <title>Improved directory compare</title>
+
+ <para>Many new features and improvements:</para>
+
+ <itemizedlist>
+ <listitem>
+ <simpara>More columns have been added (e.g. file sizes and attributes),
+ and columns may be reordered, hidden, and displayed.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Filtered items now have a distinct category
+ (<guilabel>Skipped</guilabel>) and icons. Filtered items can be set
+ to hidden/visible from <guimenu>View</guimenu>-menu.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>There is a new floating statusbar during the compare process,
+ and comparison may be aborted, and the the files/dirs compared so
+ far are shown.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Newer file/directory is indicated with asterisk
+ (<guilabel>*</guilabel>) in date field.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>One or both directories can be set read-only, preventing
+ accidental overwriting.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>The number of selected items is shown in the statusbar.</simpara>
+ </listitem>
+ </itemizedlist>
+ </sect3>
+
+ <sect3>
+ <title>Improved file compare</title>
+
+ <para>Many new features and improvements:</para>
+
+ <itemizedlist>
+ <listitem>
+ <simpara>Rewritten undo/redo code.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Fixed "<guilabel>Ignore blank lines</guilabel>"
+ feature.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Enhanced EOL handling (files can contain different EOL styles
+ in one file).</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Linenumber, current column and char, line length and char
+ count shown in statusbar.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>One ot both files can be set read-only to prevent accidental
+ edits.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Copy difference to left/right and advance to next makes
+ merging faster.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Diff pane to show current difference in two vertical
+ panes.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Highlight word differences in lines.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Merge-mode (or 1.7 mode) to navigate and merge differences
+ easier and faster.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Goto -dialog for moving fast to certain line or
+ difference.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Location pane showing overall picture from files and allowing
+ moving to location by double-clicking.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Moved lines detection. Moved lines can be shown with different
+ color in file area and location pane.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>More color options. Text color, missing line colors and moved
+ line colors can be configured.</simpara>
+ </listitem>
+ </itemizedlist>
+ </sect3>
+ </sect2>
+</sect1>
Deleted: branches/R2_6/Docs/Users/Manual/Whatsnew_2_1.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Whatsnew_2_1.xml 2006-10-02 11:01:00 UTC (rev 3669)
+++ branches/R2_6/Docs/Users/Manual/Whatsnew_2_1.xml 2006-10-02 11:06:21 UTC (rev 3670)
@@ -1,387 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sect1 id="Whatsnew">
- <title>What's new in release</title>
-
- <sect2>
- <title>What's new in 2.5</title>
-
- <para>WinMerge 2.5 is our development version. It contains lots of fixes
- and improvements done after 2.4 releases. This list contains few most
- important ones:</para>
-
- <itemizedlist>
- <listitem>
- <simpara>New icons and splash screen</simpara>
- </listitem>
-
- <listitem>
- <simpara>Simpler and auto-closing folder compare progress
- bar</simpara>
- </listitem>
-
- <listitem>
- <simpara>Line numbers in file compare</simpara>
- </listitem>
-
- <listitem>
- <simpara>Word-wrap in file compare</simpara>
- </listitem>
-
- <listitem>
- <simpara>GUI for bookmarks in file compare</simpara>
- </listitem>
-
- <listitem>
- <simpara>Better character-level difference indication in file
- compare</simpara>
- </listitem>
-
- <listitem>
- <simpara>New Short size- columns in folder compare</simpara>
- </listitem>
-
- <listitem>
- <simpara>Merge difference which has cursor inside it (no need to
- select difference first)</simpara>
- </listitem>
-
- <listitem>
- <simpara>Improved Project file saving and editing</simpara>
- </listitem>
-
- <listitem>
- <simpara>Creating patch file from multiple files (selected in folder
- compare)</simpara>
- </listitem>
-
- <listitem>
- <simpara>User-defined folder for file filters</simpara>
- </listitem>
-
- <listitem>
- <simpara>New folder compare types to compare by sizes or modify
- times</simpara>
- </listitem>
-
- <listitem>
- <simpara>Renaming items in folder compare</simpara>
- </listitem>
- </itemizedlist>
- </sect2>
-
- <sect2>
- <title>What's new in 2.4</title>
-
- <para>WinMerge 2.4 is an important update to 2.2. Great new features and
- usability improvements. And bug fixes.</para>
-
- <sect3>
- <title>Multi-document support</title>
-
- <para>Now it is possible to open (after enabled from Options) several
- folder- and file-compare windows inside one WinMerge instance. This
- changes the way work is done with WinMerge.</para>
- </sect3>
-
- <sect3>
- <title>Limit to single-instance</title>
-
- <para>WinMerge can be now limited to one instance. Opening new files
- from commandline, shell extension or external application opens new
- windows instead of new instances.</para>
- </sect3>
-
- <sect3>
- <title>Active compare paths are shown in WinMerge caption</title>
-
- <para>This helps when switching between different instances in Task
- Manager or in Task Switcher (<keycombo>
- <keycap>Alt</keycap>
-
- <keycap>Tab</keycap>
- </keycombo>).</para>
- </sect3>
-
- <sect3>
- <title>Improved archive files support</title>
-
- <para>Archive file support is greatly improved:</para>
-
- <itemizedlist>
- <listitem>
- <para>Archive files can be opened from folder compare</para>
- </listitem>
-
- <listitem>
- <para>WinMerge can (optionally) detect archive files from file
- signature. This allows for example Open Office files to be detected
- as archive files and opened.</para>
- </listitem>
-
- <listitem>
- <para>Path to archive file and path inside archive is shown instead
- of path to temporary folder</para>
- </listitem>
- </itemizedlist>
- </sect3>
-
- <sect3>
- <title>Faster folder compare</title>
-
- <para>Lots of important improvements have been implemented:</para>
-
- <itemizedlist>
- <listitem>
- <para>New <guilabel>Quick Contents</guilabel> -compare methdod
- allows faster compares</para>
- </listitem>
-
- <listitem>
- <para>Available memory does not anymore restrict maximun
- filesize</para>
- </listitem>
-
- <listitem>
- <para>Compare statepane shows progressbar and compared/total amount
- of items</para>
- </listitem>
-
- <listitem>
- <para>Possible to re-compare only selected items (from context
- menu)</para>
- </listitem>
-
- <listitem>
- <para>Items can be hidden from view</para>
- </listitem>
-
- <listitem>
- <para>Simple reports</para>
- </listitem>
- </itemizedlist>
- </sect3>
-
- <sect3>
- <title>More usable file compare</title>
-
- <para>Showing line difference for all diffs (enabled from View-menu) is
- the most important change. Others include:</para>
-
- <itemizedlist>
- <listitem>
- <para>Character difference highlighting (more fine-grained
- differences)</para>
- </listitem>
-
- <listitem>
- <para>Selecting syntax highligh colors</para>
- </listitem>
-
- <listitem>
- <para>Merge all selected differences with normal merge commands
- (separate commands removed)</para>
- </listitem>
-
- <listitem>
- <para>Opening files to external editor from file compare</para>
- </listitem>
-
- <listitem>
- <para>Punctuation characters can break diffs in line differences (so
- numbers separated by commas get properly highlighted as
- diffs)</para>
- </listitem>
- </itemizedlist>
- </sect3>
-
- <sect3>
- <title>Project files user interface</title>
-
- <para>Project files can be loaded from menu <menuchoice>
- <guimenu>File</guimenu>
-
- <guimenuitem>Open Project...</guimenuitem>
- </menuchoice>. And project files can be saved from
- <guilabel>Open</guilabel> dialog.</para>
- </sect3>
- </sect2>
-
- <sect2>
- <title>What's new in 2.2</title>
-
- <para>WinMerge 2.2 is distributed with an ANSI executable
- (<filename>WinMerge.exe</filename>) for Windows 95/98/ME, and a Unicode
- executable (<filename>WinMergeU.exe</filename>) for Windows NT /200/XP.
- The unicode executable supports UCS-2 and UTF-8 files and
- filenames.</para>
-
- <note>
- <para>It is unfortunate that two executable files are needed. But there
- is no current way to get only one executable working. MS Unicode layer
- does not help WinMerge since WinMerge needs to be able to compare files
- in different codepages.</para>
- </note>
-
- <sect3>
- <title>Archive support</title>
-
- <para>WinMerge 2.2 can open and save several archive types. Archive
- support requires installing 7-zip. Refer to <filename>Read
- Me.rtf</filename> file for info about compatible 7-zip versions. 7-zip
- can be downloaded from <ulink
- url="http://www.7-zip.org/">7-zip.org</ulink>.</para>
- </sect3>
-
- <sect3>
- <title>Shell integration</title>
-
- <para>WinMerge 2.2 can be integrated into the Windows Shell. Shell
- integration adds a "<guimenuitem>WinMerge</guimenuitem>" menuitem to
- Windows Explorer's context menu for easy and fast comparing files and
- directories.</para>
- </sect3>
-
- <sect3>
- <title>Selecting filter from commandline</title>
-
- <para>New <option>-f</option> commandline switch allows selecting used
- filter or mask for files.</para>
- </sect3>
-
- <sect3>
- <title>Project files</title>
-
- <para>WinMerge can read paths to open from project files. Project files
- are simple XML files storing one or two paths, and also possibly the
- choice of which filter to use and whether to include subfolders.</para>
- </sect3>
-
- <sect3>
- <title>Generating patches</title>
-
- <para><ulink
- url="http://www.gnu.org/software/diffutils/diffutils.html">GNU/diffutils</ulink>
- compatible patch files can be created from two files. Several formats
- and compare options are supported.</para>
- </sect3>
-
- <sect3>
- <title>Plugins</title>
-
- <para>Plugins are now supported to preprocess files before actual
- comparison, or to extend editor functionality. Plugins can be programmed
- using several languages supporting COM. Example plugins are
- included.</para>
- </sect3>
-
- <sect3>
- <title>Improved directory compare</title>
-
- <para>Many new features and improvements:</para>
-
- <itemizedlist>
- <listitem>
- <para>More columns have been added (e.g. file sizes and attributes),
- and columns may be reordered, hidden, and displayed.</para>
- </listitem>
-
- <listitem>
- <para>Filtered items now have a distinct category
- (<guilabel>Skipped</guilabel>) and icons. Filtered items can be set
- to hidden/visible from <guimenu>View</guimenu>-menu.</para>
- </listitem>
-
- <listitem>
- <para>There is a new floating statusbar during the compare process,
- and comparison may be aborted, and the the files/dirs compared so
- far are shown.</para>
- </listitem>
-
- <listitem>
- <para>Newer file/directory is indicated with asterisk
- (<guilabel>*</guilabel>) in date field.</para>
- </listitem>
-
- <listitem>
- <para>One or both directories can be set read-only, preventing
- accidental overwriting.</para>
- </listitem>
-
- <listitem>
- <para>The number of selected items is shown in the statusbar.</para>
- </listitem>
- </itemizedlist>
- </sect3>
-
- <sect3>
- <title>Improved file compare</title>
-
- <para>Many new features and improvements:</para>
-
- <itemizedlist>
- <listitem>
- <para>Rewritten undo/redo code.</para>
- </listitem>
-
- <listitem>
- <para>Fixed "<guilabel>Ignore blank lines</guilabel>"
- feature.</para>
- </listitem>
-
- <listitem>
- <para>Enhanced EOL handling (files can contain different EOL styles
- in one file).</para>
- </listitem>
-
- <listitem>
- <para>Linenumber, current column and char, line length and char
- count shown in statusbar.</para>
- </listitem>
-
- <listitem>
- <para>One ot both files can be set read-only to prevent accidental
- edits.</para>
- </listitem>
-
- <listitem>
- <para>Copy difference to left/right and advance to next makes
- merging faster.</para>
- </listitem>
-
- <listitem>
- <para>Diff pane to show current difference in two vertical
- panes.</para>
- </listitem>
-
- <listitem>
- <para>Highlight word differences in lines.</para>
- </listitem>
-
- <listitem>
- <para>Merge-mode (or 1.7 mode) to navigate and merge differences
- easier and faster.</para>
- </listitem>
-
- <listitem>
- <para>Goto -dialog for moving fast to certain line or
- difference.</para>
- </listitem>
-
- <listitem>
- <para>Location pane showing overall picture from files and allowing
- moving to location by double-clicking.</para>
- </listitem>
-
- <listitem>
- <para>Moved lines detection. Moved lines can be shown with different
- color in file area and location pane.</para>
- </listitem>
-
- <listitem>
- <para>More color options. Text color, missing line colors and moved
- line colors can be configured.</para>
- </listitem>
- </itemizedlist>
- </sect3>
- </sect2>
-</sect1>
Modified: branches/R2_6/Docs/Users/Manual/WinMerge_help.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/WinMerge_help.xml 2006-10-02 11:01:00 UTC (rev 3669)
+++ branches/R2_6/Docs/Users/Manual/WinMerge_help.xml 2006-10-02 11:06:21 UTC (rev 3670)
@@ -4,7 +4,7 @@
<!ENTITY AboutDoc SYSTEM "About_Doc.xml">
<!ENTITY QuickStart SYSTEM "Quick_start.xml">
<!ENTITY Introduction SYSTEM "Introduction.xml">
-<!ENTITY WhatsNew21 SYSTEM "Whatsnew_2_1.xml">
+<!ENTITY WhatsNew SYSTEM "Whatsnew.xml">
<!ENTITY Install SYSTEM "Install.xml">
<!ENTITY IntroductDiffing SYSTEM "Intro_diffs.xml">
<!ENTITY OpenPaths SYSTEM "Open_paths.xml">
@@ -84,7 +84,7 @@
&Introduction;
- &WhatsNew21;
+ &WhatsNew;
&Install;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-10-02 11:01:16
|
Revision: 3669
http://svn.sourceforge.net/winmerge/?rev=3669&view=rev
Author: gerundt
Date: 2006-10-02 04:01:00 -0700 (Mon, 02 Oct 2006)
Log Message:
-----------
PATCH: [ 1568945 ] Manual: Use <simpara> for all list items in Whatsnew
Modified Paths:
--------------
trunk/Docs/Users/Manual/Changes.txt
trunk/Docs/Users/Manual/WinMerge_help.xml
Added Paths:
-----------
trunk/Docs/Users/Manual/Whatsnew.xml
Removed Paths:
-------------
trunk/Docs/Users/Manual/Whatsnew_2_1.xml
Modified: trunk/Docs/Users/Manual/Changes.txt
===================================================================
--- trunk/Docs/Users/Manual/Changes.txt 2006-10-02 10:50:38 UTC (rev 3668)
+++ trunk/Docs/Users/Manual/Changes.txt 2006-10-02 11:01:00 UTC (rev 3669)
@@ -1,6 +1,9 @@
2006-10-02 Tim
PATCH: [ 1568943 ] Manual: Shows error for wrong "withads" argument
Manual/build: build_html.bat
+ PATCH: [ 1568945 ] Manual: Use <simpara> for all list items in Whatsnew
+ Manual: WinMerge_help.xml
+ Manual renamed file: Whatsnew_2_1.xml to Whatsnew.xml
2006-09-29 Kimmo
PATCH: [ 1567301 ] Manual: 64-bit ShellExtension installing
Copied: trunk/Docs/Users/Manual/Whatsnew.xml (from rev 3666, trunk/Docs/Users/Manual/Whatsnew_2_1.xml)
===================================================================
--- trunk/Docs/Users/Manual/Whatsnew.xml (rev 0)
+++ trunk/Docs/Users/Manual/Whatsnew.xml 2006-10-02 11:01:00 UTC (rev 3669)
@@ -0,0 +1,387 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sect1 id="Whatsnew">
+ <title>What's new in release</title>
+
+ <sect2>
+ <title>What's new in 2.5</title>
+
+ <para>WinMerge 2.5 is our development version. It contains lots of fixes
+ and improvements done after 2.4 releases. This list contains few most
+ important ones:</para>
+
+ <itemizedlist>
+ <listitem>
+ <simpara>New icons and splash screen</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Simpler and auto-closing folder compare progress
+ bar</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Line numbers in file compare</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Word-wrap in file compare</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>GUI for bookmarks in file compare</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Better character-level difference indication in file
+ compare</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>New Short size- columns in folder compare</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Merge difference which has cursor inside it (no need to
+ select difference first)</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Improved Project file saving and editing</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Creating patch file from multiple files (selected in folder
+ compare)</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>User-defined folder for file filters</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>New folder compare types to compare by sizes or modify
+ times</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Renaming items in folder compare</simpara>
+ </listitem>
+ </itemizedlist>
+ </sect2>
+
+ <sect2>
+ <title>What's new in 2.4</title>
+
+ <para>WinMerge 2.4 is an important update to 2.2. Great new features and
+ usability improvements. And bug fixes.</para>
+
+ <sect3>
+ <title>Multi-document support</title>
+
+ <para>Now it is possible to open (after enabled from Options) several
+ folder- and file-compare windows inside one WinMerge instance. This
+ changes the way work is done with WinMerge.</para>
+ </sect3>
+
+ <sect3>
+ <title>Limit to single-instance</title>
+
+ <para>WinMerge can be now limited to one instance. Opening new files
+ from commandline, shell extension or external application opens new
+ windows instead of new instances.</para>
+ </sect3>
+
+ <sect3>
+ <title>Active compare paths are shown in WinMerge caption</title>
+
+ <para>This helps when switching between different instances in Task
+ Manager or in Task Switcher (<keycombo>
+ <keycap>Alt</keycap>
+
+ <keycap>Tab</keycap>
+ </keycombo>).</para>
+ </sect3>
+
+ <sect3>
+ <title>Improved archive files support</title>
+
+ <para>Archive file support is greatly improved:</para>
+
+ <itemizedlist>
+ <listitem>
+ <simpara>Archive files can be opened from folder compare</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>WinMerge can (optionally) detect archive files from file
+ signature. This allows for example Open Office files to be detected
+ as archive files and opened.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Path to archive file and path inside archive is shown instead
+ of path to temporary folder</simpara>
+ </listitem>
+ </itemizedlist>
+ </sect3>
+
+ <sect3>
+ <title>Faster folder compare</title>
+
+ <para>Lots of important improvements have been implemented:</para>
+
+ <itemizedlist>
+ <listitem>
+ <simpara>New <guilabel>Quick Contents</guilabel> -compare methdod
+ allows faster compares</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Available memory does not anymore restrict maximun
+ filesize</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Compare statepane shows progressbar and compared/total amount
+ of items</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Possible to re-compare only selected items (from context
+ menu)</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Items can be hidden from view</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Simple reports</simpara>
+ </listitem>
+ </itemizedlist>
+ </sect3>
+
+ <sect3>
+ <title>More usable file compare</title>
+
+ <para>Showing line difference for all diffs (enabled from View-menu) is
+ the most important change. Others include:</para>
+
+ <itemizedlist>
+ <listitem>
+ <simpara>Character difference highlighting (more fine-grained
+ differences)</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Selecting syntax highligh colors</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Merge all selected differences with normal merge commands
+ (separate commands removed)</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Opening files to external editor from file compare</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Punctuation characters can break diffs in line differences (so
+ numbers separated by commas get properly highlighted as
+ diffs)</simpara>
+ </listitem>
+ </itemizedlist>
+ </sect3>
+
+ <sect3>
+ <title>Project files user interface</title>
+
+ <para>Project files can be loaded from menu <menuchoice>
+ <guimenu>File</guimenu>
+
+ <guimenuitem>Open Project...</guimenuitem>
+ </menuchoice>. And project files can be saved from
+ <guilabel>Open</guilabel> dialog.</para>
+ </sect3>
+ </sect2>
+
+ <sect2>
+ <title>What's new in 2.2</title>
+
+ <para>WinMerge 2.2 is distributed with an ANSI executable
+ (<filename>WinMerge.exe</filename>) for Windows 95/98/ME, and a Unicode
+ executable (<filename>WinMergeU.exe</filename>) for Windows NT /200/XP.
+ The unicode executable supports UCS-2 and UTF-8 files and
+ filenames.</para>
+
+ <note>
+ <para>It is unfortunate that two executable files are needed. But there
+ is no current way to get only one executable working. MS Unicode layer
+ does not help WinMerge since WinMerge needs to be able to compare files
+ in different codepages.</para>
+ </note>
+
+ <sect3>
+ <title>Archive support</title>
+
+ <para>WinMerge 2.2 can open and save several archive types. Archive
+ support requires installing 7-zip. Refer to <filename>Read
+ Me.rtf</filename> file for info about compatible 7-zip versions. 7-zip
+ can be downloaded from <ulink
+ url="http://www.7-zip.org/">7-zip.org</ulink>.</para>
+ </sect3>
+
+ <sect3>
+ <title>Shell integration</title>
+
+ <para>WinMerge 2.2 can be integrated into the Windows Shell. Shell
+ integration adds a "<guimenuitem>WinMerge</guimenuitem>" menuitem to
+ Windows Explorer's context menu for easy and fast comparing files and
+ directories.</para>
+ </sect3>
+
+ <sect3>
+ <title>Selecting filter from commandline</title>
+
+ <para>New <option>-f</option> commandline switch allows selecting used
+ filter or mask for files.</para>
+ </sect3>
+
+ <sect3>
+ <title>Project files</title>
+
+ <para>WinMerge can read paths to open from project files. Project files
+ are simple XML files storing one or two paths, and also possibly the
+ choice of which filter to use and whether to include subfolders.</para>
+ </sect3>
+
+ <sect3>
+ <title>Generating patches</title>
+
+ <para><ulink
+ url="http://www.gnu.org/software/diffutils/diffutils.html">GNU/diffutils</ulink>
+ compatible patch files can be created from two files. Several formats
+ and compare options are supported.</para>
+ </sect3>
+
+ <sect3>
+ <title>Plugins</title>
+
+ <para>Plugins are now supported to preprocess files before actual
+ comparison, or to extend editor functionality. Plugins can be programmed
+ using several languages supporting COM. Example plugins are
+ included.</para>
+ </sect3>
+
+ <sect3>
+ <title>Improved directory compare</title>
+
+ <para>Many new features and improvements:</para>
+
+ <itemizedlist>
+ <listitem>
+ <simpara>More columns have been added (e.g. file sizes and attributes),
+ and columns may be reordered, hidden, and displayed.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Filtered items now have a distinct category
+ (<guilabel>Skipped</guilabel>) and icons. Filtered items can be set
+ to hidden/visible from <guimenu>View</guimenu>-menu.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>There is a new floating statusbar during the compare process,
+ and comparison may be aborted, and the the files/dirs compared so
+ far are shown.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Newer file/directory is indicated with asterisk
+ (<guilabel>*</guilabel>) in date field.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>One or both directories can be set read-only, preventing
+ accidental overwriting.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>The number of selected items is shown in the statusbar.</simpara>
+ </listitem>
+ </itemizedlist>
+ </sect3>
+
+ <sect3>
+ <title>Improved file compare</title>
+
+ <para>Many new features and improvements:</para>
+
+ <itemizedlist>
+ <listitem>
+ <simpara>Rewritten undo/redo code.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Fixed "<guilabel>Ignore blank lines</guilabel>"
+ feature.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Enhanced EOL handling (files can contain different EOL styles
+ in one file).</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Linenumber, current column and char, line length and char
+ count shown in statusbar.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>One ot both files can be set read-only to prevent accidental
+ edits.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Copy difference to left/right and advance to next makes
+ merging faster.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Diff pane to show current difference in two vertical
+ panes.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Highlight word differences in lines.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Merge-mode (or 1.7 mode) to navigate and merge differences
+ easier and faster.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Goto -dialog for moving fast to certain line or
+ difference.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Location pane showing overall picture from files and allowing
+ moving to location by double-clicking.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>Moved lines detection. Moved lines can be shown with different
+ color in file area and location pane.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>More color options. Text color, missing line colors and moved
+ line colors can be configured.</simpara>
+ </listitem>
+ </itemizedlist>
+ </sect3>
+ </sect2>
+</sect1>
Deleted: trunk/Docs/Users/Manual/Whatsnew_2_1.xml
===================================================================
--- trunk/Docs/Users/Manual/Whatsnew_2_1.xml 2006-10-02 10:50:38 UTC (rev 3668)
+++ trunk/Docs/Users/Manual/Whatsnew_2_1.xml 2006-10-02 11:01:00 UTC (rev 3669)
@@ -1,387 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sect1 id="Whatsnew">
- <title>What's new in release</title>
-
- <sect2>
- <title>What's new in 2.5</title>
-
- <para>WinMerge 2.5 is our development version. It contains lots of fixes
- and improvements done after 2.4 releases. This list contains few most
- important ones:</para>
-
- <itemizedlist>
- <listitem>
- <simpara>New icons and splash screen</simpara>
- </listitem>
-
- <listitem>
- <simpara>Simpler and auto-closing folder compare progress
- bar</simpara>
- </listitem>
-
- <listitem>
- <simpara>Line numbers in file compare</simpara>
- </listitem>
-
- <listitem>
- <simpara>Word-wrap in file compare</simpara>
- </listitem>
-
- <listitem>
- <simpara>GUI for bookmarks in file compare</simpara>
- </listitem>
-
- <listitem>
- <simpara>Better character-level difference indication in file
- compare</simpara>
- </listitem>
-
- <listitem>
- <simpara>New Short size- columns in folder compare</simpara>
- </listitem>
-
- <listitem>
- <simpara>Merge difference which has cursor inside it (no need to
- select difference first)</simpara>
- </listitem>
-
- <listitem>
- <simpara>Improved Project file saving and editing</simpara>
- </listitem>
-
- <listitem>
- <simpara>Creating patch file from multiple files (selected in folder
- compare)</simpara>
- </listitem>
-
- <listitem>
- <simpara>User-defined folder for file filters</simpara>
- </listitem>
-
- <listitem>
- <simpara>New folder compare types to compare by sizes or modify
- times</simpara>
- </listitem>
-
- <listitem>
- <simpara>Renaming items in folder compare</simpara>
- </listitem>
- </itemizedlist>
- </sect2>
-
- <sect2>
- <title>What's new in 2.4</title>
-
- <para>WinMerge 2.4 is an important update to 2.2. Great new features and
- usability improvements. And bug fixes.</para>
-
- <sect3>
- <title>Multi-document support</title>
-
- <para>Now it is possible to open (after enabled from Options) several
- folder- and file-compare windows inside one WinMerge instance. This
- changes the way work is done with WinMerge.</para>
- </sect3>
-
- <sect3>
- <title>Limit to single-instance</title>
-
- <para>WinMerge can be now limited to one instance. Opening new files
- from commandline, shell extension or external application opens new
- windows instead of new instances.</para>
- </sect3>
-
- <sect3>
- <title>Active compare paths are shown in WinMerge caption</title>
-
- <para>This helps when switching between different instances in Task
- Manager or in Task Switcher (<keycombo>
- <keycap>Alt</keycap>
-
- <keycap>Tab</keycap>
- </keycombo>).</para>
- </sect3>
-
- <sect3>
- <title>Improved archive files support</title>
-
- <para>Archive file support is greatly improved:</para>
-
- <itemizedlist>
- <listitem>
- <para>Archive files can be opened from folder compare</para>
- </listitem>
-
- <listitem>
- <para>WinMerge can (optionally) detect archive files from file
- signature. This allows for example Open Office files to be detected
- as archive files and opened.</para>
- </listitem>
-
- <listitem>
- <para>Path to archive file and path inside archive is shown instead
- of path to temporary folder</para>
- </listitem>
- </itemizedlist>
- </sect3>
-
- <sect3>
- <title>Faster folder compare</title>
-
- <para>Lots of important improvements have been implemented:</para>
-
- <itemizedlist>
- <listitem>
- <para>New <guilabel>Quick Contents</guilabel> -compare methdod
- allows faster compares</para>
- </listitem>
-
- <listitem>
- <para>Available memory does not anymore restrict maximun
- filesize</para>
- </listitem>
-
- <listitem>
- <para>Compare statepane shows progressbar and compared/total amount
- of items</para>
- </listitem>
-
- <listitem>
- <para>Possible to re-compare only selected items (from context
- menu)</para>
- </listitem>
-
- <listitem>
- <para>Items can be hidden from view</para>
- </listitem>
-
- <listitem>
- <para>Simple reports</para>
- </listitem>
- </itemizedlist>
- </sect3>
-
- <sect3>
- <title>More usable file compare</title>
-
- <para>Showing line difference for all diffs (enabled from View-menu) is
- the most important change. Others include:</para>
-
- <itemizedlist>
- <listitem>
- <para>Character difference highlighting (more fine-grained
- differences)</para>
- </listitem>
-
- <listitem>
- <para>Selecting syntax highligh colors</para>
- </listitem>
-
- <listitem>
- <para>Merge all selected differences with normal merge commands
- (separate commands removed)</para>
- </listitem>
-
- <listitem>
- <para>Opening files to external editor from file compare</para>
- </listitem>
-
- <listitem>
- <para>Punctuation characters can break diffs in line differences (so
- numbers separated by commas get properly highlighted as
- diffs)</para>
- </listitem>
- </itemizedlist>
- </sect3>
-
- <sect3>
- <title>Project files user interface</title>
-
- <para>Project files can be loaded from menu <menuchoice>
- <guimenu>File</guimenu>
-
- <guimenuitem>Open Project...</guimenuitem>
- </menuchoice>. And project files can be saved from
- <guilabel>Open</guilabel> dialog.</para>
- </sect3>
- </sect2>
-
- <sect2>
- <title>What's new in 2.2</title>
-
- <para>WinMerge 2.2 is distributed with an ANSI executable
- (<filename>WinMerge.exe</filename>) for Windows 95/98/ME, and a Unicode
- executable (<filename>WinMergeU.exe</filename>) for Windows NT /200/XP.
- The unicode executable supports UCS-2 and UTF-8 files and
- filenames.</para>
-
- <note>
- <para>It is unfortunate that two executable files are needed. But there
- is no current way to get only one executable working. MS Unicode layer
- does not help WinMerge since WinMerge needs to be able to compare files
- in different codepages.</para>
- </note>
-
- <sect3>
- <title>Archive support</title>
-
- <para>WinMerge 2.2 can open and save several archive types. Archive
- support requires installing 7-zip. Refer to <filename>Read
- Me.rtf</filename> file for info about compatible 7-zip versions. 7-zip
- can be downloaded from <ulink
- url="http://www.7-zip.org/">7-zip.org</ulink>.</para>
- </sect3>
-
- <sect3>
- <title>Shell integration</title>
-
- <para>WinMerge 2.2 can be integrated into the Windows Shell. Shell
- integration adds a "<guimenuitem>WinMerge</guimenuitem>" menuitem to
- Windows Explorer's context menu for easy and fast comparing files and
- directories.</para>
- </sect3>
-
- <sect3>
- <title>Selecting filter from commandline</title>
-
- <para>New <option>-f</option> commandline switch allows selecting used
- filter or mask for files.</para>
- </sect3>
-
- <sect3>
- <title>Project files</title>
-
- <para>WinMerge can read paths to open from project files. Project files
- are simple XML files storing one or two paths, and also possibly the
- choice of which filter to use and whether to include subfolders.</para>
- </sect3>
-
- <sect3>
- <title>Generating patches</title>
-
- <para><ulink
- url="http://www.gnu.org/software/diffutils/diffutils.html">GNU/diffutils</ulink>
- compatible patch files can be created from two files. Several formats
- and compare options are supported.</para>
- </sect3>
-
- <sect3>
- <title>Plugins</title>
-
- <para>Plugins are now supported to preprocess files before actual
- comparison, or to extend editor functionality. Plugins can be programmed
- using several languages supporting COM. Example plugins are
- included.</para>
- </sect3>
-
- <sect3>
- <title>Improved directory compare</title>
-
- <para>Many new features and improvements:</para>
-
- <itemizedlist>
- <listitem>
- <para>More columns have been added (e.g. file sizes and attributes),
- and columns may be reordered, hidden, and displayed.</para>
- </listitem>
-
- <listitem>
- <para>Filtered items now have a distinct category
- (<guilabel>Skipped</guilabel>) and icons. Filtered items can be set
- to hidden/visible from <guimenu>View</guimenu>-menu.</para>
- </listitem>
-
- <listitem>
- <para>There is a new floating statusbar during the compare process,
- and comparison may be aborted, and the the files/dirs compared so
- far are shown.</para>
- </listitem>
-
- <listitem>
- <para>Newer file/directory is indicated with asterisk
- (<guilabel>*</guilabel>) in date field.</para>
- </listitem>
-
- <listitem>
- <para>One or both directories can be set read-only, preventing
- accidental overwriting.</para>
- </listitem>
-
- <listitem>
- <para>The number of selected items is shown in the statusbar.</para>
- </listitem>
- </itemizedlist>
- </sect3>
-
- <sect3>
- <title>Improved file compare</title>
-
- <para>Many new features and improvements:</para>
-
- <itemizedlist>
- <listitem>
- <para>Rewritten undo/redo code.</para>
- </listitem>
-
- <listitem>
- <para>Fixed "<guilabel>Ignore blank lines</guilabel>"
- feature.</para>
- </listitem>
-
- <listitem>
- <para>Enhanced EOL handling (files can contain different EOL styles
- in one file).</para>
- </listitem>
-
- <listitem>
- <para>Linenumber, current column and char, line length and char
- count shown in statusbar.</para>
- </listitem>
-
- <listitem>
- <para>One ot both files can be set read-only to prevent accidental
- edits.</para>
- </listitem>
-
- <listitem>
- <para>Copy difference to left/right and advance to next makes
- merging faster.</para>
- </listitem>
-
- <listitem>
- <para>Diff pane to show current difference in two vertical
- panes.</para>
- </listitem>
-
- <listitem>
- <para>Highlight word differences in lines.</para>
- </listitem>
-
- <listitem>
- <para>Merge-mode (or 1.7 mode) to navigate and merge differences
- easier and faster.</para>
- </listitem>
-
- <listitem>
- <para>Goto -dialog for moving fast to certain line or
- difference.</para>
- </listitem>
-
- <listitem>
- <para>Location pane showing overall picture from files and allowing
- moving to location by double-clicking.</para>
- </listitem>
-
- <listitem>
- <para>Moved lines detection. Moved lines can be shown with different
- color in file area and location pane.</para>
- </listitem>
-
- <listitem>
- <para>More color options. Text color, missing line colors and moved
- line colors can be configured.</para>
- </listitem>
- </itemizedlist>
- </sect3>
- </sect2>
-</sect1>
Modified: trunk/Docs/Users/Manual/WinMerge_help.xml
===================================================================
--- trunk/Docs/Users/Manual/WinMerge_help.xml 2006-10-02 10:50:38 UTC (rev 3668)
+++ trunk/Docs/Users/Manual/WinMerge_help.xml 2006-10-02 11:01:00 UTC (rev 3669)
@@ -4,7 +4,7 @@
<!ENTITY AboutDoc SYSTEM "About_Doc.xml">
<!ENTITY QuickStart SYSTEM "Quick_start.xml">
<!ENTITY Introduction SYSTEM "Introduction.xml">
-<!ENTITY WhatsNew21 SYSTEM "Whatsnew_2_1.xml">
+<!ENTITY WhatsNew SYSTEM "Whatsnew.xml">
<!ENTITY Install SYSTEM "Install.xml">
<!ENTITY IntroductDiffing SYSTEM "Intro_diffs.xml">
<!ENTITY OpenPaths SYSTEM "Open_paths.xml">
@@ -84,7 +84,7 @@
&Introduction;
- &WhatsNew21;
+ &WhatsNew;
&Install;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ge...@us...> - 2006-10-02 10:50:48
|
Revision: 3668
http://svn.sourceforge.net/winmerge/?rev=3668&view=rev
Author: gerundt
Date: 2006-10-02 03:50:38 -0700 (Mon, 02 Oct 2006)
Log Message:
-----------
PATCH: [ 1568943 ] Manual: Shows error for wrong "withads" argument
Modified Paths:
--------------
branches/R2_6/Docs/Users/Manual/Changes.txt
branches/R2_6/Docs/Users/Manual/build/build_html.bat
Modified: branches/R2_6/Docs/Users/Manual/Changes.txt
===================================================================
--- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-02 10:49:20 UTC (rev 3667)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-10-02 10:50:38 UTC (rev 3668)
@@ -1,3 +1,7 @@
+2006-10-02 Tim
+ PATCH: [ 1568943 ] Manual: Shows error for wrong "withads" argument
+ Manual/build: build_html.bat
+
2006-09-29 Kimmo
PATCH: [ 1567301 ] Manual: 64-bit ShellExtension installing
Manual: Install.xml
Modified: branches/R2_6/Docs/Users/Manual/build/build_html.bat
===================================================================
--- branches/R2_6/Docs/Users/Manual/build/build_html.bat 2006-10-02 10:49:20 UTC (rev 3667)
+++ branches/R2_6/Docs/Users/Manual/build/build_html.bat 2006-10-02 10:50:38 UTC (rev 3668)
@@ -4,9 +4,23 @@
set docbook_inputfile=..\WinMerge_help.xml
set docbook_use_stylesheet=build_html.xsl
-if "%1" == "withads" set docbook_use_stylesheet=build_html_withads.xsl
set docbook_outputdir=%docbook_build_path%\html
+if "%1" == "withads" goto withads
+if not "%1" == "" goto withadserror
+goto start
+:withads
+set docbook_use_stylesheet=build_html_withads.xsl
+echo **************************************
+echo * The manual includes advertisements *
+echo **************************************
+goto start
+
+:withadserror
+echo "%1" is a invalid argument. Please use "withads", if you want advertisements in the manual.
+goto end
+
+:start
if not exist "%docbook_outputdir%" mkdir "%docbook_outputdir%"
echo Copy images...
@@ -32,4 +46,5 @@
echo Finished!
+:end
@echo on
\ 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-02 10:49:30
|
Revision: 3667
http://svn.sourceforge.net/winmerge/?rev=3667&view=rev
Author: gerundt
Date: 2006-10-02 03:49:20 -0700 (Mon, 02 Oct 2006)
Log Message:
-----------
PATCH: [ 1568943 ] Manual: Shows error for wrong "withads" argument
Modified Paths:
--------------
trunk/Docs/Users/Manual/Changes.txt
trunk/Docs/Users/Manual/build/build_html.bat
Modified: trunk/Docs/Users/Manual/Changes.txt
===================================================================
--- trunk/Docs/Users/Manual/Changes.txt 2006-10-01 21:13:30 UTC (rev 3666)
+++ trunk/Docs/Users/Manual/Changes.txt 2006-10-02 10:49:20 UTC (rev 3667)
@@ -1,3 +1,7 @@
+2006-10-02 Tim
+ PATCH: [ 1568943 ] Manual: Shows error for wrong "withads" argument
+ Manual/build: build_html.bat
+
2006-09-29 Kimmo
PATCH: [ 1567301 ] Manual: 64-bit ShellExtension installing
Manual: Install.xml
Modified: trunk/Docs/Users/Manual/build/build_html.bat
===================================================================
--- trunk/Docs/Users/Manual/build/build_html.bat 2006-10-01 21:13:30 UTC (rev 3666)
+++ trunk/Docs/Users/Manual/build/build_html.bat 2006-10-02 10:49:20 UTC (rev 3667)
@@ -4,9 +4,23 @@
set docbook_inputfile=..\WinMerge_help.xml
set docbook_use_stylesheet=build_html.xsl
-if "%1" == "withads" set docbook_use_stylesheet=build_html_withads.xsl
set docbook_outputdir=%docbook_build_path%\html
+if "%1" == "withads" goto withads
+if not "%1" == "" goto withadserror
+goto start
+:withads
+set docbook_use_stylesheet=build_html_withads.xsl
+echo **************************************
+echo * The manual includes advertisements *
+echo **************************************
+goto start
+
+:withadserror
+echo "%1" is a invalid argument. Please use "withads", if you want advertisements in the manual.
+goto end
+
+:start
if not exist "%docbook_outputdir%" mkdir "%docbook_outputdir%"
echo Copy images...
@@ -32,4 +46,5 @@
echo Finished!
+:end
@echo on
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-01 21:13:36
|
Revision: 3666
http://svn.sourceforge.net/winmerge/?rev=3666&view=rev
Author: kimmov
Date: 2006-10-01 14:13:30 -0700 (Sun, 01 Oct 2006)
Log Message:
-----------
PATCH: [ 1567874 ] Change manual URL to point to 2.6 manual
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/MainFrm.cpp
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2006-10-01 21:11:14 UTC (rev 3665)
+++ branches/R2_6/Src/Changes.txt 2006-10-01 21:13:30 UTC (rev 3666)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+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
Modified: branches/R2_6/Src/MainFrm.cpp
===================================================================
--- branches/R2_6/Src/MainFrm.cpp 2006-10-01 21:11:14 UTC (rev 3665)
+++ branches/R2_6/Src/MainFrm.cpp 2006-10-01 21:13:30 UTC (rev 3666)
@@ -177,7 +177,7 @@
* @brief URL to help indes in internet.
* We use internet help when local help file is not found (not installed).
*/
-static const TCHAR DocsURL[] = _T("http://winmerge.org/2.4/manual/index.html");
+static const TCHAR DocsURL[] = _T("http://winmerge.org/2.6/manual/index.html");
/**
* @brief Default relative path to "My Documents" for private filters.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-10-01 21:11:22
|
Revision: 3665
http://svn.sourceforge.net/winmerge/?rev=3665&view=rev
Author: kimmov
Date: 2006-10-01 14:11:14 -0700 (Sun, 01 Oct 2006)
Log Message:
-----------
PATCH: [ 1567874 ] Change manual URL to point to 2.6 manual
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/MainFrm.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-30 23:50:47 UTC (rev 3664)
+++ trunk/Src/Changes.txt 2006-10-01 21:11:14 UTC (rev 3665)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+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
Modified: trunk/Src/MainFrm.cpp
===================================================================
--- trunk/Src/MainFrm.cpp 2006-09-30 23:50:47 UTC (rev 3664)
+++ trunk/Src/MainFrm.cpp 2006-10-01 21:11:14 UTC (rev 3665)
@@ -177,7 +177,7 @@
* @brief URL to help indes in internet.
* We use internet help when local help file is not found (not installed).
*/
-static const TCHAR DocsURL[] = _T("http://winmerge.org/2.4/manual/index.html");
+static const TCHAR DocsURL[] = _T("http://winmerge.org/2.6/manual/index.html");
/**
* @brief Default relative path to "My Documents" for private filters.
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-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: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: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: <ki...@us...> - 2006-09-29 16:17:45
|
Revision: 3660
http://svn.sourceforge.net/winmerge/?rev=3660&view=rev
Author: kimmov
Date: 2006-09-29 09:17:28 -0700 (Fri, 29 Sep 2006)
Log Message:
-----------
PATCH: [ 1567345 ] Manual: Add documentation for location pane
Modified Paths:
--------------
branches/R2_6/Docs/Users/Manual/Changes.txt
branches/R2_6/Docs/Users/Manual/Compare_files.xml
Added Paths:
-----------
branches/R2_6/Docs/Users/Manual/screenshots/filecomp_locpane.png
Modified: branches/R2_6/Docs/Users/Manual/Changes.txt
===================================================================
--- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-09-29 16:10:17 UTC (rev 3659)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-09-29 16:17:28 UTC (rev 3660)
@@ -3,6 +3,9 @@
Manual: Install.xml
PATCH: [ 1567323 ] Manual: OpenPaths talks about ShellExtension
Manual: Open_paths.xml
+ PATCH: [ 1567345 ] Manual: Add documentation for location pane
+ Manual: Compare_files.xml
+ Manual/screenshots new file: filecomp_locpane.png
2006-09-25 Kimmo
PATCH: [ 1564535 ] Manual: New folder compare screenshot
Modified: branches/R2_6/Docs/Users/Manual/Compare_files.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Compare_files.xml 2006-09-29 16:10:17 UTC (rev 3659)
+++ branches/R2_6/Docs/Users/Manual/Compare_files.xml 2006-09-29 16:17:28 UTC (rev 3660)
@@ -424,6 +424,47 @@
</sect2>
<sect2>
+ <title>Location Pane</title>
+
+ <para>Location pane is a handy side-pane showing a overall (difference)
+ map of files compared.</para>
+
+ <para><inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="screenshots/filecomp_locpane.png" format="PNG" />
+ </imageobject>
+ </inlinemediaobject></para>
+
+ <para>Location Pane shows differences as they are located in the files. So
+ it gives a good overall view for files compared. Location Pane shows
+ differences with same colors than editor panes. There are different
+ indicators in Location Pane:</para>
+
+ <itemizedlist>
+ <listitem>
+ <simpara>small triangles point to begin of the selected
+ difference</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>selected difference is shown with different color</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>area visible in editor panes is shown with different
+ background color</simpara>
+ </listitem>
+ </itemizedlist>
+
+ <para>Clicking with mouse in Location Pane moves cursor to place clicked
+ in file. Right-clicking with mouse opens the context menu with items to
+ select line to go to. And the visible area locator (area with different
+ background color) can be used like a scrollbar thumb - after pressing down
+ the left mouse butto over it it can be dragged upwards and downwards to
+ scroll the files.</para>
+ </sect2>
+
+ <sect2>
<title>Context Menu</title>
<para>File compare context menu contains items for frequently used
Added: branches/R2_6/Docs/Users/Manual/screenshots/filecomp_locpane.png
===================================================================
(Binary files differ)
Property changes on: branches/R2_6/Docs/Users/Manual/screenshots/filecomp_locpane.png
___________________________________________________________________
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: <ki...@us...> - 2006-09-29 16:10:30
|
Revision: 3659
http://svn.sourceforge.net/winmerge/?rev=3659&view=rev
Author: kimmov
Date: 2006-09-29 09:10:17 -0700 (Fri, 29 Sep 2006)
Log Message:
-----------
PATCH: [ 1567345 ] Manual: Add documentation for location pane
Modified Paths:
--------------
trunk/Docs/Users/Manual/Changes.txt
trunk/Docs/Users/Manual/Compare_files.xml
Added Paths:
-----------
trunk/Docs/Users/Manual/screenshots/filecomp_locpane.png
Modified: trunk/Docs/Users/Manual/Changes.txt
===================================================================
--- trunk/Docs/Users/Manual/Changes.txt 2006-09-29 15:49:30 UTC (rev 3658)
+++ trunk/Docs/Users/Manual/Changes.txt 2006-09-29 16:10:17 UTC (rev 3659)
@@ -3,6 +3,9 @@
Manual: Install.xml
PATCH: [ 1567323 ] Manual: OpenPaths talks about ShellExtension
Manual: Open_paths.xml
+ PATCH: [ 1567345 ] Manual: Add documentation for location pane
+ Manual: Compare_files.xml
+ Manual/screenshots new file: filecomp_locpane.png
2006-09-25 Kimmo
PATCH: [ 1564535 ] Manual: New folder compare screenshot
Modified: trunk/Docs/Users/Manual/Compare_files.xml
===================================================================
--- trunk/Docs/Users/Manual/Compare_files.xml 2006-09-29 15:49:30 UTC (rev 3658)
+++ trunk/Docs/Users/Manual/Compare_files.xml 2006-09-29 16:10:17 UTC (rev 3659)
@@ -424,6 +424,47 @@
</sect2>
<sect2>
+ <title>Location Pane</title>
+
+ <para>Location pane is a handy side-pane showing a overall (difference)
+ map of files compared.</para>
+
+ <para><inlinemediaobject>
+ <imageobject>
+ <imagedata fileref="screenshots/filecomp_locpane.png" format="PNG" />
+ </imageobject>
+ </inlinemediaobject></para>
+
+ <para>Location Pane shows differences as they are located in the files. So
+ it gives a good overall view for files compared. Location Pane shows
+ differences with same colors than editor panes. There are different
+ indicators in Location Pane:</para>
+
+ <itemizedlist>
+ <listitem>
+ <simpara>small triangles point to begin of the selected
+ difference</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>selected difference is shown with different color</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara>area visible in editor panes is shown with different
+ background color</simpara>
+ </listitem>
+ </itemizedlist>
+
+ <para>Clicking with mouse in Location Pane moves cursor to place clicked
+ in file. Right-clicking with mouse opens the context menu with items to
+ select line to go to. And the visible area locator (area with different
+ background color) can be used like a scrollbar thumb - after pressing down
+ the left mouse butto over it it can be dragged upwards and downwards to
+ scroll the files.</para>
+ </sect2>
+
+ <sect2>
<title>Context Menu</title>
<para>File compare context menu contains items for frequently used
Added: trunk/Docs/Users/Manual/screenshots/filecomp_locpane.png
===================================================================
(Binary files differ)
Property changes on: trunk/Docs/Users/Manual/screenshots/filecomp_locpane.png
___________________________________________________________________
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: <ki...@us...> - 2006-09-29 15:49:43
|
Revision: 3658
http://svn.sourceforge.net/winmerge/?rev=3658&view=rev
Author: kimmov
Date: 2006-09-29 08:49:30 -0700 (Fri, 29 Sep 2006)
Log Message:
-----------
PATCH: [ 1567323 ] Manual: OpenPaths talks about ShellExtension
Modified Paths:
--------------
branches/R2_6/Docs/Users/Manual/Changes.txt
branches/R2_6/Docs/Users/Manual/Open_paths.xml
Modified: branches/R2_6/Docs/Users/Manual/Changes.txt
===================================================================
--- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-09-29 15:47:56 UTC (rev 3657)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-09-29 15:49:30 UTC (rev 3658)
@@ -1,6 +1,8 @@
2006-09-29 Kimmo
PATCH: [ 1567301 ] Manual: 64-bit ShellExtension installing
Manual: Install.xml
+ PATCH: [ 1567323 ] Manual: OpenPaths talks about ShellExtension
+ Manual: Open_paths.xml
2006-09-25 Kimmo
PATCH: [ 1564535 ] Manual: New folder compare screenshot
Modified: branches/R2_6/Docs/Users/Manual/Open_paths.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Open_paths.xml 2006-09-29 15:47:56 UTC (rev 3657)
+++ branches/R2_6/Docs/Users/Manual/Open_paths.xml 2006-09-29 15:49:30 UTC (rev 3658)
@@ -99,27 +99,32 @@
</sect2>
<sect2>
- <title>Shell Extension</title>
+ <title>Shell Integration</title>
- <para>Shell extension is convenient way to select paths using Windows
- Explorer. Shell Extension must be first enabled from
- <guilabel>Options</guilabel>/<guilabel>System</guilabel> before use. When
- Shell Extension is enabled item <guimenuitem>WinMerge</guimenuitem> is
- added to context menu (click right mouse button over file or folder in
- Explorer).</para>
+ <indexterm>
+ <primary>Shell Integration</primary>
+ </indexterm>
+ <para>The Shell Integration is a convenient way to select the paths using
+ Windows Explorer. Installer enables Shell Integration if choosen so. Shell
+ Integration can be enabled or disabled from
+ <guilabel>Options</guilabel>/<guilabel>System</guilabel>. When the Shell
+ Integration is enabled item <guimenuitem>WinMerge</guimenuitem> is added
+ to the Explorer context menu (click right mouse button over file or folder
+ in Explorer).</para>
+
<para>WinMerge accepts one or two paths. When one path is selected through
- Shell Extension WinMerge places it as "<guilabel>Left</guilabel>" path and
- open Open-dialog for user to select "<guilabel>Right</guilabel>" path.
+ Shell Integration WinMerge places it as "<guilabel>Left</guilabel>" path
+ and open Open-dialog for user to select "<guilabel>Right</guilabel>" path.
Also if two paths are selected but another path couldn't be opened for
reason or another WinMerge shows Open-dialog for selecting valid
paths.</para>
<sect3>
- <title>Advanced Shell Extension</title>
+ <title>Advanced Shell Integration</title>
- <para>Selecting "<guilabel>Enable advanced menu</guilabel>" for shell
- extension from options adds more choices for path selection. Now
+ <para>Selecting "<guilabel>Enable advanced menu</guilabel>" for Shell
+ Integration from options adds more choices for path selection. Now
WinMerge adds two menuitems to Explorer context menu:
"<guimenuitem>Compare To</guimenuitem>" and
"<guimenuitem>Compare...</guimenuitem>". <guimenuitem>Compare
@@ -167,9 +172,9 @@
</sect3>
<sect3>
- <title>Including subfolders</title>
+ <title>Including Subfolders</title>
- <para>Shell Extension by default does not include subfolders into
+ <para>Shell Integration by default does not include subfolders into
comparison. This default behavior can be changed using <guilabel>Include
Subfolders by Default</guilabel> option in System options. Default
behavior can be also changed by holding down Control -key while
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-29 15:48:06
|
Revision: 3657
http://svn.sourceforge.net/winmerge/?rev=3657&view=rev
Author: kimmov
Date: 2006-09-29 08:47:56 -0700 (Fri, 29 Sep 2006)
Log Message:
-----------
PATCH: [ 1567323 ] Manual: OpenPaths talks about ShellExtension
Modified Paths:
--------------
trunk/Docs/Users/Manual/Changes.txt
trunk/Docs/Users/Manual/Open_paths.xml
Modified: trunk/Docs/Users/Manual/Changes.txt
===================================================================
--- trunk/Docs/Users/Manual/Changes.txt 2006-09-29 15:23:12 UTC (rev 3656)
+++ trunk/Docs/Users/Manual/Changes.txt 2006-09-29 15:47:56 UTC (rev 3657)
@@ -1,6 +1,8 @@
2006-09-29 Kimmo
PATCH: [ 1567301 ] Manual: 64-bit ShellExtension installing
Manual: Install.xml
+ PATCH: [ 1567323 ] Manual: OpenPaths talks about ShellExtension
+ Manual: Open_paths.xml
2006-09-25 Kimmo
PATCH: [ 1564535 ] Manual: New folder compare screenshot
Modified: trunk/Docs/Users/Manual/Open_paths.xml
===================================================================
--- trunk/Docs/Users/Manual/Open_paths.xml 2006-09-29 15:23:12 UTC (rev 3656)
+++ trunk/Docs/Users/Manual/Open_paths.xml 2006-09-29 15:47:56 UTC (rev 3657)
@@ -99,27 +99,32 @@
</sect2>
<sect2>
- <title>Shell Extension</title>
+ <title>Shell Integration</title>
- <para>Shell extension is convenient way to select paths using Windows
- Explorer. Shell Extension must be first enabled from
- <guilabel>Options</guilabel>/<guilabel>System</guilabel> before use. When
- Shell Extension is enabled item <guimenuitem>WinMerge</guimenuitem> is
- added to context menu (click right mouse button over file or folder in
- Explorer).</para>
+ <indexterm>
+ <primary>Shell Integration</primary>
+ </indexterm>
+ <para>The Shell Integration is a convenient way to select the paths using
+ Windows Explorer. Installer enables Shell Integration if choosen so. Shell
+ Integration can be enabled or disabled from
+ <guilabel>Options</guilabel>/<guilabel>System</guilabel>. When the Shell
+ Integration is enabled item <guimenuitem>WinMerge</guimenuitem> is added
+ to the Explorer context menu (click right mouse button over file or folder
+ in Explorer).</para>
+
<para>WinMerge accepts one or two paths. When one path is selected through
- Shell Extension WinMerge places it as "<guilabel>Left</guilabel>" path and
- open Open-dialog for user to select "<guilabel>Right</guilabel>" path.
+ Shell Integration WinMerge places it as "<guilabel>Left</guilabel>" path
+ and open Open-dialog for user to select "<guilabel>Right</guilabel>" path.
Also if two paths are selected but another path couldn't be opened for
reason or another WinMerge shows Open-dialog for selecting valid
paths.</para>
<sect3>
- <title>Advanced Shell Extension</title>
+ <title>Advanced Shell Integration</title>
- <para>Selecting "<guilabel>Enable advanced menu</guilabel>" for shell
- extension from options adds more choices for path selection. Now
+ <para>Selecting "<guilabel>Enable advanced menu</guilabel>" for Shell
+ Integration from options adds more choices for path selection. Now
WinMerge adds two menuitems to Explorer context menu:
"<guimenuitem>Compare To</guimenuitem>" and
"<guimenuitem>Compare...</guimenuitem>". <guimenuitem>Compare
@@ -167,9 +172,9 @@
</sect3>
<sect3>
- <title>Including subfolders</title>
+ <title>Including Subfolders</title>
- <para>Shell Extension by default does not include subfolders into
+ <para>Shell Integration by default does not include subfolders into
comparison. This default behavior can be changed using <guilabel>Include
Subfolders by Default</guilabel> option in System options. Default
behavior can be also changed by holding down Control -key while
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-29 15:23:18
|
Revision: 3656
http://svn.sourceforge.net/winmerge/?rev=3656&view=rev
Author: kimmov
Date: 2006-09-29 08:23:12 -0700 (Fri, 29 Sep 2006)
Log Message:
-----------
PATCH: [ 1567301 ] Manual: 64-bit ShellExtension installing
Modified Paths:
--------------
branches/R2_6/Docs/Users/Manual/Changes.txt
branches/R2_6/Docs/Users/Manual/Install.xml
Modified: branches/R2_6/Docs/Users/Manual/Changes.txt
===================================================================
--- branches/R2_6/Docs/Users/Manual/Changes.txt 2006-09-29 15:21:11 UTC (rev 3655)
+++ branches/R2_6/Docs/Users/Manual/Changes.txt 2006-09-29 15:23:12 UTC (rev 3656)
@@ -1,3 +1,7 @@
+2006-09-29 Kimmo
+ PATCH: [ 1567301 ] Manual: 64-bit ShellExtension installing
+ Manual: Install.xml
+
2006-09-25 Kimmo
PATCH: [ 1564535 ] Manual: New folder compare screenshot
Manual: Compare_dirs.xml Quick_start.xml
Modified: branches/R2_6/Docs/Users/Manual/Install.xml
===================================================================
--- branches/R2_6/Docs/Users/Manual/Install.xml 2006-09-29 15:21:11 UTC (rev 3655)
+++ branches/R2_6/Docs/Users/Manual/Install.xml 2006-09-29 15:23:12 UTC (rev 3656)
@@ -1,29 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<sect1 id="Installing">
- <title>Getting and installing WinMerge</title>
+ <title>Getting and Installing WinMerge</title>
+ <para>WinMerge can be installed using installer or by unzipping files from
+ archive. Using the installer is the recommended method.</para>
+
+ <para>Currently WinMerge installer works for natively for 32-bit Windows.
+ There is no separate version for 64-bit Windows (WinXP/2003/Vista) but those
+ can run installer and WinMerge as 32-bit application. However there is
+ 64-bit version of Shell Integration included in 32-bit installer. So Shell
+ Integration works in 64-bit Windows.</para>
+
<sect2>
- <title>Getting files</title>
+ <title>Getting Files</title>
<para>Latest releases can be always downloaded from WinMerge homepage:
<ulink url="http://www.winmerge.org/">WinMerge.org</ulink>. Note that
- there may be some delay updating homepages for releases, but project
- statuspage at <ulink
+ there may be some delay updating homepages for the latest releases, but
+ project statuspage at <ulink
url="https://sourceforge.net/projects/winmerge/">SourceForge.net</ulink>
- shows latest files. There is also mailing-list for release announcements.
- Stable releases are also available in several file download sites.</para>
-
- <para>WinMerge can be installed using installer or by unzipping files from
- archive.</para>
+ shows the latest files. There is also a mailing-list for release
+ announcements. Stable releases are also available in several file download
+ sites.</para>
</sect2>
<sect2>
- <title>Using installer (recommended)</title>
+ <title>Using the Installer (recommended)</title>
<note>
<para>Installer requires Admin-user priviledges in Windows NT4/2000/XP.
If you don't have Admin-user priviledges you can install WinMerge by
- unzipping from an archive file (see that section).</para>
+ unzipping from an archive file (see <link
+ linkend="InstallingFromArchive">Installing from an
+ Archive</link>).</para>
</note>
<para>This is recommended for most users. Installer asks location where
@@ -50,7 +59,7 @@
<listitem>
<simpara>Select location for WinMerge and select
<guibutton>Next</guibutton>-button. It is recommended to install
- WinMerge in own directory.</simpara>
+ WinMerge in own folder.</simpara>
</listitem>
<listitem>
@@ -114,13 +123,23 @@
</listitem>
<listitem>
+ <simpara><guilabel>Integrate with TortoiseSVN</guilabel> - sets
+ WinMerge to TortoiseSVN diff application.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara><guilabel>Integrate with ClearCase</guilabel> - sets
+ WinMerge to ClearCase diff and merge application.</simpara>
+ </listitem>
+
+ <listitem>
<simpara><guilabel>Create a Desktop Icon</guilabel> - adds
- WinMerge icon to Desktop</simpara>
+ WinMerge icon to Desktop.</simpara>
</listitem>
<listitem>
<simpara><guilabel>Create a Quick Launch Icon</guilabel> - adds
- WinMerge icon to Quick Launch bar</simpara>
+ WinMerge icon to Quick Launch bar.</simpara>
</listitem>
</itemizedlist></para>
</listitem>
@@ -139,7 +158,7 @@
</sect2>
<sect2>
- <title>Installing from archive</title>
+ <title id="InstallFromArchive">Installing from an Archive</title>
<para>WinMerge is pretty much independent from other system components. It
doesn't integrate tightly to Windows or use lots of dlls.
@@ -159,37 +178,53 @@
folder can be renamed or files copied to other folder (preserving folder
structure!).</para>
- <para>After unzipping files WinMerge is ready to run! ShellExtension and
- Archive Integration may need additional steps (see below).</para>
+ <para>After unzipping files WinMerge is ready to run! Shell Integration
+ and Archive Integration may need additional steps (see below).</para>
</sect2>
<sect2>
- <title>Shell integration</title>
+ <title>Shell Integration</title>
<para>Choose "<guilabel>Enable Explorer context menu
integration</guilabel>" from installer's additional features to install
- shell integration.</para>
+ Shell Integration.</para>
- <para>If install program is not used, shell integration dll
- (<filename>ShellExtension[U].dll</filename>) must be registered
- separately. This is done by running <filename>register.bat</filename> from
- WinMerge directory. Reboot is recommended after installing so Windows
- updates all its references.</para>
+ <para>If install program is not used, Shell Integration dll
+ (<filename>ShellExtension*.dll</filename>) must be registered separately.
+ This is done by running <filename>register.bat</filename> from WinMerge
+ directory. Restarting the computer is recommended after installing Shell
+ Integration so that Windows updates all its references.</para>
<note>
- <para>Installing shell integration requires administrative user
+ <para>Installing shell Integration requires administrative user
priviledges.</para>
</note>
- <para>Updating shell integration outside installer requires first
- uninstalling current version. Uninstalling can be done by running
- <filename>uninstall.bat</filename> from WinMerge directory. After that
- computer should be restarted so Windows completes uninstallation. Then new
- version can be installed like described above.</para>
+ <para>Updating the Shell Integration outside the installer requires first
+ uninstalling current Shell Intregration version. Uninstalling can be done
+ by running <filename>unregister.bat</filename> from WinMerge directory.
+ After that the computer should be restarted so Windows completes
+ uninstallation. Then the new version can be installed like described
+ above.</para>
+
+ <sect3>
+ <title>64-Bit Shell Integration</title>
+
+ <para>WinMerge version 2.6 includes a partial support for 64-bit Windows
+ versions by including 64-bit Shell Integration. WinMerge installer
+ recognizes 64-bit versions of Windows and can install correct version of
+ Shell Integration.</para>
+
+ <para>When installing Shell Integration by hand from an archive file,
+ Shell Integration dll is named as
+ <filename>ShellExtensionX64.dll</filename>. Registering/unregistering
+ can be done with <filename>register.bat</filename> and
+ <filename>unregister.bat</filename> like with 32-bit versions.</para>
+ </sect3>
</sect2>
<sect2>
- <title>7-Zip and archive support</title>
+ <title>7-Zip and Archive Support</title>
<para>WinMerge uses <ulink url="http://www.7-zip.org/">7-Zip</ulink> for
archive support, but WinMerge installer does not install 7-Zip or archive
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-29 15:21:26
|
Revision: 3655
http://svn.sourceforge.net/winmerge/?rev=3655&view=rev
Author: kimmov
Date: 2006-09-29 08:21:11 -0700 (Fri, 29 Sep 2006)
Log Message:
-----------
PATCH: [ 1567301 ] Manual: 64-bit ShellExtension installing
Modified Paths:
--------------
trunk/Docs/Users/Manual/Changes.txt
trunk/Docs/Users/Manual/Install.xml
Modified: trunk/Docs/Users/Manual/Changes.txt
===================================================================
--- trunk/Docs/Users/Manual/Changes.txt 2006-09-27 15:31:58 UTC (rev 3654)
+++ trunk/Docs/Users/Manual/Changes.txt 2006-09-29 15:21:11 UTC (rev 3655)
@@ -1,3 +1,7 @@
+2006-09-29 Kimmo
+ PATCH: [ 1567301 ] Manual: 64-bit ShellExtension installing
+ Manual: Install.xml
+
2006-09-25 Kimmo
PATCH: [ 1564535 ] Manual: New folder compare screenshot
Manual: Compare_dirs.xml Quick_start.xml
Modified: trunk/Docs/Users/Manual/Install.xml
===================================================================
--- trunk/Docs/Users/Manual/Install.xml 2006-09-27 15:31:58 UTC (rev 3654)
+++ trunk/Docs/Users/Manual/Install.xml 2006-09-29 15:21:11 UTC (rev 3655)
@@ -1,29 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<sect1 id="Installing">
- <title>Getting and installing WinMerge</title>
+ <title>Getting and Installing WinMerge</title>
+ <para>WinMerge can be installed using installer or by unzipping files from
+ archive. Using the installer is the recommended method.</para>
+
+ <para>Currently WinMerge installer works for natively for 32-bit Windows.
+ There is no separate version for 64-bit Windows (WinXP/2003/Vista) but those
+ can run installer and WinMerge as 32-bit application. However there is
+ 64-bit version of Shell Integration included in 32-bit installer. So Shell
+ Integration works in 64-bit Windows.</para>
+
<sect2>
- <title>Getting files</title>
+ <title>Getting Files</title>
<para>Latest releases can be always downloaded from WinMerge homepage:
<ulink url="http://www.winmerge.org/">WinMerge.org</ulink>. Note that
- there may be some delay updating homepages for releases, but project
- statuspage at <ulink
+ there may be some delay updating homepages for the latest releases, but
+ project statuspage at <ulink
url="https://sourceforge.net/projects/winmerge/">SourceForge.net</ulink>
- shows latest files. There is also mailing-list for release announcements.
- Stable releases are also available in several file download sites.</para>
-
- <para>WinMerge can be installed using installer or by unzipping files from
- archive.</para>
+ shows the latest files. There is also a mailing-list for release
+ announcements. Stable releases are also available in several file download
+ sites.</para>
</sect2>
<sect2>
- <title>Using installer (recommended)</title>
+ <title>Using the Installer (recommended)</title>
<note>
<para>Installer requires Admin-user priviledges in Windows NT4/2000/XP.
If you don't have Admin-user priviledges you can install WinMerge by
- unzipping from an archive file (see that section).</para>
+ unzipping from an archive file (see <link
+ linkend="InstallingFromArchive">Installing from an
+ Archive</link>).</para>
</note>
<para>This is recommended for most users. Installer asks location where
@@ -50,7 +59,7 @@
<listitem>
<simpara>Select location for WinMerge and select
<guibutton>Next</guibutton>-button. It is recommended to install
- WinMerge in own directory.</simpara>
+ WinMerge in own folder.</simpara>
</listitem>
<listitem>
@@ -114,13 +123,23 @@
</listitem>
<listitem>
+ <simpara><guilabel>Integrate with TortoiseSVN</guilabel> - sets
+ WinMerge to TortoiseSVN diff application.</simpara>
+ </listitem>
+
+ <listitem>
+ <simpara><guilabel>Integrate with ClearCase</guilabel> - sets
+ WinMerge to ClearCase diff and merge application.</simpara>
+ </listitem>
+
+ <listitem>
<simpara><guilabel>Create a Desktop Icon</guilabel> - adds
- WinMerge icon to Desktop</simpara>
+ WinMerge icon to Desktop.</simpara>
</listitem>
<listitem>
<simpara><guilabel>Create a Quick Launch Icon</guilabel> - adds
- WinMerge icon to Quick Launch bar</simpara>
+ WinMerge icon to Quick Launch bar.</simpara>
</listitem>
</itemizedlist></para>
</listitem>
@@ -139,7 +158,7 @@
</sect2>
<sect2>
- <title>Installing from archive</title>
+ <title id="InstallFromArchive">Installing from an Archive</title>
<para>WinMerge is pretty much independent from other system components. It
doesn't integrate tightly to Windows or use lots of dlls.
@@ -159,37 +178,53 @@
folder can be renamed or files copied to other folder (preserving folder
structure!).</para>
- <para>After unzipping files WinMerge is ready to run! ShellExtension and
- Archive Integration may need additional steps (see below).</para>
+ <para>After unzipping files WinMerge is ready to run! Shell Integration
+ and Archive Integration may need additional steps (see below).</para>
</sect2>
<sect2>
- <title>Shell integration</title>
+ <title>Shell Integration</title>
<para>Choose "<guilabel>Enable Explorer context menu
integration</guilabel>" from installer's additional features to install
- shell integration.</para>
+ Shell Integration.</para>
- <para>If install program is not used, shell integration dll
- (<filename>ShellExtension[U].dll</filename>) must be registered
- separately. This is done by running <filename>register.bat</filename> from
- WinMerge directory. Reboot is recommended after installing so Windows
- updates all its references.</para>
+ <para>If install program is not used, Shell Integration dll
+ (<filename>ShellExtension*.dll</filename>) must be registered separately.
+ This is done by running <filename>register.bat</filename> from WinMerge
+ directory. Restarting the computer is recommended after installing Shell
+ Integration so that Windows updates all its references.</para>
<note>
- <para>Installing shell integration requires administrative user
+ <para>Installing shell Integration requires administrative user
priviledges.</para>
</note>
- <para>Updating shell integration outside installer requires first
- uninstalling current version. Uninstalling can be done by running
- <filename>uninstall.bat</filename> from WinMerge directory. After that
- computer should be restarted so Windows completes uninstallation. Then new
- version can be installed like described above.</para>
+ <para>Updating the Shell Integration outside the installer requires first
+ uninstalling current Shell Intregration version. Uninstalling can be done
+ by running <filename>unregister.bat</filename> from WinMerge directory.
+ After that the computer should be restarted so Windows completes
+ uninstallation. Then the new version can be installed like described
+ above.</para>
+
+ <sect3>
+ <title>64-Bit Shell Integration</title>
+
+ <para>WinMerge version 2.6 includes a partial support for 64-bit Windows
+ versions by including 64-bit Shell Integration. WinMerge installer
+ recognizes 64-bit versions of Windows and can install correct version of
+ Shell Integration.</para>
+
+ <para>When installing Shell Integration by hand from an archive file,
+ Shell Integration dll is named as
+ <filename>ShellExtensionX64.dll</filename>. Registering/unregistering
+ can be done with <filename>register.bat</filename> and
+ <filename>unregister.bat</filename> like with 32-bit versions.</para>
+ </sect3>
</sect2>
<sect2>
- <title>7-Zip and archive support</title>
+ <title>7-Zip and Archive Support</title>
<para>WinMerge uses <ulink url="http://www.7-zip.org/">7-Zip</ulink> for
archive support, but WinMerge installer does not install 7-Zip or archive
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2006-09-27 15:32:10
|
Revision: 3654
http://svn.sourceforge.net/winmerge/?rev=3654&view=rev
Author: sdottaka
Date: 2006-09-27 08:31:58 -0700 (Wed, 27 Sep 2006)
Log Message:
-----------
BUG: [ 1564572 ] Leak memory on undoing
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/GhostTextBuffer.h
trunk/Src/editlib/ccrystaltextbuffer.h
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-27 15:30:19 UTC (rev 3653)
+++ trunk/Src/Changes.txt 2006-09-27 15:31:58 UTC (rev 3654)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+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
Modified: trunk/Src/GhostTextBuffer.h
===================================================================
--- trunk/Src/GhostTextBuffer.h 2006-09-27 15:30:19 UTC (rev 3653)
+++ trunk/Src/GhostTextBuffer.h 2006-09-27 15:31:58 UTC (rev 3654)
@@ -157,7 +157,8 @@
m_nRealLinesInDeletedBlock = src.m_nRealLinesInDeletedBlock;
SetText(src.GetText());
INT_PTR size = src.m_paSavedRevisonNumbers->GetSize();
- m_paSavedRevisonNumbers = new CDWordArray();
+ if (!m_paSavedRevisonNumbers)
+ m_paSavedRevisonNumbers = new CDWordArray();
m_paSavedRevisonNumbers->SetSize(size);
INT_PTR i;
for (i = 0; i < size; i++)
Modified: trunk/Src/editlib/ccrystaltextbuffer.h
===================================================================
--- trunk/Src/editlib/ccrystaltextbuffer.h 2006-09-27 15:30:19 UTC (rev 3653)
+++ trunk/Src/editlib/ccrystaltextbuffer.h 2006-09-27 15:31:58 UTC (rev 3654)
@@ -192,7 +192,8 @@
m_nAction = src.m_nAction;
SetText(src.GetText());
INT_PTR size = src.m_paSavedRevisonNumbers->GetSize();
- m_paSavedRevisonNumbers = new CDWordArray();
+ if (!m_paSavedRevisonNumbers)
+ m_paSavedRevisonNumbers = new CDWordArray();
m_paSavedRevisonNumbers->SetSize(size);
INT_PTR i;
for (i = 0; i < size; i++)
@@ -203,7 +204,7 @@
{
FreeText();
if (m_paSavedRevisonNumbers)
- delete m_paSavedRevisonNumbers;
+ delete m_paSavedRevisonNumbers;
}
void SetText (LPCTSTR pszText);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sdo...@us...> - 2006-09-27 15:30:36
|
Revision: 3653
http://svn.sourceforge.net/winmerge/?rev=3653&view=rev
Author: sdottaka
Date: 2006-09-27 08:30:19 -0700 (Wed, 27 Sep 2006)
Log Message:
-----------
BUG: [ 1564572 ] Leak memory on undoing
Modified Paths:
--------------
branches/R2_6/Src/Changes.txt
branches/R2_6/Src/GhostTextBuffer.h
branches/R2_6/Src/editlib/ccrystaltextbuffer.h
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2006-09-27 14:32:16 UTC (rev 3652)
+++ branches/R2_6/Src/Changes.txt 2006-09-27 15:30:19 UTC (rev 3653)
@@ -2,6 +2,11 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+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
Modified: branches/R2_6/Src/GhostTextBuffer.h
===================================================================
--- branches/R2_6/Src/GhostTextBuffer.h 2006-09-27 14:32:16 UTC (rev 3652)
+++ branches/R2_6/Src/GhostTextBuffer.h 2006-09-27 15:30:19 UTC (rev 3653)
@@ -157,7 +157,8 @@
m_nRealLinesInDeletedBlock = src.m_nRealLinesInDeletedBlock;
SetText(src.GetText());
INT_PTR size = src.m_paSavedRevisonNumbers->GetSize();
- m_paSavedRevisonNumbers = new CDWordArray();
+ if (!m_paSavedRevisonNumbers)
+ m_paSavedRevisonNumbers = new CDWordArray();
m_paSavedRevisonNumbers->SetSize(size);
INT_PTR i;
for (i = 0; i < size; i++)
Modified: branches/R2_6/Src/editlib/ccrystaltextbuffer.h
===================================================================
--- branches/R2_6/Src/editlib/ccrystaltextbuffer.h 2006-09-27 14:32:16 UTC (rev 3652)
+++ branches/R2_6/Src/editlib/ccrystaltextbuffer.h 2006-09-27 15:30:19 UTC (rev 3653)
@@ -192,7 +192,8 @@
m_nAction = src.m_nAction;
SetText(src.GetText());
int size = src.m_paSavedRevisonNumbers->GetSize();
- m_paSavedRevisonNumbers = new CDWordArray();
+ if (!m_paSavedRevisonNumbers)
+ m_paSavedRevisonNumbers = new CDWordArray();
m_paSavedRevisonNumbers->SetSize(size);
int i;
for (i = 0; i < size; i++)
@@ -203,7 +204,7 @@
{
FreeText();
if (m_paSavedRevisonNumbers)
- delete m_paSavedRevisonNumbers;
+ delete m_paSavedRevisonNumbers;
}
void SetText (LPCTSTR pszText);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-27 14:32:23
|
Revision: 3652
http://svn.sourceforge.net/winmerge/?rev=3652&view=rev
Author: kimmov
Date: 2006-09-27 07:32:16 -0700 (Wed, 27 Sep 2006)
Log Message:
-----------
BUG: [ 1563187 ] Can't close a file compare with -e switch
Modified Paths:
--------------
trunk/Src/Changes.txt
trunk/Src/MergeDoc.cpp
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-27 14:29:37 UTC (rev 3651)
+++ trunk/Src/Changes.txt 2006-09-27 14:32:16 UTC (rev 3652)
@@ -5,6 +5,8 @@
2006-09-27 Kimmo
PATCH: [ 1565917 ] Register.bat to register ShellExt for 64-bit Windows
ShellExtension: Register.bat
+ BUG: [ 1563187 ] Can't close a file compare with -e switch
+ Src: MergeDoc.cpp
2006-09-26 Tim
PATCH: [ 1565359 ] Various Updates in German Translation for WinMerge 2.6
Modified: trunk/Src/MergeDoc.cpp
===================================================================
--- trunk/Src/MergeDoc.cpp 2006-09-27 14:29:37 UTC (rev 3651)
+++ trunk/Src/MergeDoc.cpp 2006-09-27 14:32:16 UTC (rev 3652)
@@ -1253,7 +1253,7 @@
BOOL CMergeDoc::CanCloseFrame(CFrameWnd* /*pFrame*/)
{
// Allow user to cancel closing
- if (!GetMainFrame()->m_bEscShutdown && PromptAndSaveIfNeeded(TRUE))
+ if (PromptAndSaveIfNeeded(TRUE))
{
// Set modified status to false so that we are not asking
// about saving again in OnCloseDocument()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-27 14:29:47
|
Revision: 3651
http://svn.sourceforge.net/winmerge/?rev=3651&view=rev
Author: kimmov
Date: 2006-09-27 07:29:37 -0700 (Wed, 27 Sep 2006)
Log Message:
-----------
PATCH: [ 1565917 ] Register.bat to register ShellExt for 64-bit Windows
Modified Paths:
--------------
branches/R2_6/ShellExtension/Register.bat
branches/R2_6/Src/Changes.txt
Modified: branches/R2_6/ShellExtension/Register.bat
===================================================================
--- branches/R2_6/ShellExtension/Register.bat 2006-09-27 14:22:28 UTC (rev 3650)
+++ branches/R2_6/ShellExtension/Register.bat 2006-09-27 14:29:37 UTC (rev 3651)
@@ -14,15 +14,23 @@
IF "%1" == "/U" Goto Uninstall
Echo Registering ShellExtension.dll...
-if "%OS%" == "" RegSvr32 ShellExtension.dll
-if "%OS%" == "Windows_NT" RegSvr32 ShellExtensionU.dll
+IF "%OS%" == "" RegSvr32 ShellExtension.dll
+IF "%OS%" == "Windows_NT" (
+ IF "%PROCESSOR_ARCHITECTURE%" == "x86" RegSvr32 ShellExtensionU.dll
+ IF "%PROCESSOR_ARCHITECTURE%" == "AMD64" RegSvr32 ShellExtensionX64.dll
+ IF "%PROCESSOR_ARCHITECTURE%" == "IA64" RegSvr32 ShellExtensionX64.dll
+)
Goto End
:Uninstall
Echo UnRegistering ShellExtension.dll...
-if "%OS%" == "" RegSvr32 /u ShellExtension.dll
-if "%OS%" == "Windows_NT" RegSvr32 /u ShellExtensionU.dll
+IF "%OS%" == "" RegSvr32 /u ShellExtension.dll
+IF "%OS%" == "Windows_NT" (
+ IF "%PROCESSOR_ARCHITECTURE%" == "x86" RegSvr32 /u ShellExtensionU.dll
+ IF "%PROCESSOR_ARCHITECTURE%" == "AMD64" RegSvr32 /u ShellExtensionX64.dll
+ IF "%PROCESSOR_ARCHITECTURE%" == "IA64" RegSvr32 /u ShellExtensionX64.dll
+)
:End
CLS
\ No newline at end of file
Modified: branches/R2_6/Src/Changes.txt
===================================================================
--- branches/R2_6/Src/Changes.txt 2006-09-27 14:22:28 UTC (rev 3650)
+++ branches/R2_6/Src/Changes.txt 2006-09-27 14:29:37 UTC (rev 3651)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ki...@us...> - 2006-09-27 14:22:37
|
Revision: 3650
http://svn.sourceforge.net/winmerge/?rev=3650&view=rev
Author: kimmov
Date: 2006-09-27 07:22:28 -0700 (Wed, 27 Sep 2006)
Log Message:
-----------
PATCH: [ 1565917 ] Register.bat to register ShellExt for 64-bit Windows
Modified Paths:
--------------
trunk/ShellExtension/Register.bat
trunk/Src/Changes.txt
Modified: trunk/ShellExtension/Register.bat
===================================================================
--- trunk/ShellExtension/Register.bat 2006-09-26 20:34:48 UTC (rev 3649)
+++ trunk/ShellExtension/Register.bat 2006-09-27 14:22:28 UTC (rev 3650)
@@ -14,15 +14,23 @@
IF "%1" == "/U" Goto Uninstall
Echo Registering ShellExtension.dll...
-if "%OS%" == "" RegSvr32 ShellExtension.dll
-if "%OS%" == "Windows_NT" RegSvr32 ShellExtensionU.dll
+IF "%OS%" == "" RegSvr32 ShellExtension.dll
+IF "%OS%" == "Windows_NT" (
+ IF "%PROCESSOR_ARCHITECTURE%" == "x86" RegSvr32 ShellExtensionU.dll
+ IF "%PROCESSOR_ARCHITECTURE%" == "AMD64" RegSvr32 ShellExtensionX64.dll
+ IF "%PROCESSOR_ARCHITECTURE%" == "IA64" RegSvr32 ShellExtensionX64.dll
+)
Goto End
:Uninstall
Echo UnRegistering ShellExtension.dll...
-if "%OS%" == "" RegSvr32 /u ShellExtension.dll
-if "%OS%" == "Windows_NT" RegSvr32 /u ShellExtensionU.dll
+IF "%OS%" == "" RegSvr32 /u ShellExtension.dll
+IF "%OS%" == "Windows_NT" (
+ IF "%PROCESSOR_ARCHITECTURE%" == "x86" RegSvr32 /u ShellExtensionU.dll
+ IF "%PROCESSOR_ARCHITECTURE%" == "AMD64" RegSvr32 /u ShellExtensionX64.dll
+ IF "%PROCESSOR_ARCHITECTURE%" == "IA64" RegSvr32 /u ShellExtensionX64.dll
+)
:End
CLS
\ No newline at end of file
Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt 2006-09-26 20:34:48 UTC (rev 3649)
+++ trunk/Src/Changes.txt 2006-09-27 14:22:28 UTC (rev 3650)
@@ -2,6 +2,10 @@
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)
+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
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.
|
