WinMerge

File Release Notes and Changelog

Release Name: 2.8 RC

Notes:
This is a release candidate for 2.8 stable release.

This release contains all the new features that will be in
2.8 version. There are no big bugs left, and in general this
release is safe to test and use.

Translators: This release also means "string freeze" for WinMerge
GUI. It means there will not be any changes in the translatable
strings for 2.8 release. Translations done against this release
will not need any changes for any 2.8.x releases. Please use this
release to start translating / updating for WinMerge 2.8.

New in this release since 2.6.x stable releases:
- Now uses expat + scew for XML handling
- Now uses PCRE for regular expressions
- Match lines inside differences
- New linefilter implementation (fixes e.g. line-end matching bug)
- Folder compare is now multi threaded - speed improvement
- Allow hiding margin in file compare
- New backup file options
- Improved line filter dialog
- Printing improvements
- Tabbed interface
- New PO files based translation system
- Create HTML reports from file compare
- New dialog for selecting folder compare columns
- New icon for Shell Integration
- Fixed bug WinMerge could not detect UTF-8 files without BOM
- Open binary files to file compare
- Resolve conflict files (CVS, SVN, ...)
- New translations: Croatian and Portuguese

Source in this release includes:
- all files from the subversion repository

Binary includes 
- WinMerge.exe, WinMergeU.exe
- expat and pcre dll:s
- Manual
- Filters
- Plugins
- ShellExtension dll (ANSI, UNICODE & 64-bit versions)
- PO translation files

Runtimes includes
- Visual Studio 2003.Net runtimes WinMerge now needs

MS Platform SDK is needed to compile WinMerge sources.

All files virus-scanned with:
NOD32 version 2921 (20080304) NT

SHA-1 Checksums for files:
bcec65a594ee5b846f7d257f5da3c83b7083d6df Runtimes-2.8RC.7z
de26c00c950c2e6d8122819f668ec917f0a12df6 Runtimes-2.8RC.zip
27cef75ed3e3771c288f9f3d6d0a90fd5d577c6a WinMerge-2.8RC-exe.7z
caa72bcf634f0a4dd7ef473e0165dec07cadfd6f WinMerge-2.8RC-exe.zip
1167d46c7ae18ac56f658ad3355d7d2722d56733 WinMerge-2.8RC-Setup.exe
771f978526f893e1fe116162b531ccf6a7148beb WinMerge-2.8RC-src.7z
ff79a309f94b14755191998dbfa178b7f12e198b WinMerge-2.8RC-src.zip


Changes:
Changes since WinMerge 2.6.0:

WinMerge 2.8 RC - 2008-03-04 (r5125)
  Update developers list in splash screen (#1891548)
  Better error handling for Excel plugin (#1510293)
  Add macros, bookmarks and document properties to Word plugin (#1510298)
  Add *.dot (document template) extension to Word plugin (r5120)
  BugFix: Copy&Paste from VB6 added binary chars (#1904355)
  Translation updates:
  - Chinese Traditional (#1905323)
  - Swedish (#1905520)

WinMerge 2.7.7.6 - 2008-02-28 (r5099)
  Remove sintance.h/sintance.cpp as not compatible with GPL (#1886580)
  Automatically switch to mixed-EOL mode when loading files with
   two or more EOL styles (#1901547)
  Indent "Explorer Context Menu" sub options (#1901763)
  Replace 'DOS' in EOL style strings with 'Windows' (#1902583)
  Show 'Mixed' as file compare EOL style instead of empty style (r5091)
  Typo fixes and grammar improvements to several strings (#1898401)
  BugFix: Ignore codepage specified on File Encoding dialog if file was 
    detected as UTF-8 (#1900728)
  BugFix: Recognize invalid UTF-8 sequence as UTF-8 (#1900733)
  BugFix: Didn't highlight any difference between untitled documents (#1900257)
  Translation updates:
  - Czech (r5073)
  - Japanese (r5076)
  - Swedish (#1901784)

WinMerge 2.7.7.5 - 2008-02-22 (r5069)
  Cleaning up Help-menu (#1875111)
  Right-align tab size number in editor options (r5037)
  Move Time difference ignore -option to compare options (#1892283)
  Add option to select temporary folder (#1893167)
  Show file encoding in file compare statusbar (#1895629)
  Unify EOL style strings in folder compare and file compare (#1896462)
  Remove "DisplayBinaryFiles" and "EditBinaryFiles" plugin (#1899161)
  BugFix: Potential lockup in folder compare (#1865131, #1889907)
  BugFix: Line filter didn't filter non-ascii lines correctly (#1880628)
  BugFix: GNU General Public License name in menu (#1868989)
  BugFix: Didn't switch back to content compare once switched to quick 
    compare in folder compare (#1770373)
  BugFix: Quick compare didn't ignore EOL differences (#1884717)
  Translation updates:
  - Croatian (r5032)
  - Czech (r5017)
  - German (r5038)
  - Slovak (#1895583)
  - Swedish (#1891326)

WinMerge 2.7.7.4 - 2008-02-07 (r5011)
  Detect (and read/write) UTF-8 files without BOM (#1879271)
  Tell user that file is not a conflict file (#1880423)
  Allow opening conflict file from command line (#1880857)
  Use radio symbol for current EOL menu item (#1869755)
  Ask and create pair for unique folder and open them (#1881454)
  Add publisher info to version resource (#1884920)
  Move "Zoom In/Out" to own sub menu (#1879340)
  Installer: Add more version resource info (#1885793)
  Reset text zoom to default size with Ctrl + * (#1886664)
  BugFix: Always return 0 to command line (#1854419)
  BugFix: Merge/Delete deleted items from read-only sides (#1882019)
  BugFix: Shellextension had no publisher info and wrong
    description (#1878828)
  BugFix: Lockup when showing binary files (#1880711)
  Translation updates:
  - Croatian (r4952)
  - Japanese (r4962)
  - Swedish (#1884918)

WinMerge 2.7.7.3 - 2008-01-23 (r4951)
  Resolve conflict files (cvs, svn...) (#1875129)
  Save line filter when edit box loses focus (#1875853)
  Add link to translations website at help menu (#1699883)
  Manual: Add instructions for conflict file resolving (#1876770)
  Manual: Document third path given to command line (#1877735)
  BugFix: Fix Quick Compare regression in 2.7.7.2 (#1872165)
  Bugfix: Clipped text in file saving error message (#1874854)

WinMerge 2.7.7.2 - 2008-01-14 (r4915)
  Syntax highlighting for PowerShell files (#1859657)
  Syntax highlighting for PO(T) files (#1866221)
  Change font size with Ctrl + MouseWheel (#1865795, #1869686)
  Horizontal scrolling with Shift + MouseWheel (#1865795)
  Installer: Add support for integration with latest version of TortoiseCVS and
    TortoiseSVN x64 (#1865168)
  Close compare tab with middle mouse button (#1865220)
  Add index.html for documentation folders (#1866183)
  Manual: Clarify file filters folder name matching (#1867212)
  Improve file compare margin icons location (#1718699)
  Enable file compare to open binary files (#1869647)
  File encoding dialog for file compare (#1871079)
  BugFix: Crash when using TrackPoint middle-button scrolling (#1864040)
  BugFix: WinMerge didn't show the contents of the symbolic link target (#1864978)
  BugFix: Unused registry key HKCU\Thingamahoochie\WinMerge was created 
    (#1865202)
  BugFix: Register.bat didn't work on Windows 98 and Vista (#1869821)
  BugFix: Open-dialog was not displayed on Windows 98 (#1866442, #1869858)
  BugFix: Right mouse button didn't move cursor to new place (#1814184)
  Translation updates:
  - Spanish (#1867234)
  - Swedish (#1867765, #1867844)

WinMerge 2.7.7.1 - 2007-12-20 (r4842)
  New option to keep file's time when saving in file compare (#1851921)
  Installer: Link to translated ReadMe in Start menu, if file exists (#1805818)
  Add HTML-formatted release notes (#1851308, #1852534)
  Installer: Install release notes file (#1852599)
  Installer: Move manual to core files component and remove
   User Guide component (#1853409)
  Bugfix: VS2008 and VS2005 compile problems (#1847265)
  Bugfix: More difference highlight code reverts (#1748940)
  Translation updates:
  - Spanish (#1655577)

WinMerge 2.7.6 - 2007-11-29 (r4807)
  Touchpad scrolling improvements (#1837457)
  BugFix: Values with "," inside could break the CSV report (#1831512)
  BugFix: Failed to create backup file in folder compare (#1835283)
  BugFix: Revert difference highlight code to 2.6.12 version (#1811695)
  BugFix: Backspace key didn't work when renaming items (#1738790)
  Translation updates:
  - Croatian (r4786)

WinMerge 2.7.5.7 - 2007-11-19 (r4772)
  Remove MFC dependency from ShellExtension (#1833521)
  Update ShellExtension icon to new WinMerge icon (#1833616)
  BugFix: Build script didn't update PO files correctly before copying (r4756)
  BugFix: ShellExtension's icon was clipped if system font size was small
    (#1833616)
  BugFix: Merge controls were not enabled for missing lines (#1833714)

WinMerge 2.7.5.6 - 2007-11-15 (r4752)
  BugFix: Many translation-system related fixes and improvements (#1804762)
  BugFix: When copying files to VCS system, destination file was
    not checked out (#1828930)
  BugFix: Visible area indicator on location pane shook when clicking
    above or below the vertical scroll bar to scroll one screen (#1829572)
  Translation updates:
  - Croatian (#1829301)
  - Japanese (r4730)

WinMerge 2.7.5.5 - 2007-11-08 (r4722)
  Bugfix: Don't enable merge GUI for ignored differences (#1826375)
  BugFix: PgUp key caused the error message "An invalid argument was
    encountered" when word-wrap mode was on (#1820631)
  BugFix: Keep selected items visible in Folder Compare columns dialog (r4715)
  BugFix: Disable Folder Compare column selection dialog's up/down buttons
    when first/last items are selected (r4716)
  BugFix: Many translation-system related fixes and improvements (#1804762)
  Add Croatian translation (#1820308)
  Translation updates:
  - Chinese Traditional (#1824691)

WinMerge 2.7.5.4 - 2007-11-01 (r4687)
  New PO files based translation system (#1804762)
  New folder compare column selection dialog (#1804555)
  Install WinMerge.exe (ANSI version) only for Windows 95/98/ME (#1809140)
  Better multi-monitor support, with option to lock panes (#1788168)
  Installer: Install PO files and MergeLang.dll (#1820689)
  BugFix: Ignored differences were merged when merging multiple
    differences (#1811745)
  Bugfix: Don't clear selection when right-clicking outside it (#1814184)
  Bugfix: Configuration log labeled Vista as Longhorn (#1815859)
  Bugfix: Customized text color for ignored differences didn't shown (#1807895)
  Translation updates:
  - Chinese Traditional (#1810192, #1810541)
  - Italian (#1805044)

WinMerge 2.7.5.3 - 2007-09-27 (r4572)
  Use PO files for translations (generate RC-files from PO-files)
  Add Portuguese translation (#1756364)
 Change Up/Down button names in folder compare columns dialog(#1800064)
  BugFix: Fix MakeResDll crash (#1795421)
  BugFix: Full screen mode didn't work with multiple monitors (#1788168)
  Bugfix: Revert multiple monitor patches (#1788168)
  BugFix: PgUp key didn't do anything in beginning of the file (#1795680)
  BugFix: The option 'Automatically scroll to first difference' didn't work
    properly when word-wrap mode was on (#1795814)
  Translation updates:
  - French (#1800064, #1802363)
  - Japanese (r4546)

WinMerge 2.7.5.2 - 2007-09-11 (r4528)
  Graphical improvements to location pane (#1770175)
  Remove MFC dependency from resource compiler (#1783581)
  Better multi-monitor support (split file view on monitor boundary) (#1788168)
  BugFix: Renaming unique item (only other side) renamed parent folder (#1787816)
  BugFix: Goto didn't change the active pane when selecting another pane (#1791351)
  Translation updates:
  - Traditional Chinese (r4473)

WinMerge 2.7.5.1 - 2007-08-16 (r4440)
  HTML reports for file compare (#1739209)
  Ask confirmation when exiting with multiple windows open (#1757800)
  Translation updates:
  - Catalan (r4370)
  - Simplified Chinese (r4369)
  - Danish (r4360)
  - French (r4383)
  - Russian (r4421)
  - Slovak (r4413)
  - Swedish (r4412)

WinMerge 2.7.4 - 2007-06-27 (r4352)
  Batch-file syntax highlighting keywords cleanup (#1743504)
  Bugfix: Archivesupport: Zip-->both didn't work correctly (#1734439)
  Bugfix: Linediff didn't highlight whitespace differences (#1698781)
  Bugfix: Copy confirmation dialog did show wrong To-path (#1740024)
  Translation updates:
  - Italian (#1737491)

WinMerge 2.7.3.7 - 2007-06-14 (r4330)
  New big toolbar (actual image instead of placeholder) (#1736520)
  Bugfix: Fixes to folder compare copy/rename operations (#1730534)
  Translation updates:
  - Swedish (#1735635)

WinMerge 2.7.3.6 - 2007-06-07 (r4321)
  Recent project files in File-menu (#1731551)
  Automatically import existing linefilters to new dialog (#1718040)
  Bugfix: copy/delete of unique items failed in folder compare
    in 2.7.3.5 (#1730534)
  Bugfix: crashed when ESC was pressed while renaming item in
    folder compare (#1705874)

WinMerge 2.7.3.5 - 2007-05-31 (r4304)
  Relax selecting parent folder restrictions (up arrow in folder compare) (#1727829)
  Show a warning if item can't be found anymore in folder compare
    and it is tried to access (copy/move/delete) (#1723778)
  New Borland Delphi file filter (#1699783)
  Gradient toolbar (#1717774)
  Bugfix: could not create new file filters in 2.7.3.4 (#1719892)

WinMerge 2.7.3.4 - 2007-05-15 (r4287)
  Big (32x32) toolbar (image still placeholder) (#1698641)
  Improve folder compare copy confirmation dialog (#1699585, #1700241)
  New file filter for Symbian developers (#1694048)
  Bugfix: several fixes to in-line difference highlight (#1694102, #1714088)
  Bugfix: word wrap lose horizontal scrollbar (#1706476)
  Bugfix: fixes to tabbed window control (#1718148)
  Translation updates:
  - German (#1701151)
  - Japanese
  - Korean (#1704904)
  - Swedish (#1703350)

WinMerge 2.7.3.3 - 2007-04-04 (r4234)
  Tabbed interface (#1603292)
  Enable shell integration for folder backgrounds (#1693113)
  Allow selecting syntax highlighting (#1690346)
  New C# development file filter (#1689854)
  Icon updates (#1686279, #1692097)
  Bugfix: compare by date and by size broken in 2.7.3.2 (#1693441)
  Bugfix: Open-dialog file filter failed if modified (#1693275)
  Translation updates:
  - Swedish (#1689515)

WinMerge 2.7.3.2 - 2007-03-27 (r4201)
  Several fixes to line difference highlighting (#1491334, #1683061, #1639453)
  Icon updates (#1684865)
  Printing improvement (#1687430)
  Language files size reduced (#1687661, #1687983, #1688012)
  Bugfix: 2.7.3.1 binary file compare crash (#1687966)
  Bugfix: long linefilters now restored correctly (#1680920)
  Translation updates:
  - Japanese

WinMerge 2.7.3.1 - 2007-03-20 (r4179)
  New copy confirmation dialog in folder compare (#1675087, #1683842)
  Improved line filter dialog (#1682475)
  Installer/uninstaller icons restored to default icons
  Some icon updates (#1680209)
  Bugfix: folder compare lost focus after confirmation dialog (#1670991)
  Bugfix: crash comparing empty folders (#1675211)
  Translation updates:
  - Czech
  - French (#1664689)
  - Polish (#1673082)
  - Swedish (#1673908, #1678676, #1683289)

WinMerge 2.7.2 - 2007-02-27 (r4137)
  Fix ShellExtension installation bug 
  Translation updates:
  - Czech
  - German (#1667564)
  - French (#1664689)

WinMerge 2.7.1.7 - 2007-02-20 (r4120)
  Folder compare threading improvement - should be faster in many
    situations (#1662002)
  New options for backup file location and naming (#1652696)
  Syntax highlighting for CSS files (#1582537)
  Allow to hide folder compare margins (View/View Margins) (#1663798)
  Translation updates:
  - Czech
  - Polish (#1650831)
  - Swedish (#1657664)

WinMerge 2.7.1.6 - 2007-02-01 (r4094)
  New post-compare line filters for folder compare (#1644820)
  Optimization for word wrap code (#1640741)
  Bugfix: 2.7.1.5 forgets selected filter (#1637433)
  Bugfix: limiting to single file compare window now works more
    logically (#1636314)
  Bugfix: ANSI regular expressions didn't work (#1644668)
  Translation updates:
  - Bulgarian (#1639493)
  - Catalan (#1646638)
  - Swedish (#1634968)

WinMerge 2.7.1.5 - 2007-01-10 (r4030)
  New line filter implementation (please test and report bugs!) (#1593810)
  Minimum height for location pane's visible area (#1489875)
  Short label "Error" for error items in folder compare (#1567749)
  Bugfix: rename edits wrong field in folder compare (#1597939)
  Bugfix: too much scrolling in difference navigation
  Bugfix: wrong text selection after pane switch in file compare (#1630630)
  Bugfix: crash when editing space-char indented files (#1631613)
  Manual updates

WinMerge 2.7.1.4 - 2006-12-21 (r3991)
  Match lines inside differences (#1447744)
  Workaround-patch (locally included to the build) for
     shutdown problems (#1602313)
  New ASP.Net filefilter (#1619689)
  Bugfix: folder compare speed regression in 2.7.1.3 (#1610442)
  Bugfix: new fix for folder compare Copy Left/Right To.. (#1603061)
  Bugfix: copyright info missing from about dialog when
    translation selected (#1604115)
  Bugfix: location pane problems with word-wrap (#1584068, #1611542)
  Bugfix: invalid path added to project file -dialog (#1602219)
  Swedish translation update (#1614442)
  Manual updates

WinMerge 2.7.1.3 - 2006-12-05 (r3919)
  Now hides skipped items by default (#1604078)
  Improved INI file syntax highlighting (#1607193)
  Easier folder selection in Project File -dialog (#1603196)
  New "Exclude Source Control files and directories filter" filefilter (#1557295)
  Bugfix: project files weren't loaded correctly from command line
    (using shell file association) (#1602214)
  Bugfix: crash in syntax parser (#1556688)
  Bugfix: wrong difference navigation when word-wrap enabled (#1597814)
  Bugfix: ClearCase integration didn't install if "Program Files" -folder
    was named differently (non-English Windows)
  Manual updates
  Slovak translation update (#1606496)

WinMerge 2.7.1.2 - 2006-11-24 (r3844)
  close WinMerge if Open-dialog is canceled when started
    from command line (#1600714)
  BugFix: project files didn't work (loaded right-side path
    for both sides) (#1600000)
  BugFix: location pane misdrawn when word-wrap enabled (#1584068)

WinMerge 2.7.1.1 - 2006-11-16 (r3810)
  Use expat + scew for XML handling (partially converted) (1587574)
  Uses PCRE for regular expressions (partially converted) (#1591605)
  New folder compare icons (#1586705)
  New bookmarks icons (#1586689)
  Manifest files in resource, no need for separate files (#1588212)
  BugFix: WinMerge/Filters folder was always created (#1578419)
  BugFix: modality problems in file selection dialogs (#1586869)
  BugFix: crash if file modification time was missing (#1589563)
  BugFix: /x parameter didn't work with some other parameters (#1564283)
  BugFix: asked sometimes twice about saving modified files (#1596692)