Src\Changes.txt
Add new items to top.
(This summarizes all changes to all files under Src, including Src\Languages.)

2007-06-27 WinMerge beta release 2.7.4 (revision 4352)

2007-06-26 Kimmo
 PATCH: [ 1743504 ] new keywords (cleaned up)
  Submitted by Andre Arpin
  editlib: batch.cpp
 BUG: [ 1740024 ] "Copy/Move to" confirmation dialog shows wrong "To" path
  Src: DirActions.cpp FileActionScript.h
 BUG: [ 1739998 ] No copy/move/delete icons in compare popup menu
  Src: MainFrm.cpp Merge.cpp Merge.h

2007-06-25 Kimmo
 PATCH: [ 1737491 ] Italian resource file for 2.7.3.7
  Submitted by Andrea Decorte
  Src/Languages/Italian: MergeItalian.rc
 BUG: [ 1698781 ] [LineDiff] Whitespace differences not highlighted
  Fix from Gal
  Src: stringdiffs.cpp stringdiffsi.h

2007-06-16 Jochen
 PATCH: [ 1734439 ] Fix Bug #1723263 "Zip --> Both" operation give unwanted content in output
  Src: 7zCommon.cpp

2007-06-13 Kimmo
 PATCH: [ 1736520 ] WinMerge Large Toolbar Icons - small update
  Submitted by Alexander Skinner
  Src/res: ToolbarDisabled32.bmp ToolbarEnabled32.bmp

2007-06-13 WinMerge experimental release 2.7.3.7 (SVN revision 4330)

2007-06-13 Kimmo
 PATCH: [ 1735635 ] Swedish WinMerge 2.7.3.6 translation update
  Submitted by Hans Eriksson
  Src/Languages/Swedish: MergeSwedish.rc
 PATCH: [ 1736520 ] WinMerge Large Toolbar Icons
  Submitted by Alexander Skinner
  Src: MainFrm.cpp
  Src/res: ToolbarDisabled32.bmp ToolbarEnabled32.bmp

2007-06-12 Takashi
 BUG: [ 1730534 ] Cannot copy unique items in 2.7.3.5 (3)
  Src: DirActions.cpp
 PATCH: [ 1727722 ] Remove AppSerialize (only used for fonts)(3)
  Src: MainFrm.cpp

2007-06-08 Takashi
 BUG: [ 1730534 ] Cannot copy unique items in 2.7.3.5 - additional fix for deleting(2)
  Src: DirActions.cpp
 PATCH: [ 1727722 ] Remove AppSerialize (only used for fonts)(2)
  Src: MainFrm.cpp

2007-06-07 WinMerge experimental release 2.7.3.6 (SVN revision 4321)

2007-06-07 Kimmo
 BUG: [ 1730534 ] Cannot copy unique items in 2.7.3.5 - additional fix for deleting
  Src: DirActions.cpp
 TODO: [ 1718040 ] Import existing linefilter to new dialog
  Src: LineFiltersList.cpp LineFiltersList.h MainFrm.cpp

2007-06-06 Kimmo
 Apply Recent projects (patch #1731551) menuitem to languages
  Src/Languages/*: Merge*.rc
 BUG: [ 1730534 ] Cannot copy unique items in 2.7.3.5
  Src: DirActions.cpp

2007-06-05 Dean
 PATCH: [ 1731551 ] Recent Projects MRU
  Src: Merge.cpp Merge.h Mainfrm.cpp Mainfrm.h Merge.rc

2007-06-01 Gal
 BUG: [ 1705874 ] Hitting escape during listitem rename also exited winmerge
  Src: DirView.cpp

2007-05-31 Tim
 PATCH: [ 1729179 ] Change "Rational Clearcase" to "Rational ClearCase"
  Src: Merge.rc
  Src/Languages/*: Merge*.rc
 PATCH: [ 1727951 ] Use patch icon from TortoiseSVN
  Src/res: patch.bmp
 PATCH: [ 1727954 ] New help icon from Alexander Skinner
  Src/res: help_contents.bmp

2007-05-31 WinMerge experimental release 2.7.3.5 (SVN revision 4304)

2007-05-31 Kimmo
 PATCH: [ 1699783 ] Filter addon x borland delphi
  Submitted by Alberto Kalb
  Filters new file: Delphi.flt
 Add Alberto Kalb to contributors
  Docs/Users: Contributors.txt

2007-05-30 Kimmo
 PATCH: [ 1727722 ] Remove AppSerialize (only used for fonts)
  Src: MainFrm.cpp Merge.dsp Merge.h OptionsDef.h OptionsInit.cpp
  Src removed files: AppSerialize.cpp AppSerialize.h
 PATCH: [ 1727829 ] Relax parent folder opening restrictions
  Src: DirDoc.cpp

2007-05-26 Kimmo
 PATCH: [ 1725778 ] Cleanup CDirView::OpenSelection()
  Src: DirView.cpp DirView.h
 Coding style cleanup (returns in own lines)
  Src: paths.cpp

2007-05-23 Kimmo
 PATCH: [ 1723778 ] Warn user when folder compare contents have changed at disk
  Src: DirActions.cpp DirView.h Merge.rc resource.h
  Src/Languages/*: Merge*.rc

2007-05-20 Tim
 PATCH: [ 1722213 ] Fix wrong </endtag> syntax color in HTML highlighters
  Src/editlib: asp.cpp html.cpp php.cpp

2007-05-20 Takashi
 PATCH: [ 1717774 ] Gradient toolbar
  Src: MainFrm.cpp MainFrm.h

2007-05-19 Tim
 Fix white space indenting in ASP and C# highlighter (included with PATCH #1556685).
  Src/editlib: asp.cpp csharp.cpp

2007-05-17 Kimmo
 BUG: [ 1719892 ] New file filter cannot find template file
  Src: FileFiltersDlg.cpp

2007-05-15 Tim
 BUG: [ 1719427 ] SetResourceVersions.bat shows error message
  Src: SetResourceVersions.wsf

2007-05-15 WinMerge experimental release 2.7.3.4 (SVN revision 4287)

2007-05-14 Gal
 BUG: [ 1714088 ] displays not existing content
  Src: stringdiffs.cpp

2007-05-14 Kimmo
 PATCH: [ 1718060 ] Change locationpane visible area color
  Src: LocationView.cpp

2007-05-13 Takashi
 PATCH: [ 1718148 ] Fix tab bar problem
  Src/Common: MDITabBar.cpp

2007-05-13 Takashi
 Japanese translation - update
  Src/Languages/Japanese/MergeJapanese.rc

2007-05-13 Takashi
 BUG: [ 1717814 ] Fix header drawing issue on WinXP with Luna Theme
  Src/Common: SortHeaderCtrl.cpp

2007-05-12 Tim
 PATCH: [ 1716799 ] Remove TOOLBAR from lang files
  Src: Merge.rc Merge2.rc
  Src/Languages/*: Merge*.rc

2007-05-07 Tim
 RFE: [ 1711549 ] Simplify IDC_IGNOREREGEXP text
  Src: Merge.rc
  Src/Languages/*: Merge*.rc

2007-05-06 Tim
 RFE: [ 1711548 ] Move common things to own resource file
  Src: Merge.rc
  Src new file: Merge2.rc
  Src/res: Merge.rc2

2007-04-30 Kimmo
 PATCH: [ 1704904 ] Korean Translation 2.6.X
  Submitted by Sukjoon, Hwang
  Src/Languages/Korean: MergeKorean.rc

2007-04-28 Kimmo
 PATCH: [ 1703350 ] Update of Swedish MergeSwedish.rc
  Submitted by Hans Eriksson
  Src/Languages/Swedish: MergeSwedish.rc

2007-04-26 Gal
 BUG: [ 1706476 ] (2.6.6.0) wrap lines looses horizontal scroll bar
  Src/editlib: ccrystaltextview.cpp

2007-04-16 Tim
 PATCH: [ 1701151 ] Various Updates in German Translation
  Src/Languages/German: MergeGerman.rc

2007-04-14 Kimmo
 PATCH: [ 1700241 ] Add trailing slash for foldernames in Copy Confirm dialog
  Src: DirActions.cpp

2007-04-13 Kimmo
 PATCH: [ 1699585 ] Fix copy confirmation dialog for CopyTo
  Src: ConfirmFolderCopyDlg.cpp DirActions.cpp FileActionScript.h Merge.rc resource.h
  Src/Languages/*: Merge*.rc

2007-04-12 Kimmo
 BUG: [ 1698159 ] Invalid state change assertion
  Src: CompareStats.cpp CompareStats.h DiffThread.cpp DirCompProgressDlg.cpp
 PATCH: [ 1698641 ] Add 32x32 toolbar
  Src: MainFrm.cpp MainFrm.h Merge.rc OptionsDef.h OptionsInit.cpp resource.h
  Src/Languages/*: Merge*.rc
  Src/res new files: ToolbarDisabled32.bmp ToolbarEnabled32.bmp

2007-04-11 Kimmo
 Fix assert caused by my checkin 2007-04-08 Remove couple of useless wrapper functions
  Src: MergeDoc.cpp

2007-04-11 Gal
 PATCH: [ 1697691 ] Syntax highlighting scheme as resource strings
  Src/Languages/*: Merge*.rc
  Src: Merge.rc MergeEditView.cpp resource.h

2007-04-10 Kimmo
 PATCH: [ 1694048 ] File filter for Symbian developers
  Filters new file: Symbian.flt

2007-04-10 Gal
 BUG: [ 1694102 ] Compare with comments bug
  Src: stringdiffs.cpp

2007-04-08 Kimmo
 Add Jeremy Dewey and Dan Pidcock to contributors.txt
  Docs/Users: Contributors.txt
 Remove couple of useless wrapper functions
  Src: MergeDoc.cpp MergeDoc.h

2007-04-08 Takashi
 BUG: [ 1694581 ] Need to limit window tab width
  Src/Common: MDITabBar.cpp

2007-04-07 Kimmo
 Fix building language files (buildall.bat)
  : buildall.bat

2007-04-04 WinMerge experimental release 2.7.3.3 (SVN revision 4234)

2007-04-04 Kimmo
 Remove expat and SCEW unicode targets from build batch
  : buildall.bat
 BUG: [ 1576168 ] Cannot find file filter path message is wrong
  Src: FileFiltersDlg.cpp
  Src/Languages/*: Merge*.rc
 Bump ShellExtension version to 1.12
  ShellExtension: ShellExtension.rc

2007-04-03 Kimmo
 PATCH: [ 1693113 ] Enable ShellExtension for folder backgrounds
  ShellExtension: WinMergeShell.cpp WinMergeShell.rgs
 BUG: [ 1693441 ] Compare by date (and size) broken in 2.7.3.2
  Src: DiffContext.cpp

2007-04-03 Takashi
 BUG: [ 1693275 ] File extension filter does not work correctly
  Src: FileFilterHelper.cpp

2007-04-02 Kimmo
 RFE: [ 1685190 ] Add 1 pixel margin to line numbers area
  Src/editlib: ccrystaltextview.cpp
 PATCH: [ 1693041 ] Fix couple of editor bugs
  Submitted by Jeremy Dewey
  editlib: ccrystaleditview.cpp ccrystaltextbuffer.cpp

2007-04-01 Tim
 PATCH: [ 1692033 ] Use SetResourceVersions.wsf with 3 version numbers
  Src: SetResourceVersions.wsf
 PATCH: [ 1692097 ] Updated Toolbar Enabled/Disabled BMP
  Submitted by Alexander Skinner
  Src/res: ToolbarDisabled.bmp ToolbarEnabled.bmp

2007-03-31 Takashi
 BUG: [ 1630762 ] Cannot save project file if including non-ascii chars
  Src: Merge.dsp ProjectFile.cpp

2007-03-31 Takashi
 PATCH: [ 1603292 ] Add tab interface for MDI child windows
  Src: MainFrm.cpp MainFrm.h Merge.dsp Merge.rc OptionsDef.h OptionsInit.cpp
   resource.h
  Src/Common: MDITabBar.cpp MDITabBar.h
  Src/Languages/*: Merge*.rc
 Fix broken resources
  Src/Languages/*: Merge*.rc

2007-03-31 Kimmo
 PATCH: [ 1689293 ] Batch file for building WinMerge files
  : buildall.bat

2007-03-30 Kimmo
 PATCH: [ 1690503 ] fix for bug 1659281 "WinMerge forgets monitor to use when th
  Submitted by from Dan Pidcock
  Src: MainFrm.cpp

2007-03-30 Gal
 RFE: [ 1690346 ] Manual selection of syntax highlighting scheme
  Src/Languages/*: Merge*.rc
  Src: Merge.rc MergeEditView.cpp MergeEditView.h resource.h

2007-03-29 Tim
 PATCH: [ 1646210 ] Use CSS for HTML report
  Src: DirCmpReport.cpp
 PATCH: [ 1686279 ] New icons for Copy and Advance
  Src/res: ToolbarDisabled.bmp ToolbarEnabled.bmp

2007-03-29 Kimmo
 PATCH: [ 1689854 ] C# development file filter
  Filters new file: CSharp_loose.flt
 BUG: [ 1689778 ] Refresh should be in view menu, not the edit menu
  Patch from Dan Pidcock
  Src: Merge.rc
  Src/Languages/*: Merge*.rc
 PATCH: [ 1689515 ] Swedish translation of "Page Se&tup"
  Submitted by Hans Eriksson
  Src/Languages/Swedish: MergeSwedish.rc

2007-03-27 Tim
 RFE: [ 1646407 ] Use "equal" or "not equal" as file compare icon
  (Fixed the blurred icons and minimize the flicking effect)
  Src: ChildFrm.cpp
  Src/res: MergeDoc.ico

2007-03-27 WinMerge experimental release 2.7.3.2 (SVN revision 4201)

2007-03-26 Tim
 PATCH: [ 1688012 ] Remove IDR_MAINFRAME icon from lang files
  Src: AboutDlg.cpp Merge.rc resource.h
  Src/Languages/*: Merge*.rc
 PATCH: [ 1684865 ] WinMerge Icon Set Revision 4
  (Now with the 256*256 versions)
  Src/res: MergeDoc.ico MergeProject.ico

2007-03-26 Kimmo
 PATCH: [ 1687966 ] Fix crash when changing compare method
  Src: DiffContext.cpp DiffContext.h FolderCmp.cpp

2007-03-26 Gal
 BUG: [ 1687754 ] Editor regression in trunk (2)
  Src: stringdiffs.cpp stringdiffsi.h

2007-03-26 Gal
 BUG: [ 1639453 ] Imaginary difference highlighted in character level mode
  Src: stringdiffs.cpp

2007-03-25 Tim
 PATCH: [ 1687661 ] Remove ICONS and BITMAPS from lang files
  Src/Languages/*: Merge*.rc
 PATCH: [ 1687983 ] Remove IMAGES and CURSORS from lang files
  Src/Common: Picture.cpp
  Src/editlib: ccrystaltextview.cpp
  Src/Languages/*: Merge*.rc

2007-03-25 Gal
 BUG: [ 1687754 ] Editor regression in trunk
  Src: stringdiffs.cpp stringdiffsi.h

2007-03-25 Takashi
 Japanese translation - update
  Src/Languages/Japanese/MergeJapanese.rc

2007-03-25 Takashi
 PATCH: [ 1687430 ] printing patch
  Src: Merge.rc MergeEditView.cpp MergeEditView.h
  Src/Common: SplitterWndEx.cpp SplitterWndEx.h
  Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
  Src/Languages/*: Merge*.rc

2007-03-25 Kimmo
 BUG: [ 1680920 ] Line filters are not preserved across sessions
  Src/Common: OptionsMgr.cpp

2007-03-25 Tim
 PATCH: [ 1687439 ] Add MergeProject.ico to WinMerge EXE
  Src: Merge.dsp Merge.rc resource.h
  Src/res new file: MergeProject.ico

2007-03-24 Tim
 PATCH: [ 1684865 ] WinMerge Icon Set Revision 4
  (Initially without the 256*256 version)
  Src/res: MergeDoc.ico

2007-03-22 Gal
 BUG: [ 1683061 ] Bug in highlighting
  Src: stringdiffs.cpp

2007-03-21 Gal
 RFE: [ 1646407 ] Use "equal" or "not equal" as file compare icon
  Src: ChildFrm.cpp ChildFrm.h MergeDoc.cpp

2007-03-21 Gal
 BUG: [ 1491334 ] thinly highlighted position is wrong
  Src: stringdiffs.cpp stringdiffsi.h

2007-03-20 WinMerge experimental release 2.7.3.1 (SVN revision 4179)

2007-03-20 Kimmo
 PATCH: [ 1683805 ] Remove unneeded linefilter registry values
  Src: LineFiltersList.cpp
  Src/Common: OptionsMgr.cpp OptionsMgr.h
 PATCH: [ 1683842 ] Allow resizing copy confirmation dialog
  Src: ConfirmFolderCopyDlg.cpp ConfirmFolderCopyDlg.h Merge.rc
  Src/Languages/*: Merge*.rc

2007-03-19 Tim
 PATCH: [ 1680209 ] New icons from Alexander Skinner (Part 1)
  Based on icons by Alexander Skinner
  Src/res: copy.bmp cut.bmp language.bmp paste.bmp print.bmp select_all.bmp select_font.bmp
 PATCH: [ 1683289 ] Swedish translation update for Improve Line filters dialog
  Submitted by Hans Eriksson
  Src/Languages/Swedish: MergeSwedish.rc

2007-03-19 Kimmo
 Remove extra line from manifest file
  Src/res: WinMergeU.exe.manifest

2007-03-18 Kimmo
 PATCH: [ 1682475 ] Improve Line filters dialog (add new files I forgot to add)
  Src: Merge.dsp
  Src new files: LineFiltersList.cpp LineFiltersList.h

2007-03-17 Kimmo
 PATCH: [ 1682475 ] Improve Line filters dialog
  Src: DirDoc.cpp MainFrm.cpp MainFrm.h Merge.rc Merge.rc MergeDoc.cpp OptionsDef.h
   OptionsInit.cpp PropLineFilter.cpp PropLineFilter.h
  Src/Languages/*: Merge*.rc
 BUG: [ 1682500 ] Crash when comparing empty folders
  Reported and analyzed by Takashi
  Src: DirScan.cpp

2007-03-15 Kimmo
 Trivial string initialization fix
  Src: SyntaxColors.cpp

2007-03-13 Kimmo
 PATCH: [ 1679196 ] Cleanup logfile class usage
  Src: DiffWrapper.cpp DirActions.cpp DirDoc.cpp DirScan.cpp FolderCmp.cpp MainFrm.cpp
   Merge.cpp Merge.h MergeDoc.cpp Plugins.cpp StdAfx.cpp StdAfx.h
  Src/Common: LogFile.cpp LogFile.h

2007-03-12 Kimmo
 Remove unneeded include lines
  Src: DirDoc.cpp
 Remove unneeded initialization
  Src: CCPrompt.cpp
 PATCH: [ 1678676 ] Swedish translation of New Copy Confirmation dialog
  Submitted by Hans Eriksson
  Src/Languages/Swedish: MergeSwedish.rc

2007-03-11 Jan Hryz
 Czech translation - translation of "confirm copy" dialog
  Src/Languages/Czech/MergeCzech.rc

2007-03-08 Kimmo
 PATCH: [ 1664689 ] French translation (update2)
  Submitted by Jean-F Jolin
  Src/Languages/French: MergeFrench.rc
 Remove two unused functions, improve comments
  Src: DirActions.cpp
 BUG: [ 1670991 ] File panes lost focus after delete confirmation dialog
  Src: DirActions.cpp
 Fix comment about contributors file
  Src: AboutDlg.cpp
 PATCH: [ 1676802 ] Move compare options to DiffContext
  Src: ByteComparator.cpp ByteComparator.h CompareOptions.cpp CompareOptions.h
   DiffContext.cpp DiffContext.h DirDoc.cpp DirDoc.h FolderCmp.cpp

2007-03-07 Kimmo
 PATCH: [ 1675087 ] New copy confirmation dialog
  Src: DirActions.cpp FileActionScript.h Merge.dsp Merge.rc resource.h
  Src new files: ConfirmFolderCopyDlg.cpp ConfirmFolderCopyDlg.h
  Src/Languages/*: Merge*.rc

2007-03-07 Takashi
 PATCH: [ 1675211 ] Fix crash when hiding parent folder item on folder view
  Src/DirView.cpp

2007-03-06 Kimmo
 PATCH: [ 1673908 ] Update of Swedish translation for "View margins"
  Submitted by Hans Eriksson
  Src/Languages/Swedish: MergeSwedish.rc

2007-03-04 Kimmo
 PATCH: [ 1673082 ] Polish translation for WM CVS
  Submitted by dr_prozac
   Src/Languages/Polish: MergePolish.rc

2007-03-04 Tim
 BUG: [ 1668996 ] Two "Copy Right" buttons in Russian GUI.
  Src/Languages/Russian: MergeRussian.rc

2007-03-04 Kimmo
 PATCH: [ 1664689 ] French translation (update)
  Submitted by Jean-F Jolin
  Src/Languages/French: MergeFrench.rc

2007-02-27 WinMerge beta release 2.7.2 (revision 4137)

2007-02-27 Kimmo
 Bump ShellExtension version to 1.11
  ShellExtension: ShellExtension.rc

2007-02-26 Kimmo
 PATCH: [ 1664689 ] French translation
  Submitted by Jean-F Jolin
  Src/Languages/French: MergeFrench.rc

2007-02-25 Jan Hryz
 Czech translation - update
  Src/Languages/Czech/MergeCzech.rc

2007-02-24 Tim
 PATCH: [ 1667564 ] Various Updates in German Translation
  Src/Languages/German: MergeGerman.rc

2007-02-23 Kimmo
 Cleanup WMGotoDlg constructor
  Src: WMGotoDlg.cpp
 CleanUp VSS dialog class
  Src: VssPrompt.cpp

2007-02-22 Kimmo
 BUG: [ 1664731 ] Margin and line numbers not separated
  Src/editlib: ccrystaltextview.cpp
 BUG: [ 1664727 ] Empty file compare looks broken
  Fix revision marks for scratchpads
  Src/editlib: ccrystaltextview.cpp
 BUG: [ 1664832 ] Typo Error in the Registry
  ShellExtension: WinMergeShell.rgs
 BUG: [ 1666559 ] Error on save option (WinMerge 2.7.1.7)
  Src: PropBackups.cpp

2007-02-21 Kimmo
 BUG: [ 1664727 ] Empty file compare looks broken
  Src/editlib: ccrystaltextview.cpp

2007-02-20 WinMerge experimental release 2.7.1.7 (SVN revision 4120)

2007-02-20 Kimmo
 PATCH: [ 1663798 ] Add option and menuitem for file compare selection margin
  Src: Merge.rc MergeEditView.cpp MergeEditView.h OptionsDef.h OptionsInit.cpp
   resource.h
  Src/editlib: ccrystaltextview.cpp
  Src/Languages/*: Merge*.rc
 Remove commented out lines
  Src: DiffWrapper.cpp

2007-02-19 Kimmo
 PATCH: [ 1663012 ] Fix total count for compare progress dialog
  Src: DirCompProgressDlg.cpp DirCompProgressDlg.h
 Bug: [ 1663197 ] s/inproper/improper [in Changes.txt]
  Src: Changes.txt
 PATCH: [ 1642876 ] Open manual for command line help
  Src: Merge.cpp Merge.h Merge.rc resource.h
  Src/Languages/*: Merge*.rc

2007-02-17 Jan Hryz
 Czech translation - update
  Src/Languages/Czech/MergeCzech.rc

2007-02-17 Kimmo
 PATCH: [ 1662002 ] Use two threads for folder compare
  Src: Diffcontext.cpp Diffcontext.h DiffThread.cpp DiffThread.h DirScan.cpp
   DirScan.h

2007-02-14 Tim
 PATCH: [ 1640274 ] Icons for folder compare popup menu
  Src: MainFrm.cpp Merge.dsp Merge.rc resource.h
  Src/res new files: both.bmp left.bmp left_to_browse.bmp left_to_right.bmp
   move_left_to_browse.bmp move_right_to_browse.bmp right.bmp
   right_to_browse.bmp right_to_left.bmp
  Src/Languages/*: Merge*.rc

2007-02-14 Kimmo
 PATCH: [ 1659183 ] Add Vista security attributes to manifest files
  Src/res: WinMerge.exe.manifest WinMergeU.exe.manifest

2007-02-12 Kimmo
 PATCH: [ 1657664 ] Swedish translation update for Backup options
  Submitted by Hans Eriksson
  Src/Languages/Swedish: MergeSwedish.rc

2007-02-11 Kimmo
 Fix compile with VC6 (doesn't have CString::Append() or CString::AppendChar())
  Src: MainFrm.cpp PropBackups.cpp

2007-02-10 Kimmo
 PATCH: [ 1650831 ] Polish translation update for WinMerge 2.6.4
  Submitted by dr_prozac
   Src/Languages/Polish: MergePolish.rc

2007-02-08 Kimmo
 Add accelerator keys to new Backup options dialog
  Src: Merge.rc
  Src/Languages/*: Merge*.rc

2007-02-07 Tim
 PATCH: [ 1582537 ] CSS syntax highlighter
  Src: Merge.dsp
  editlib: ccrystaltextview.cpp ccrystaltextview.h
  editlib new file: css.cpp

2007-02-07 Kimmo
 PATCH: [ 1652696 ] Add more options for backup files
  Src: FileActionScript.cpp MainFrm.cpp MainFrm.h Merge.dsp Merge.rc MergeDoc.cpp
   OptionsDef.h OptionsInit.cpp PropGeneral.cpp PropGeneral.h resource.h
  Src new files: PropBackups.cpp PropBackups.h
  Src/Common: PreferencesDlg.cpp PreferencesDlg.h
  Src/Languages/*: Merge*.rc

2007-02-03 Kimmo
 Remove unused enum definition
  Src: PropCompare.h
 Fix Doxygen comments
  Src: PropCompare.h
 Fix Doxygen comment
  Src: PropCompare.cpp

2007-02-01 Kimmo
 Remove unused parameter from CMainFrame::SyncFileToVCS()
  Src: FileActionScript.cpp MainFrm.cpp MainFrm.h

2007-02-01 WinMerge experimental release 2.7.1.6 (SVN revision 4094)

2007-02-01 Kimmo
 PATCH: [ 1636314 ] Fix limiting to single file compare window (2)
  Fix from Takashi
  Src: MainFrm.cpp
 PATCH: [ 1639493 ] Updated Bulgarian language files
  Submitted by tigertron
  Src/Languages/Bulgarian: MergeBulgarian.rc
  Docs/Users/Languages: Readme-Bulgarian.txt
 PATCH: [ 1650043 ] Convert CDiffWrapper to use CompareOptions
  Src: CompareOptions.cpp CompareOptions.h DiffWrapper.cpp DiffWrapper.h
 Remove commented out include line
  Src: DirScan.cpp

2007-01-31 Kimmo
 PATCH: [ 1648182 ] Separate Compare options from DiffWrapper
  Src: CompareOptions.h DiffWrapper.h DirDoc.cpp DirDoc.h Merge.dsp
  Src new file: CompareOptions.cpp
 PATCH: [ 1646638 ] Catalan translation update
  Submitted by Jordi Vilar
   Src/Languages/Catalan: MergeCatalan.rc

2007-01-28 Jochen
 Merge7z DllBuild 0019 - Unassociate .exe filename extension from NSIS format
  ArchiveSupport/Merge7z: Merge7zCommon.cpp Merge7zCommon.h revision.txt
 Support 7-Zip versions 4.43 & 4.44
  ArchiveSupport/Merge7z new files: Merge7z443.dsp Merge7z444.dsp
  ArchiveSupport/Merge7zInstaller: Files.rc2

2007-01-28 Takashi
 PATCH: [ 1640741 ] patch for BUG:[ 1635100 ] Inefficient word-wrap code
  Src: MergeEditView.cpp MergeEditView.h
  Src/edtlib: ccrystaltextview.cpp ccrystaltextview.h

2007-01-27 Takashi
 PATCH: [ 1644668 ] Fix ANSI regexps(2)
  Src: DiffWrapper.cpp FileFilterHelper.cpp FilterList.cpp

2007-01-25 Kimmo
 PATCH: [ 1644668 ] Fix ANSI regexps
  Src: DiffWrapper.cpp FileFilterHelper.cpp FilterList.cpp FilterList.h
 PATCH: [ 1644820 ] Implement post-compare linefilters for folder compare
  Src: DiffContext.cpp DiffContext.h DiffThread.cpp DiffThread.h DirDoc.cpp
   DirDoc.h FolderCmp.cpp FolderCmp.h

2007-01-25 Tim
 PATCH: [ 1644785 ] 24bit icons for "Window" menu
  Based on icons by Alexander Skinner
  Src/res: cascade.bmp change_pane.bmp close.bmp horizontally.bmp vertically.bmp
 PATCH: [ 1644800 ] 24bit "Goto" icon
  Based on icons by Alexander Skinner
  Src/res: go_to.bmp

2007-01-24 Kimmo
 PATCH: [ 1642809 ] Move compare code out from DiffFileData
  Src: DiffFileData.cpp DiffFileData.h DiffWrapper.cpp DirScan.cpp
   DirViewColItems.cpp Merge.dsp
  Src new files: FolderCmp.cpp FolderCmp.h

2007-01-17 Kimmo
 BUG: [ 1637433 ] Forget selected filter after close
  Src: Merge.cpp OptionsInit.cpp

2007-01-16 Kimmo
 PATCH: [ 1636314 ] Fix limiting to single file compare window
  Src: MainFrm.cpp
 Move options function call out of if() (for easier debugging)
  Src: DirDoc.cpp

2007-01-15 Kimmo
 PATCH: [ 1620076 ] Add Bazaar and Mercurial to SourceControl.flt
  Submitted by René Leonhardt
  Filters: SourceControl.flt
 Add René Leonhardt to Contributors.txt
  Docs/Users: Contributors.txt
 PATCH: [ 1634968 ] Swedish translation update for 2.7.1.5+
  Submitted by Hans Eriksson
  Src/Languages/Swedish: MergeSwedish.rc

2007-01-14 Kimmo
 Update manual URL point to 2.6 version manual in readme.txt
  Docs/Users/ReadMe.txt
  Docs/Users/Languages/ReadMe-*.txt
 PATCH: [ 1633581 ] Restrict expanding env variables in open dialog
  Src: OpenDlg.cpp OpenDlg.h paths.cpp paths.h

2007-01-11 Gal
 PATCH: [ 1633194 ] Add editor tab setting to configuration log
  Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp

2007-01-10 WinMerge experimental release 2.7.1.5 (SVN revision 4030)

2007-01-10 Kimmo
 PATCH: [ 1631796 ] Use PCRE for filemask filtering
  Src: DiffWrapper.cpp DirDoc.h FileFilterHelper.cpp FileFilterHelper.h Merge.cpp
   Merge.dsp Ucs2Utf8.cpp Ucs2Utf8.h
  Src/Common removed files: Regexp.cpp RegExp.h
 PATCH: [ 1631806 ] Fix Filterspath initialization
  Src: MainFrm.cpp MainFrm.h Merge.cpp Merge.h OptionsInit.cpp

2007-01-10 Takashi
 BUG: [ 1631613 ] WinMerge crashes when editing code files
  Src/editlib: ccrystaleditview.cpp

2007-01-10 Takashi
 BUG: [ 1630630 ] Unexpected selection of text after changing pane
  Src: MergeEditView.cpp

2007-01-10 Gal
 PATCH: [ 1597814 ] 'Wrap Lines' + 'Next Diff' Bug (3)
  Src: MergeEditView.cpp MergeEditView.h

2007-01-10 Gal
 PATCH: [ 1631215 ] Remove used files
  Src: Merge.dsp
  Src/Common deleted: listvwex.cpp listvwex.h

2007-01-08 Kimmo
 PATCH: [ 1593810 ] Line-filtering post compare
  Src: DiffWrapper.cpp DiffWrapper.h MainFrm.cpp MainFrm.h Merge.dsp MergeDoc.cpp
  Src new files: FilterList.cpp FilterList.h

2007-01-08 Gal
 BUG: [ 1597939 ] Rename Edits Wrong Field in Folder Compare List
  Src: DirView.cpp

2007-01-07 Kimmo
 BUG: [ 1567749 ] "Unable to compare files" needs short result
  Src: DirViewColItems.cpp Merge.rc resource.h
  Src/Languages/*: Merge*.rc

2007-01-06 Kimmo
 TODO: [ 1489875 ] Mimimum height for location pane visible area indicator
  Src: LocationView.cpp
 TODO: [ 1485038 ] Rename DIFFITEM::IsSideLeft() and IsSideRight()
  Src: CompareStats.cpp DiffContext.cpp DiffFileData.cpp DiffItem.cpp DiffItem.h
   DirActions.cpp DirDoc.cpp DirScan.cpp DirView.cpp DirViewColHandler.cpp
   DirViewColItems.cpp
 PATCH: [ 1567773 ] Change "Only in xxxxxxxxxx" to "Right Only: xxxxxxxxxx"
  Src: DirViewColItems.cpp Merge.rc resource.h
  Src/Languages/*: Merge*.rc
 ConvertFilter() function in FileOrFolderSelect can be a static function
  Src: FileOrFolderSelect.cpp FileOrFolderSelect.h

2007-01-05 Kimmo
 PATCH: [ 1628203 ] Reduce options caching in MergeEditView
  Src: MergeEditView.cpp MergeEditView.h
 PATCH: [ 1628299 ] Use OptionsMgr for archive options
  Src: 7zCommon.cpp
 PATCH: [ 1628263 ] Add debug-menuitem for resetting options
  Src: MainFrm.cpp MainFrm.h Merge.rc resource.h
  Src/Languages/*: Merge*.rc

2007-01-04 Kimmo
 PATCH: [ 1625344 ] Move OptionsMgr from MainFrame to MergeApp
  Src: FileActionScript.cpp MainFrm.cpp MainFrm.h Merge.cpp Merge.h
   OptionsInit.cpp PropRegistry.cpp PropTextColors.cpp SourceControl.cpp
  Src/Common: OptionsMgr.h
 Use Empty() method for CString instead of assigning empty string into it
  Src/Common: varprop.h

2006-12-31 Kimmo
 PATCH: [ 1625022 ] Constify OptionsManager parameters
  Src/Common: OptionsMgr.cpp OptionsMgr.h

2006-12-30 Kimmo
 PATCH: [ 1623772 ] Constify PathContext parameter strings
  Src: PathContext.cpp PathContext.h

2006-12-21 WinMerge experimental release 2.7.1.4 (SVN revision 3991)

2006-12-20 Takashi
 BUG: [ 1603061 ] "Copy Left/Right To .." doesn't work correctly(2)
  Src: FileActionScript.cpp DirActions.cpp

2006-12-20 Kimmo
 BUG: [ 1606583 ] VC6 build is broken
  Backout of patch [ 1603769 ] Send MergeCmdLineInfo between instances
  Src: MainFrm.cpp Merge.cpp MergeCmdLineInfo.cpp MergeCmdLineInfo.h
 Bump ShellExtension version to 1.10
  ShellExtension: ShellExtension.rc
 BUG: [ 1619689 ] Filefilter: ASP.NET Devel
  Filters: ASPNET.flt

2006-12-19 Kimmo
 PATCH: [ 1618358 ] Fix warning about non-standard extension with enum
  Src: MainFrm.cpp
 PATCH: [ 1618364 ] Make GPL URL const string
  Src: MainFrm.cpp

2006-12-18 Kimmo
 PATCH: [ 1617502 ] Cleanup use of enum in MovedLines
  Src: MovedLines.cpp

2006-12-17 Gal
 BUG: [ 1614558 ] Goto line doesn't work when word wrap is enabled
  Src: MergeEditView.cpp

2006-12-14 Kimmo
 BUG: [ 1602219 ] Crappy save of project files
  Src: MainFrm.cpp ProjectFilePathsDlg.cpp

2006-12-13 Kimmo
 PATCH: [ 1614442 ] Swedish translation update for WinMerge 2.6.2
  Submitted by Hans Eriksson
  Src/Languages/Swedish: MergeSwedish.rc

2006-12-13 Gal
 BUG: [ 1584068 ] location pane is inaccurate when word wrap is on (2)
  Src: LocationView.cpp LocationView.h MergeEditView.cpp

2006-12-11 Kimmo
 Fix error in logical condition for checking if item is directory
  Src: FileInfo.cpp
 PATCH: [ 1610998 ] Splash screen does not stop timer
  Src: Splash.cpp
 PATCH: [ 1611060 ] Move constants from Merge.cpp to FileOrFolderSelect.cpp
  Src: FileOrFolderSelect.cpp Merge.cpp

2006-12-10 Gal
 BUG: [ 1611542 ] "Wrap lines" does not work for diff pane
  Src: MergeDiffDetailView.cpp MergeDiffDetailView.h

2006-12-10 Takashi
 PATCH: [ 1447744 ] Match lines inside diff blocks (based on Perry's patch)
  Src new files: MergeDocDiffSync.cpp
  Src: DiffList.h Merge.dsp Merge.rc MergeDoc.cpp MergeDoc.h OptionsDef.h OptionsInit.cpp 
   PropCompare.cpp PropCompare.h resource.h
  Src/Languages/*: Merge*.rc

2006-12-10 Gal
 BUG: [ 1584068 ] location pane is inaccurate when word wrap is on
  Src: LocationView.cpp LocationView.h MergeEditView.cpp MergeEditView.h

2006-12-10 Takashi
 BUG: [ 1604115 ] No copyright info in aboutbox for translations
  Src: AboutDlg.cpp

2006-12-09 Tim
 BUG: [ 1610877 ] wrong shortcut (localizazion IT, italian)
  Src/Languages/Italian: MergeItalian.rc

2006-12-07 Kimmo
 PATCH: [ 1610442 ] Make time getting faster for files
  Src: DirScan.cpp FileInfo.cpp
 PATCH: [ 1610477 ] Fix UniFile for weird filetimes
  Src/Common: UniFile.cpp UniFile.h

2006-12-06 Kimmo
 Add missing include to fix ANSI build target
  Src: FileOrFolderSelect.cpp

2006-12-05 WinMerge experimental release 2.7.1.3 (SVN revision 3919)

2006-12-05 Kimmo
 PATCH: [ 1608846 ] Create a class for moved blocks
  Src: DiffWrapper.cpp DiffWrapper.h Merge.dsp MergeDoc.cpp MergeDoc.h
  Src new files: MovedLines.cpp MovedLines.h
 PATCH: [ 1557295 ] Exclude Source Control files and directories filter
  Submitted by Paul Welter
   Filters new file: SourceControl.flt
 Add Peter Welter and Ivan Masár to contributors
  Docs/Users: Contributors.txt

2006-12-04 Tim
 PATCH: [ 1607193 ] INI Syntax Improvements
  Src/editlib: ini.cpp
 PATCH: [ 1608541 ] Use INI highlighter for VB6 project files
  Src/editlib: ccrystaltextview.cpp

2006-12-04 Kimmo
 PATCH: [ 1607823 ] Remove manifest loading from lang dlls
  Src/Languages/*: Merge*.rc

2006-12-04 Gal
 PATCH: [ 1597814 ] 'Wrap Lines' + 'Next Diff' Bug (2)
  Src: MergeEditView.cpp

2006-12-03 Kimmo
 PATCH: [ 1556688 ] Fix maketstring to check for zero-term by MultiByteToWideCha
  Src: Common/unicoder.cpp
 PATCH: [ 1606496 ] Slovak translation (update)
  Submitted by Ivan Masár
  Src/Languages/Slovak: MergeSlovak.rc

2006-12-02 Kimmo
 Remove commented out code
  Src: Plugins.cpp

2006-12-02 Takashi
 BUG: [ 1589324 ] WinMegee crashes on copy
  Src: FileFilterMgr.cpp

2006-12-02 Takashi
 Fix filefilter regexp uppercasing for trunk
  Src: FileFilterMgr.cpp

2006-12-02 Takashi
 BUG: [ 1603077 ] Doesn't filter the file vc60.idb using "Merge_VC_loose.flt"
  Filters: Merge_VC_loose.flt

2006-12-02 Takashi
 BUG: [ 1603061 ] "Copy Left/Right To .." doesn't work correctly
  Src: DirActions.cpp

2006-12-01 Kimmo
 PATCH: [ 1606496 ] Slovak translation
  Submitted by Ivan Masár
  ShellExtension/Languages: ShellExtensionSlovak.rc
  Src/Languages/Slovak: MergeSlovak.rc

2006-12-01 Gal
 PATCH: [ 1597814 ] 'Wrap Lines' + 'Next Diff' Bug
  Src: MergeEditView.cpp

2006-11-30 Kimmo
 PATCH: [ 1605682 ] Add Syntax Highlight option to config log
  Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
 PATCH: [ 1556685 ] Avoid infinite loop in character loop in crystal c++ parser
  Submitted by Perry
  Src/editlib: asp.cpp basic.cpp batch.cpp cplusplus.cpp csharp.cpp dcl.cpp fortran.cpp
   html.cpp innosetup.cpp is.cpp java.cpp lisp.cpp nsis.cpp. pascal.cpp perl.cpp php.cpp
   python.cpp rexx.cpp rsrc.cpp ruby.cpp sgml.cpp sh.cpp siod.cpp sql.cpp tcl.cpp tex.cpp
   xml.cpp

2006-11-30 Takashi
 BUG: [ 1603230 ] DirView icons isn't shown correctly on NT4.0
  Src/res: equalfile.ico fileskip.ico lfile.ico notequalfile.ico rfile.ico

2006-11-28 Kimmo
 PATCH: [ 1604078 ] Hide skipped items by default
  Src: OptionsInit.cpp

2006-11-28 Gal
 PATCH: [ 1603769 ] Send MergeCmdLineInfo between instances
  Src: MainFrm.cpp Merge.cpp MergeCmdLineInfo.cpp MergeCmdLineInfo.h

2006-11-27 Kimmo
 BUG: [ 1602214 ] Incorrect work with associated files in WinMerge 2.7.1.2
  Src: Merge.cpp
 PATCH: [ 1603196 ] Allow Open-dialog kind of folder selection for project files
  Src: FileOrFolderSelect.cpp FileOrFolderSelect.h OpenDlg.cpp OpenDlg.h

2006-11-27 Gal
 BUG: [ 1603562 ] Location pane's bar outlines
  Src: LocationView.cpp

2006-11-26 Kimmo
 Perry is not active developer
  Docs/Users: Contributors.txt

2006-11-25 Kimmo
 PATCH: [ 1602365 ] Move SelectFile and SelectFolder routines to separate file
  Src: DirActions.cpp DirCmpReportDlg.cpp FileFiltersDlg.cpp MainFrm.cpp Merge.cpp
   Merge.dsp Merge.h MergeDoc.cpp OpenDlg.cpp PatchDlg.cpp ProjectFilePathsDlg.cpp
   PropRegistry.cpp PropVss.cpp
  Src/Common: PreferencesDlg.cpp
  Src new files: FileOrFolderSelect.cpp FileOrFolderSelect.h

2006-11-24 Kimmo
 Fix bunch of doxygen warnings (wrong parameter names etc)
  Src: CmdLineParser.h DiffWrapper.cpp DirDoc.cpp FilepathEdit.cpp files.cpp
   paths.cpp PropEditor.cpp WMGotoDlg.h

2006-11-23 WinMerge experimental release 2.7.1.2 (SVN revision 3844)

2006-11-23 Kimmo
 PATCH: [ 1512881 ] Fix memleak from charsets.c
  Src: charsets.cp charsets.h Merge.cpp
 PATCH: [ 1596285 ] Unresolved external symbol __abs64 with VC7.1
  Submitted by Gal, minor edit by Kimmo
  Src: StdAfx.cpp StdAfx.h
 BUG: [ 1584068 ] location pane is inaccurate when word wrap is on
  Fix submitted by Gal
  Src: LocationView.cpp

2006-11-22 Kimmo
 PATCH: [ 1600714 ] Allow canceling when started from commandline
  Src: Merge.cpp Merge.h

2006-11-21 Kimmo
 PATCH: [ 1600000 ] Fix project file Has*() functions
  Src: ProjectFile.cpp ProjectFile.h

2006-11-20 Kimmo
 BUG: [ 1599631 ] WinMerge 2.7.1.1 ignores left dir in project file
  Src: ProjectFile.cpp

2006-11-17 Gal
 PATCH: [ 1590831 ] Handle minimize argument (Bug 1570351)
  Src: MergeDiffDetailView.cpp
  Src/Common: SplitterWndEx.cpp

2006-11-17 Gal
 PATCH: [ 1598194 ] New command line parser
  Src: MainFrm.cpp Merge.cpp Merge.dsp Merge.h
  Src added files: ClearCaseCmdLineParser.cpp ClearCaseCmdLineParser.h
   CmdLineParser.h MergeCmdLineInfo.cpp MergeCmdLineInfo.h
   WinMergeCmdLineParser.cpp WinMergeCmdLineParser.h
  Src removed files: CmdArgs.cpp CmdArgs.h MergeArgs.cpp

2006-11-17 Gal
 PATCH: Moved white-space trimming to FileFilterHelper class
  Src: FileFilterHelper.cpp

2006-11-16 WinMerge experimental release 2.7.1.1 (SVN revision 3810)

2006-11-15 Kimmo
 PATCH: [ 1596692 ] Change the way modified docs are saved to fix several issues
  Src: MainFrm.cpp MergeDiffDetailView.cpp MergeDoc.cpp MergeDoc.h

2006-11-14 Gal
 BUG: [ 1596285 ] Unresolved external symbol __abs64 with VC7.1
  Src: StdAfx.cpp StdAfx.h

2006-11-13 Gal
 BUG: [ 1594188 ] /x option does not work
  Src: MergeDoc.cpp

2006-11-11 Takashi
 PATCH: [ 1586689 ] True color bookmark icon
  Src/editlib: ccrystaltextview.cpp
  Src/res: mg_icons.bmp

2006-11-09 Gal
 PATCH: [ 1590737 ] BCMenu update to v3.036
  Src: BCMenu.cpp BCMenu.h

2006-11-09 Kimmo
 PATCH: [ 1591532 ] Remove unused XmlDoc class
  Src: Merge.dsp
  Src removed files: XmlDoc.cpp XmlDoc.h

2006-11-07 Kimmo
 Add PCRE 6.7 (with windows build files from ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Contrib/)
  New folder: /Externals/pcre
 PATCH: [ 1591605 ] Add PCRE regexps and convert file filtering to PCRE
  Src: FileFilterMgr.cpp FileFilterMgr.h Merge.dsp Plugins.cpp
  Src new files: Ucs2Utf8.cpp Ucs2Utf8.h

2006-11-06 Takashi
 PATCH: [ 1586705 ] DirView icons (Tim made [not]equalfile.ico)
  Src/res: equalfile.ico fileskip.ico lfile.ico notequalfile.ico rfile.ico

2006-11-06 Kimmo
 PATCH: [ 1590892 ] Handle unicode paths for project files
  Src: ProjectFile.cpp

2006-11-03 Kimmo
 PATCH: [ 1589427 ] Add back read-only handling for project files
  Src: ProjectFile.cpp
 PATCH: [ 1589438 ] Add read-only info to ProjectFile dialog
  Src: MainFrm.cpp
 PATCH: [ 1589563 ] Fix crash with weird filetimes (and cleanup the code)
  Src: DiffFileInfo.cpp DiffFileInfo.h DirScan.cpp DirViewColHandler.cpp
   DirViewColItems.cpp FileInfo.cpp FileInfo.h

2006-11-03 Tim
 PATCH: [ 1589601 ] Add "ReDim" keyword to Visual Basic highlighter
  Src\editlib: basic.cpp

2006-11-01 Kimmo
 Add Expat version 2.0.0 to /Externals/expat (revision: 3749)
  New folder: /Externals/Expat
 Add SCEW version 0.4.0 to /Externals/scew (revision: 3750)
  New folder: /Externals/scew
 PATCH: [ 1587574 ] Convert project files code to use expat+SCEW
  Src: Merge.dsp ProjectFile.cpp ProjectFile.h
  Remove folder: Src/ExpatLib/*
 PATCH: [ 1588212 ] Add manifest file to resource file
  Src: Merge.rc
  Src/Languages/*: Merge*.rc
  Move files from Installer/InnoSetup: WinMerge.exe.manifest WinMergeU.exe.manifest
   to Src/res

2006-10-31 Kimmo
 PATCH: [ 1586869 ] Fix File Select -dialog modality (commit the file I missed in previous commit)
  Src/Common: PreferencesDlg.cpp

2006-10-30 Kimmo
 PATCH: [ 1586869 ] Fix File Select -dialog modality
  Src: DirCmpReportDlg.cpp FileFiltersDlg.cpp MainFrm.cpp Merge.cpp Merge.h
   MergeDoc.cpp PatchDlg.cpp ProjectFilePathsDlg.cpp PropRegistry.cpp PropVss.cpp
 PATCH: [ 1586892 ] Remove unused unknown.ico and code loading it
  Src: DirView.cpp Merge.rc resource.h
  Src/Languages/*: Merge*.rc
  Remove file: Src/Res: unknown.ico

2006-10-26 Gal
 BUG: [ 1418805 ] Menu colors incorrect with non-standard color scheme
  Src/: BCMenu.cpp

2006-10-24 Tim
 PATCH: [ 1584004 ] Delete "Toolbar.bmp"
  Src/res deleted file: Toolbar.bmp

2006-10-20 Kimmo
 Fix compile warnings (some of them 64-bit), remove unused variables and code, fix types
  Src: MainFrm.cpp
 Remove unused function, fix improper pointer usage
  Src: FileFilterHelper.cpp
 Fix casting a pointer type to DWORD (not 64-bit compatible)
  Src: DirView.cpp DirView.h

2006-10-19 Kimmo
 PATCH: [ 1578419 ] Fix creating WinMerge folder to MyFolders always
  Src: MainFrm.cpp MainFrm.h
 Trivial type fixes, coding style fixes and converting comments to doxygen
  Src: StdAfx.cpp StdAfx.h
 Fix misuse of reference parameters (compiler warning)
  Src: DirView.cpp

2006-10-11 Kimmo
 PATCH: [ 1574696 ] Fix problem in saving filefilter to project file
  Src: ProjectFilePathsDlg.cpp

2006-10-10 Takashi
 BUG: [ 1573240 ] Crash in subversion trunk
  Src: MainFrm.cpp MainFrm.h OptionsInit.cpp

2006-10-09 Takashi
 BUG: [ 1570259 ] Bookmarks GUI get reset after save
  Src/editlib: ccrystaltextview.cpp

2006-10-08 Takashi
 BUG: [ 1570173 ] Crash when merging all differences
  Src: MergeDoc.cpp

2006-10-08 Kimmo
 PATCH: [ 1555344 ] Separate active/inactive developers in Contributors.txt
  Docs/Users: Contributors.txt

2006-10-07 Tim
 PATCH: [ 1572359 ] Various Updates in German Translation for WinMerge 2.6
  Src/Languages/German: MergeGerman.rc

2006-10-04 Tim
 PATCH: [ 1570241 ] Various Updates in German Translation for WinMerge 2.6
  Src/Languages/German: MergeGerman.rc

2006-10-02 Gal
 BUG: [ 1566783 ] Crash on Save Project when no file is selected
  Src: MainFrm.cpp

2006-10-01 Kimmo
 PATCH: [ 1567874 ] Change manual URL to point to 2.6 manual
  Src: MainFrm.cpp

2006-09-27 Takashi
 BUG: [ 1564572 ] Leak memory on undoing
  Src: GhostTextBuffer.h
  Src/editlib: ccrystaltextbuffer.h

2006-09-27 Kimmo
 PATCH: [ 1565917 ] Register.bat to register ShellExt for 64-bit Windows
  ShellExtension: Register.bat
 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
  Src/Languages/German: MergeGerman.rc

2006-09-26 Kimmo
 PATCH: [ 1564857 ] FindAnyFile function doesn't compile with VC6
  Src/Common: coretools.cpp

2006-09-25 Kimmo
 PATCH: [ 1563171 ] Catalan translation update (Open-dialog)
  Submitted by Jordi Vilar
   Src/Languages/Catalan: MergeCatalan.rc

2006-09-24 Gal
 BUG: [ 1564283 ] Parameter -x causes files to be closed after merging
  Src: MergeDoc.cpp

2006-09-24 Kimmo
 PATCH: [ 1564280 ] Stack corruption in LanguageSelect
  Src/Common: LanguageSelect.cpp

2006-09-23 Kimmo
 Couple of type fixes to CMoveConstraint
  Src/Common: CMoveConstraint.cpp CMoveConstraint.h
 Fix check for pointer/value by using bit-shift instead of a cast + add trivial typecasts
  Src: GhostTextBuffer.cpp
  Src/editlib: ccrystaltextbuffer.cpp

2006-09-22 Kimmo
 PATCH: [ 1563157 ] Fix coretools.cpp for 64-bit
  Src/Common: coretools.cpp coretools.h
 Fix type in ccrystaltextbuffer.h
  Src/editlib: ccrystaltextbuffer.h
 PATCH: [ 1563171 ] Catalan translation update
  Submitted by Jordi Vilar
   Src/Languages/Catalan: MergeCatalan.rc
 PATCH: [ 1563386 ] Spanish translation update
  Submitted by Jesus M. Delgado 'Mack'
   Src/Languages/Spanish: MergeSpanish.rc
 Quiet warnings from DiffList.cpp
  Src: DiffList.cpp
 Some SPECIAL_ITEM_POS cleanups
  Src: DirActions.cpp DirDoc.cpp DirView.cpp DirView.h
 Fix check for pointer/value by using bit-shift instead of a cast
  Src: GhostTextBuffer.h
  Src/editlib: ccrystaltextbuffer.h

2006-09-21 WinMerge experimental release 2.5.7.1 (SVN revision 3600)

2006-09-21 Kimmo
 PATCH: [ 1558213 ] Tweak text positions in splash screen
  Src: Splash.cpp
 Bump ShellExtension version to 1.9.0 (first 64-bit Windows version)
  ShellExtension: ShellExtension.rc
 Fix 64-bit typecast warning
  Src: GhostTextBuffer.h
 Fix 64-bit pointer truncation in SetWindowLongPtr call (the last I hope)
  Src: ChildFrm.cpp
 Minor tweaks to 64-bit ShellExtension project file
  ShellExtension: ShellExtensionX64.vcproj

2006-09-20 Kimmo
 PATCH: [ 1561788 ] Fix 64-bit CFile constructor usage
  Src/Common: UniFile.cpp
 PATCH: [ 1561796 ] Get/SetWindowLong not supported in 64-bit Windows
  Src: 7zCommon.cpp ChildFrm.cpp
  Src/Common: CSubclass.cpp sizecbar.cpp
 BUG: [ 1561781 ] 64-bit compile errors from 7zCommon.cpp
  Src: 7zCommon.cpp
 PATCH: [ 1561650 ] Separate FilterCommentsManager code from DiffWrapper
  Src: DiffWrapper.cpp DiffWrapper.h Merge.dsp
  Src new files: FilterCommentsManager.cpp FilterCommentsManager.h
 Fix 64-bit compile warning by casting last SendMessage() param to LPARAM
  Src: Merge.cpp
 Fix hex number used instead of INVALID_HANDLE_VALUE
  Src/Common: sinstance.cpp
 Fix 64-bit pointer truncation in SetWindowLongPtr call
  Src: ChildFrm.cpp

2006-09-19 Kimmo
 PATCH: [ 1561001 ] Fix FileActionScript type in running actions
  Src: FileActionScript.cpp
 PATCH: [ 1561008 ] Warning fix for FileActionScript
  Src: DirDoc.cpp
 PATCH: [ 1561080 ] Cleanup for loglevel definition
  Src: DirDoc.cpp DirScan.cpp MainFrm.cpp Plugins.cpp StdAfx.cpp
  Src/Common: LogFile.cpp LogFile.h

2006-09-18 Kimmo
 Cleanup 64-bit ShellExtension projectfile, add a debug target
  ShellExtension: ShellExtensionX64.vcproj

2006-09-16 Kimmo
 PATCH: [ 1559619 ] 64-bit shellextension project file
  ShellExtension new files: ShellExtensionX64.def ShellExtensionX64.vcproj
 Remove unused variable
  Src/editlib: memcombo.cpp
 Remove unused variable
  Src: OpenDlg.cpp
 Fix typecasting warnings
  Src: locality.cpp locality.h MergeDoc.cpp
 Remove unused variable
  Src: FileActionScript.cpp
 Remove unused variable
  Src: FileFiltersDlg.cpp

2006-09-15 Kimmo
 BUG: [ 1558839 ] ShellExtension does not compile as 64-bit
  ShellExtension: WinMergeShell.cpp WinMergeShell.h
 PATCH: [ 1558893 ] Fix incompatible prototype in MessageBoxDialog
  Src/Common: MessageBoxDialog.cpp MessageBoxDialog.h
 PATCH: [ 1558913 ] Fix OnTimer prototypes (64-bit compatibility)
  Src: ChildFrm.cpp ChildFrm.h DircompProgressDlg.cpp DirCompProgressDlg.h DirView.cpp
   Dirview.h MainFrm.cpp MainFrm.h MergeEditview.cpp MergeEditView.h OpenDlg.cpp
   Opendlg.h Splash.cpp Splash.h
  Src/Common: MessageBoxDialog.cpp MessageBoxDialog.h
  Src/editlib: ccrystaltextview2.cpp ccrystaltextview.h 

2006-09-13 Kimmo
 BUG: [ 1547247 ] WinMerge ANSI target does not compile with VS2005
  Fix from Perry
  Src: Common/SuperComboBox.cpp
 PATCH: [ 1558152 ] Italian translation updated
  Submitted by Andrea Decorte
  Src/Languages/Italian: MergeItalian.rc

2006-09-12 Takashi
 PATCH: [ 1555764 ] prevent from shaking in view when pressing F5 down
  Src: GhostTextView.cpp MergeDiffDetailView.cpp

2006-09-12 Kimmo
 PATCH: [ 1556851 ] An Swedish translation update
  Submitted by Hans Eriksson
  Src/Languages/Swedish: MergeSwedish.rc

2006-09-11 WinMerge beta release 2.5.6 (revision 3552)

2006-09-11 Takashi
 Japanese translation - update
  Src/Languages/Japanese: MergeJapanese.rc

2006-09-11 Takashi
 PATCH: [ 1555764 ] prevent from shaking in view when pressing F5 down
  Src: GhostTextView.cpp GhostTextView.h MergeDiffDetailView.cpp MergeDiffDetailView.h

2006-09-11 Takashi
 BUG: [ 1555664 ] fail to copy all to right when enabling moved block detect
  Src: MergeDoc.cpp

2006-09-10 Kimmo
 Czech translation update from Jan Hryz
  Src/Languages/Czech/MergeCzech.rc
 PATCH: [ 1553714 ] Add new commandine switches to help dialog
  Src: Merge.rc MergeArgs.cpp resource.h
  Src/Languages/*: Merge*.rc
 PATCH: [ 1552228 ] Don't use 'export' as variable name
  Src: dllpstub.cpp

2006-09-08 Gal
 RFE: [ 1533506 ] Need commandline switch for single-instance
  Src: Merge.cpp 

2006-09-06 Kimmo
 PATCH: [ 1552901 ] Update VC loose filefilter
  Filters: Merge_VC_loose.flt
 PATCH: [ 1552917 ] Fix GUI for autocompletion option
  Src: Merge.rc
  Src/Languages/*: Merge*.rc

2006-09-05 Kimmo
 PATCH: [ 1552095 ] Fix last compare method not visible in GUI list
  Src: Merge.rc
  Src/Languages/*: Merge*.rc

2006-09-04 Takashi
 PATCH: [ 1551332 ] defer loading plugin
  Src: MainFrm.cpp Merge.rc MergeDoc.cpp MergeEditView.cpp MergeEditView.h
  Src/Languages/*: Merge*.rc

2006-09-04 Kimmo
 BUG: [ 1550427 ] WinMerge 2.5.5.7 don't save "Include subfoders by default"
  Src: PropRegistry.cpp

2006-09-01 Takashi
 Japanese translation - update
  Src/Languages/Japanese: MergeJapanese.rc

2006-08-28 Kimmo
 PATCH: [ 1544777 ] Compare by size
  Forgot to commit Options-dialog changes last time so option for this wasn't visible
  Src: PropCompare.cpp
 BUG: [ 1547262 ] Suspicious bit shift warning
  Fix from Gal
  Src/Common: UniFile.cpp

2006-08-27 Kimmo
 PATCH: [ 1547190 ] Fix VS2005 compile
  Src: MergeArgs.cpp

2006-08-26 Gal
 BUG: [ 1546938 ] New toolbar icons only works for 'disabled' icons
  Src/Languages/*/Merge*.rc

2006-08-25 Kimmo
 Fix compiling WinMerge after moving folders around (Merge7z moved under ArchiveSupport)
  Src: 7zCommon.h

***** Switch to Subversion *****

2006-08-24 WinMerge experimental release 2.5.5.7 (cvs)

2006-08-24 Kimmo
 PATCH: [ 1545411 ] Add some missing options to configlog
  Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
 PATCH: [ 1545165 ] WinMarge Bulgarian Translation
  Submitted by tigertron
  Src/Languages/Bulgarian: MergeBulgarian.rc
  Docs/Users/Languages: Readme-Bulgarian.txt
  Docs/Users/Contributors.txt
  InnoSetup: WinMerge.iss
  ShellExtension: ShellExtension.rc
  ShellExtension/Languages: ShellExtensionBulgarian.rc
 PATCH: [ 1545890 ] Swedish translation for update for WinMerge 2.5.5.7+
  Submitted by Hans Eriksson
  Src/Languages/Swedish: MergeSwedish.rc
 BUG: [ 1545082 ] Crash when comparing .rc files
  Fix submitted by Takashi
  Src/editlib: ccrystaltextview.cpp

2006-08-23 Kimmo
 PATCH: [ 1544905 ] Use stat() to check if file is read-only
  Src: files.cpp files.h
 PATCH: [ 1544777 ] Compare by size
  Src: DiffWrapper.h DirScan.cpp Merge.rc resource.h
  Src/Languages/*: Merge*.rc

2006-08-22 Gal
 PATCH: [ 1541427 ] Using as an external diff tool (RFE 1454623)
  Src: MainFrm.cpp MainFrm.h MergeArgs.cpp MergeDoc.cpp

2006-08-22 Gal
 PATCH: [ 1544784 ] Use as ClearCase external merge tool
  Src: MergeArgs.cpp

2006-08-22 Gal
 BUG: [ 1543783 ] Misbehave margin draw
  Src/editlib: ccrystaltextview.cpp

2006-08-22 Kimmo
 PATCH: [ 1544147 ] Add Install-feature for file filters
  Src: FileFiltersDlg.cpp FileFiltersDlg.h Merge.rc resource.h
  Src/Languages/*: Merge*.rc
 BUG: [ 1534429 ] Message IDS_SUGGEST_IGNOREEOL incorrect
  Src: MergeDoc.cpp

2006-08-20 Kimmo
 PATCH: [ 1424673 ] Widen labels on OpenDialog
  Submitted by Perry
  Src: Merge.rc
  Src/Languages/*: Merge*.rc

2006-08-19 Kimmo
 PATCH: [ 1542201 ] Change default user filter folder to WinMerge/Filters
  Src: MainFrm.cpp
 PATCH: [ 1542829 ] Rename Format-item in File-menu to Convert
  Src: Merge.rc
  Src/Languages/*: Merge*.rc

2006-08-17 Kimmo
 PATCH: [ 1540090 ] Change horizontal scroll synch from relative to absolute
  Src/Common: SplitterWndEx.cpp

2006-08-17 Gal
 PATCH: [ 1541158 ] New high-color toolbar icons
  Src: BCMenu.cpp MainFrm.cpp MainFrm.h Merge.rc resource.h
  Src/res: ToolbarDisabled.bmp ToolbarEnabled.bmp

2006-08-16 Takashi
 PATCH: [ 1539568 ] draw icon at modified line (it was changed to line revision marks)
  Src: GhostTextBuffer.cpp GhostTextBuffer.h MergeDoc.cpp MergeDoc.h
  Src/editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h ccrystaltextview.cpp

2006-08-16 Kimmo
 PATCH: [ 1456356 ] Scrollbars sometimes not initially active
  Src: Merge.cpp

2006-08-15 Kimmo
 PATCH: [ 1540129 ] Fix indentation of diffutils io.c
  Src/diffutils/src: IO.C
 PATCH: [ 1540054 ] Remove Copy All -items from folder compare menu
  Src: Merge.rc
  Src/Languages/*: Merge*.rc
 PATCH: [ 1535558 ] Add GUI for shell extension folder include
  Src: Merge.rc PropRegistry.cpp PropRegistry.h resource.h
  Src/Languages/*: Merge*.rc

2006-08-13 Gal
 BUG: [ 1538340 ] Undo enabled for folder compare.
  Src: DirView.h DirView.cpp

2006-08-13 Takashi
 Japanese translation - update
  Src/Languages/Japanese: MergeJapanese.rc

2006-08-13 Tim
 PATCH: [ 1539204 ] Remove '#' from '#differences' column
  Src: Merge.rc
  Src/Languages/*: Merge*.rc

2006-08-11 Kimmo
 PATCH: [ 1538264 ] Split DiffFileData class to own files
  Src: DiffWrapper.cpp DiffWrapper.h DirScan.cpp DirViewColItems.cpp Merge.dsp
  Src new files: DiffFileData.cpp DiffFileData.h
 PATCH: [ 1537261 ] Swedish 2.5.5.6+ translation update
  Submitted by Hans Eriksson
  Src/Languages/Swedish: MergeSwedish.rc

2006-08-10 Kimmo
 Fix doxygen comment for ImportOptions()
  Src/Common: OptionsMgr.cpp

2006-08-10 Gal
 PATCH: Code cleanup. Removed commented out code.
  Src/Common: SuperComboBox.cpp

 BUG: [ 1531965 ] Crash undoing empty (?) event
  Src/editlib: ccrystaleditview.cpp

2006-08-09 Jan Hryz
 Czech translation - update
  Src/Languages/Czech/MergeCzech.rc

2006-08-09 Jochen
 PATCH: [ 1310951 ] Option to copy DirCmpReport to clipboard
  Src: DirCmpReport.cpp DirCmpReport.h DirCmpReportDlg.cpp DirCmpReportDlg.h
   Merge.rc resource.h
  Src/Languages/*: Merge*.rc

2006-08-08 Jan Hryz
 Czech translation - update
  Src/Languages/Czech/MergeCzech.rc

2006-08-08 WinMerge experimental release 2.5.5.6 (cvs)

2006-08-08 Kimmo
 BUG: [ 1535835 ] Import settings from the file
  Src/Common: PreferencesDlg.cpp PreferencesDlg.h
 PATCH: [ 1536240 ] Fix diff count numbers for real
  Src: DiffWrapper.cpp DirScan.cpp
  Src/diffutils/src: analyze.c UTIL.c

2006-08-07 Jochen
 PATCH: [ 1514487 ] Merge7z DllBuild 0018
  Merge7z: Merge7z311.cpp Merge7z409.cpp Merge7zCommon.cpp Merge7zCommon.h
   revision.txt Merge7z*.dsp
  Merge7z new files: Merge7z433.dsp Merge7z434.dsp Merge7z435.dsp Merge7z436.dsp
   Merge7z437.dsp Merge7z438.dsp Merge7z439.dsp Merge7z440.dsp Merge7z442.dsp
  Merge7zInstaller: Installer.cpp Installer.rc Files.rc2
 Change recommended version of 7-Zip to 4.42
  Src: 7zCommon.cpp

2006-08-07 Kimmo
 PATCH: [ 1535175 ] Shell ext: Add flag for subfolder inclusion
  ShellExtension: WinMergeShell.cpp WinMergeShell.h
 Bump ShellExtension version to 1.8.0
  ShellExtension: ShellExtension.rc

2006-08-06 Takashi
 BUG: [ 1533292 ] crash when specifying nonexistent project file.
  Src: XmlDoc.cpp

2006-08-05 Kimmo
 PATCH: [ 1534770 ] Add "don't wrap end of file" option for Find
  Src: Merge.rc resource.h
  Src/editlib: ccrystaleditview.cpp ccrystaltextview.cpp ccrystaltextview.h
   ceditreplacedlg.cpp cfindtextdlg.cpp cfindtextdlg.h
  Src/Languages/*: Merge*.rc
 BUG: [ 1534461 ] WinMerge 2.5.5.5 ingoring subfolders option in project files
  Src: MainFrm.cpp Merge.cpp

2006-08-03 Jan Hryz
 Czech translation - update
  Src/Languages/Czech/MergeCzech.rc

2006-08-03 WinMerge experimental release 2.5.5.5 (cvs)

2006-08-03 Kimmo
 PATCH: [ 1533457 ] Add Refresh Selected -item to Folder compare main menu
  Src: DirActions.cpp DirView.cpp DirView.h Merge.rc
  Src/Languages/*: Merge*.rc

2006-08-02 Kimmo
 PATCH: [ 1532743 ] Improve difference count columns in folder compare
  Src: DiffItem.h DiffItemList.cpp DirScan.cpp DirVierwColItems.cpp
   Merge.rc resource.h
  Src/Languages/*: Merge*.rc
 PATCH: [ 1529864 ] Stop using Application Data folders as filefilter folders
  Src: FileFilterHelper.cpp FileFilterHelper.h

2006-08-01 Kimmo
 PATCH: [ 1531845 ] Fix memory leak after find
  Src/editlib: ccrystaltextview.cpp
 PATCH: [ 1531957 ] Fix imagelist memory leak in editor
  Src/editlib: ccrystaltextview.cpp
 PATCH: [ 1430331 ] New Debug menu
  Submitted by Perry, modified by me
  Src: MainFrm.cpp MainFrm.h Merge.rc resource.h
  Src/Languages/*: Merge*.rc
 PATCH: [ 1531319 ] Tidy Folder compare progress dialog
  Src: Merge.rc
  Src/Languages/*: Merge*.rc

2006-07-31 Kimmo
 PATCH: [ 1531293 ] Fix wrong cursor position after find
  Src: ccrystaltextview.cpp ccrystaltextview.h cfindtextdlg.cpp
 PATCH: [ 1406051 ] code cleanup for ScriptFileActions
  Submitted by Perry
  Src: DirActions.cpp FileActionScript.cpp FileActionScript.h
 PATCH: [ 1530459 ] Add some doxygen comments for ViewableWhitespace
  Src: ViewableWhitespace.cpp ViewableWhitespace.h

2006-07-30 Takashi
 BUG: [ 1528322 ] Crash when using F6 / Bugg for file differences
  Src: MergeEditView.cpp

2006-07-30 Kimmo
 PATCH: [ 1530352 ] Start flashing WinMerge window when folder compare is ready
  Src: DirView.cpp MainFrm.cpp MainFrm.h
 PATCH: [ 1529995 ] Swedish translation update for 2.5.5.4+
  Submitted by Hans Eriksson
  Src/Languages/Swedish: MergeSwedish.rc
 PATCH: [ 1530655 ] Catalan translation update
  Submitted by Jordi Vilar
  Src/Languages/Catalan: MergeCatalan.rc

2006-07-29 Takashi
 PATCH: [ 1529915 ] Refresh menu on DirView does not work correctly
  Src: DirActions.cpp DirScan.cpp

2006-07-28 Kimmo
 PATCH: [ 1529599 ] Cleanup DiffWrapper
  Src: DiffWrapper.cpp DiffWrapper.h MergeDoc.cpp PatchTool.cpp
 PATCH: [ 1529965 ] Add error messages for managing file filters
  Src: FileFiltersDlg.cpp FileFiltersDlg.h Merge.rc resource.h
  Src/Languages/*: Merge*.rc

2006-07-27 Takashi
 PATCH: [ 1527843 ] prevent dialog from flickering
  Src: DirCompProgressDlg.cpp DirView.cpp
  Src/Common: CMoveConstraint.cpp

2006-07-27 Kimmo
 PATCH: [ 1528841 ] Cleanup ByteComparator
  Src: ByteComparator.cpp ByteComparator.h FileTextStats.h
 PATCH: [ 1528987 ] Use 64-bit variable as file position in Bytecompare
  Src: ByteComparator.cpp ByteComparator.h DiffWrapper.cpp FileTextStats.h
 PATCH: [ 1529053 ] Success message for loading/saving project file
  Src: Merge.rc ProjectFilePathsDlg.cpp resource.h
  Src/Languages/*: Merge*.rc

2006-07-26 Kimmo
 PATCH: [ 1528444 ] Cleanup for AppSerialize
  Src: AppSerialize.cpp AppSerialize.h 

2006-07-25 Kimmo
 PATCH: [ 1527771 ] Remove Apply syntax highlight to other side option
  Src: Merge.rc MergeDoc.cpp OptionsDef.h OptionsInit.cpp PropEditor.cpp
   PropEditor.h resource.h
  Src/Languages/*: Merge*.rc

2006-07-24 Tim
 PATCH: [ 1527947 ] Various Updates in German Translation for WinMerge 2.5
  Src/Languages/German: MergeGerman.rc

2006-07-24 Kimmo
 PATCH: [ 1526918 ] Detect which side file is binary file
  Src: DiffItem.h DiffWrapper.cpp DiffWrapper.h
  Src/diffutils/src: DIFF.H IO.c analyze.c

2006-07-20 WinMerge experimental release 2.5.5.4 (cvs)

2006-07-20 Kimmo
 PATCH: [ 1525013 ] Add description for ASP.NET filter
  Filters: ASPNET.flt
 PATCH: [ 1525417 ] Move MovedBlock code to own file
  Src: DiffWrapper.cpp Merge.dsp
  Src new file: MovedBlocks.cpp
 PATCH: [ 1525531 ] Allow comparing project files from Open-dialog
  Src: OpenDlg.cpp
 Config log files are .txt files (not .log)
  Src: MainFrm.cpp
 BUG: [ 1495212 ] Wrong cursor position after selecting wordwrapped line
  Fix from Takashi
  Src/editlib: ccrystaltextview.cpp

2006-07-19 Jan Hryz
 Czech translation - update
  Src/Languages/Czech/MergeCzech.rc

2006-07-19 Kimmo
 BUG: [ 1198248 ] version copyright symbol needs review
  Src/Languages/*: MergeChineseSimplified.rc MergeChineseTraditional.rc MergeJapanese.rc
   MergeKorean.rc

2006-07-19 Takashi
 BUG: [ 1525451 ] ASSERT in CCrystalTextView::DrawSingleLine()
  Src/editlib: ccrystaltextview.cpp
 BUG: [ 1525466 ] ASSERT in CCrystalTextView::AssertValidTextPos()
  Src/editlib: ccrystaltextview2.cpp

2006-07-19 Kimmo
 BUG: [ 1524832 ] Bogus include's
  Src: DirColsDlg.cpp PropEditor.cpp
 PATCH: [ 1522037 ] Add read-only option for paths in Project file
  Src: MainFrm.cpp Merge.cpp Merge.rc OpenDlg.cpp OpenDlg.h ProjectFile.cpp
   ProjectFile.h ProjectFilePathsDlg.cpp ProjectFilePathsDlg.h resource.h
  Src/Languages/*: Merge*.rc
 PATCH: [ 1525025 ] Copy/paste error in MainFrm.cpp
  Src: MainFrm.cpp
 PATCH: [ 1525198 ] Version info misses copyright (c) char
  Src: Merge.rc

2006-07-18 Kimmo
 Fix and improve comment for folder compare columns table
  DirViewColItems.cpp
 BUG: [ 1524251 ] File filter does not work on 2.5.5.3
  Original fix from Takashi, modified by Kimmo
  Src: FileFilterMgr.cpp

2006-07-16 Kimmo
 PATCH: [ 1517057 ] Option to Ignore Multiline Comments (bugfix for single-line comments)
  Submitted by David Maisonave
  Src: DiffWrapper.cpp

2006-07-15 Kimmo
 Strip SuperComboBox strings before saving
  Src/Common: SuperComboBox.cpp

2006-07-14 WinMerge experimental release 2.5.5.3 (cvs)

2006-07-14 Kimmo
 BUG: [ 1521555 ] Location Pane - can't see current location because of color
  Use 3d-color instead of scrollbar color in location pane
  Src: LocationView.cpp
 PATCH: [ 1521696 ] Improve Text color option dialog
  Src: Merge.rc PropTextColors.cpp PropTextColors.h
  Src/Languages/*: Merge*.rc

2006-07-13 Kimmo
 PATCH: [ 1521352 ] Cleanup char constants for CRegExep
  Src/Common: RegExp.cpp
 PATCH: [ 1521392 ] Fix reading last line in linefilter file
  Src: FileFilterMgr.cpp
 BUG: [ 1498511 ] Conflict accelerator key in IDR_DIRVIEWMENU
  Src: Merge.rc
  Src/Languages/*: Merge*.rc
 PATCH: [ 1517057 ] Option to Ignore Multiline Comments (bugfix + rename to filtering)
  Submitted by David Maisonave
  Src: DiffWrapper.cpp DiffWrapper.h DirDoc.cpp MainFrm.cpp Merge.rc MergeDoc.cpp
   OptionsDef.h OptionsInit.cpp PropCompare.cpp Propcompare.h resource.h
  Src/Languages/*: Merge*.rc
 PATCH: [ 1517057 ] Option to Ignore Multiline Comments (bugfix)
  Submitted by David Maisonave
  Src: DiffWrapper.cpp

2006-07-12 Kimmo
 PATCH: [ 1517057 ] Option to Ignore Multiline Comments
  Submitted by David Maisonave
  Src: DiffWrapper.cpp DiffWrapper.h DirDoc.cpp MainFrm.cpp Merge.rc MergeDoc.cpp
   OptionsDef.h OptionsInit.cpp PatchTool.cpp PropCompare.cpp Propcompare.h
   resource.h
  Src/Languages/*: Merge*.rc
 Add Ed_K and David Maisonave to Contributors
  Docs/Users: Contributors.txt
 Document UniMemFile::ReadString() function parameters and return values
  Src/Common: UniFile.cpp

2006-07-09 Kimmo
 Quiet warning about deprecated function for VS2003 and later
  Merge.cpp

2006-07-08 Kimmo
 PATCH: [ 1517362 ] Ensure diff is visible in location view
  Src: LocationView.cpp
 Fix codinstyle in LocationView.cpp (messed up by patch #1517362)
  Src: LocationView.cpp
 Make VS2005 build less noisy by defining _CRT_SECURE_NO_DEPRECATE for it
  Src: StdAfx.h

2006-07-04 Kimmo
 PATCH: [ 1516626 ] Enable double-click in column customization dialog
  Src: DirColsDlg.cpp DirColsDlg.h
 PATCH: [ 1514435 ] Optimize versioninfo reading
  Src: AboutDlg.cpp ConfigLog.cpp Splash.cpp
  Src/Common: version.cpp version.h

2006-07-04 Takashi
 BUG: [ 1303166 ] crash or freeze on closing all window
  Src: MainFrm.cpp

2006-07-03 WinMerge experimental release 2.5.5.2 (cvs)

2006-07-03 Kimmo
 PATCH: [ 1515380 ] Page Up/Down Anomaly
  Submitted by Ed_K
  Src/editlib: ccrystaltextview2.cpp
 PATCH: [ 1515966 ] Use View-IDs in MergeDoc.cpp
  Src: MergeDoc.cpp MergeDoc.h
 PATCH: [ 1516016 ] Fix poor handling of invalid tab size in Options-dialog
  Src: Merge.rc PropEditor.cpp PropEditor.h resource.h
  Src/Languages/*: Merge*.rc
 Fix comment in DiffList.cpp
  Src: DiffList.cpp

2006-07-02 Kimmo
 PATCH: [ 1515669 ] Add selected difference marker for locationview
  Src: LocationView.cpp LocationView.h

2006-07-01 Kimmo
 PATCH: [ 1514459 ] Cleanup for LocationView code (use view ID)
  Src: LocationView.cpp LocationView.h StdAfx.h
 PATCH: [ 1514580 ] Tweak location view bar look
  Src: LocationView.cpp

2006-06-30 Tim
 PATCH: [ 1514645 ] Various Updates in German Translation for WinMerge 2.5
  Src/Languages/German: MergeGerman.rc

2006-06-29 Kimmo
 PATCH: [ 1513618 ] Fix Merge.rc translation id
  Src: Merge.rc

2006-06-27 Kimmo
 PATCH: [ 1512708 ] Fix compile with VS2005
  Also additional cleanup for CCrystalTextView::GetMarginWidth()
  Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
 PATCH: [ 1512726 ] Fix combining filesize from two values
  Src: DiffFileInfo.cpp DirScan.cpp FileInfo.cpp FileInfo.h
 PATCH: [ 1512775 ] Fix encoding columns showing -1
  Src: FileTextEncoding.cpp FileTextEncoding.h

2006-06-26 Kimmo
 PATCH: [ 1510596 ] Updated Readme-Swedish.txt
  Submitted by Hans Eriksson
  Docs/Users/Languages: ReadMe-Swedish.txt
 PATCH: [ 1510600 ] Updated MergeSwedish.rc file for 2.5.5.1+
  Submitted by Hans Eriksson
  Src/Languages/Swedish: MergeSwedish.rc
 BUG: [ 1483242 ] Needless resource file 'MergeSwedish_LastTranslation.rc'?
  Remove unneeded file
  Removed: Src/Languages/Swedish: MergeSwedish_LastTranslation.rc
 BUG: [ 1489034 ] Src/Common/LanguageSelect.rc unused?
  Remove unneeded file
  Removed: Src/Common/LanguageSelect.rc
 Remove unused files (language.h & language.c)
  Removed: Src: language.c language.h

2006-06-21 WinMerge experimental release 2.5.5.1 (cvs)

2006-06-21 Kimmo
 PATCH: [ 1509505 ] Manual: new compare method and options export/import
  Docs/Users/Manual: Configuration.xml
 Bump manual revision to 1.2.4
  Docs/Users/Manual: WinMerge_help.xml
 Bump ShellExtension version to 1.7.2
  ShellExtension: ShellExtension.rc

2006-06-20 Kimmo
 BUG: [ 1505763 ] Crash after closing file compare window
  Src: MergeEditView.cpp
 PATCH: [ 1508865 ] Improve error handling for loading file filters
  Src: FileFilterHelper.cpp FileFilterMgr.cpp FileFilterMgr.h FileFiltersDlg.cpp
   FileFiltersDlg.h
 PATCH: [ 1508898 ] Show binary as one of EOL types
  Src: DirViewColItems.cpp Merge.rc resource.h
  Src/Languages/*: Merge*.rc
 PATCH: [ 1506184 ] Polish translation update for WM 2.5.4.0
  Submitted by dr_prozac
   Src/Languages/Polish: MergePolish.rc
 PATCH:[ 1509495 ] Polish translation for ShellExtension
  Submitted by dr_prozac
  ShellExtension/Languages: ShellExtensionPolish.rc

2006-06-19 Gal
 RFE: [ 1499245 ] Ruby Syntax Highlighting
  Src: Merge.dsp
  Src/editlib: ccrystaltextview.cpp ccrystaltextview.h ruby.cpp

2006-06-13 Gal
 BUG: [ 1494776 ] Can't rename files if '|' seperator exists
  Src: DirView.h DirView.cpp DirActions.cpp

2006-06-12 Kimmo
 BUG: [ 1486434 ] Copy Pathnames for right-only dir copies parent dir only
  Src: DirView.cpp

2006-05-31 Kimmo
 PATCH: [ 1483544 ] New compare method: by date and size
  Src: DiffWrapper.h DirScan.cpp Merge.rc PropCompare.cpp resource.h
  Src/Languages/*: Merge*.rc

2006-05-31 Takashi
 BUG: [ 1496066 ] WinMerge crashed with those files
  Src: GhostTextView.cpp GhostTextView.h

2006-05-31 Kimmo
 BUG: [ 1494610 ] Wrong selection in ccrystalview2.cpp
  Src/editlib: ccrystaltextview2.cpp
 PATCH: [ 1497817 ] Cleanup CCrystalTextView::GetLineBySubLine
  Src/editlib: ccrystaltextview.cpp ccrystaltextview.h

2006-05-30 Kimmo
 PATCH: [ 1497154 ] Fix memory leak in wordwrap code
  Src/editlib: ccrystaltextview.cpp
 PATCH: [ 1497068 ] Initialize cursorpositions in GhostTextView
  Src: GhostTextView.h
 PATCH: [ 1497147 ] Cleanup CCrystalTextView::ClientToText
  Src/editlib: ccrystaltextview.cpp

2006-05-25 Kimmo
 BUG: [ 1494610 ] Wrong selection in ccrystalview2.cpp
  Analyzed by Mallato
  Src/editlib: ccrystaltextview2.cpp

2006-05-25 Tim
 PATCH: [ 1495017 ] Translate 'Textcolors' options to German
  Src/Languages/German: MergeGerman.rc

2006-05-25 Kimmo
 PATCH: [ 1494627 ] Skip processing empty paths in Open dialog
  Src: OpenDlg.cpp
 Doxygen comments and trivial cleanups for paths.cpp & paths.h
  Src: paths.cpp paths.h

2006-05-24 Kimmo
 PATCH: [ 1493742 ] Limit vertical scrolling to last line of files
  Src/editlib: ccrystaltextview.cpp
 PATCH: [ 1493868 ] Add bookmark by double-clicking selection frame
  Src/editlib: ccrystaltextview.cpp ccrystaltextview.h ccrystaltextview2.cpp
 PATCH: [ 1492458 ] Swedish translation update for 2.5.4.0
  Submitted by Hans Eriksson
  Src/Languages/Swedish: MergeSwedish.rc
 Add some const keywords and fix comments, remove unused function.
  Src: DiffList.cpp DiffList.h
 BUG: [ 1488797 ] ASSERT in CMergeEditView::OnPrevdiff
  Fix from Mallato
  Src: MergeEditView.cpp

2006-05-23 Tim
 PATCH: [ 1493713 ] Translate 'Bookmarks' feature to German
  Src/Languages/German: MergeGerman.rc

2006-05-23 Kimmo
 PATCH: [ 1491436 ] Spanish Readme.txt
  Submitted by Jesus M. Delgado 'Mack'
  Docs/Users/Languages new file: ReadMe-Spanish.txt
  InnoSetup: WinMerge.iss

2006-05-22 Gal
 PATCH: [ 1491993 ] Ability to rename files (RFE 1380228)
  Src: DirActions.cpp DirView.cpp DirView.h Merge.rc resource.h 

2006-05-22 Kimmo
 PATCH: [ 1491212 ] Czech Translation
  Submitted by: Jan Hryz
  Src/Languages/Czech/MergeCzec.rc
 PATCH: [ 1492025 ] Catalan translation update
  Submitted by Jordi Vilar
  Src/Languages/Catalan: MergeCatalan.rc
 PATCH: [ 1491424 ] Spanish translation for v2.5.3.7
  Submitted by Jesus M. Delgado 'Mack'
  Languages/Spanish: MergeSpanish.rc

2006-05-18 WinMerge beta release 2.5.4

2006-05-18 Kimmo
 PATCH: [ 1490540 ] Manual: add picture and explanation about our version tree
  Docs/Users/Manual: Introduction.xml
  Docs/Users/Manual/build: build_html.bat build_htmlhelp.bat
  Docs/Users/Manual/Art new files: WinMerge_versions.gif WinMerge_versions.odg

2006-05-17 Kimmo
 PATCH: [ 1489824 ] Better default folder for user filters
  Src: MainFrm.cpp
 BUG: [ 1445975 ] BuildDll.bat exit is not good
  Src/Languages: BuildDll.bat
 PATCH: [ 1488387 ] Russian translation update for 2.4.6
  Submitted by Dmitriy Aleshkowskiy
  Src/Languages/Russian: MergeRussian.rc

2006-05-15 Kimmo
 PATCH: [ 1489133 ] Manual: document new filter location(s)
  Docs/Users/Manual: Filters.xml
 PATCH: [ 1489091 ] Enable Help/Index
  Src: MainFrm.cpp
 PATCH: [ 1489098 ] Doesn't open Help TOC correctly
  Src: MainFrm.cpp
 BUG: [ 1487856 ] Long delay if many language dlls
  Src: Merge.cpp
  Src/Common: LanguageSelect.cpp LanguageSelect.h
 BUG: [ 1487854 ] ASSERT in CCrystalTextView::OnPrint
  Fix suggested by Mallato
  Src/editlib: ccrystaltextview.cpp
 Graphic Design: Alexander Skinner
  Docs/Users: Contributors.txt
 BUG: [ 1478057 ] Memory leak when cancelling print preview
  Fix suggested by Mallato
  Src/editlib: ccrystaltextview.cpp 

2006-05-15 Gal
 PATCH: [ 1488637 ] PHP/ASP Syntax Highlighting Fix (Bug 1441643)
  Src/editlib: asp.cpp php.cpp   

2006-05-14 Kimmo
 PATCH: [ 1485861 ] Czech translation - update
  Submitted by: Jan Hryz
  Src/Languages/Czech/MergeCzec.rc
 PATCH: [ 1483553 ] Swedish MergeSwedish.rc 1.304 2.5.3.7 update
  Submitted by Hans Eriksson
  Src/Languages/Swedish: MergeSwedish.rc
 PATCH: [ 1484004 ] Manual: new Open-dialog screenshot and small fixes
  Docs/Users/Manual: Quick_start.xml
  Docs/Users/Manual/screenshots: OpenDlg1.gif
 PATCH: [ 1484013 ] Manual: small changes to Introduction chapter
  Docs/Users/Manual: Introduction.xml
 PATCH: [ 1484092 ] Manual: preliminary whats new list for 2.5
  Docs/Users/Manual: Whatsnew_2_1.xml
 PATCH: [ 1484101 ] Manual: Add index
  Docs/Users/Manual: WinMerge_help.xml
 PATCH: [ 1484142 ] Manual: update some options descriptions
  Docs/Users/Manual: Configuration.xml

2006-05-08 Kimmo
 PATCH: [ 1483344 ] Fix creating private file filters
  Src: FileFiltersDlg.cpp
 PATCH: [ 1483486 ] Add commenting for CLogFile
  Src/Common: LogFile.cpp LogFile.h

2006-05-07 Kimmo
 PATCH: [ 1483107 ] Remove dublicated code from folder compare progress dlg
  Src: DirCompProgressDlg.cpp DirCompProgressDlg.h
 PATCH: [ 1483088 ] Add GUI for user to select filter folder
  Src: FileFilterHelper.cpp FileFilterHelper.h FileFiltersDlg.cpp MainFrm.cpp Merge.rc
   OptionsDef.h OptionsInit.cpp paths.cpp paths.h PropRegistry.cpp PropRegistry.h
   resource.h
  Src/Languages/*: Merge*.rc

2006-05-06 Tim
 BUG: [ 1481053 ] Options: Text Colors should use 3D-Look too
  Src: Merge.rc
  Src/Languages/*: Merge*.rc
 PATCH: [ 1482352 ] Icons for 'Bookmarks' feature
  Src: MainFrm.cpp Merge.rc resource.h
  Src/res new files: clear_bookmarks.bmp next_bookmark.bmp prev_bookmark.bmp
   toggle_bookmark.bmp
  Src/Languages/*: Merge*.rc

2006-05-06 Kimmo
 BUG: [ 1363364 ] DisplayBinaryFiles extension list wrong
  Also bump version of plugin to 1.0.3.0
  Plugins/src_VCPP/DisplayBinaryFiles: ChangeLog.txt DisplayBinaryFiles.rc WinMergeScript.cpp
  Plugins/dlls: DisplayBinaryFiles.dll

2006-05-06 Tim
 PATCH: [ 1482411 ] Add line before 'Open Project' in main menu
  Src: Merge.rc
  Src/Languages/*: Merge*.rc

2006-05-06 Kimmo
 PATCH: [ 1482688 ] sgml.cpp contains "lt" twice
  Src/editlib: sgml.cpp
 PATCH: [ 1482694 ] xml.cpp contains "lt" twice
  Src/editlib: xml.cpp
 PATCH: [ 1482765 ] Fix closing folder compare progress dialog
  Src: DirCompProgressDlg.cpp DirCompProgressDlg.h DirView.cpp

2006-05-04 WinMerge experimental release 2.5.3.7 (cvs)

2005-05-04 Kimmo
 PATCH: [ 1481213 ] Fix foldercompare short-size suffixes and localize them
  Src: DirViewColItems.cpp Merge.rc resource.h
  Src/Languages/*: Merge*.rc
 PATCH: [ 1481391 ] Make LocationView update from MergeView more safe
  Src: LocationView.cpp MergeEditView.cpp MergeEditView.h
 BUG: [ 1456356 ] Scrollbars sometimes not initially active
  Another possible fix..
  Src/editlib: ccrystaltextview.cpp

2006-05-03 Kimmo
 PATCH: [ 1480652 ] Small fix for XML syntax highlight
  Src/editlib: xml.cpp

2006-05-02 Kimmo
 PATCH: [ 1479007 ] WinMerge Icon Set Revision 3
  Submitted by Alexander Skinner
  Src/res: Merge.ico
 BUG: [ 1474782 ] Crash when comparing SQL with with binary data
  Fix suggested by anonymous submitter
  Src/editlib: asp.cpp basic.cpp batch.cpp cplusplus.cpp csharp.cpp dcl.cpp
   fortran.cpp html.cpp ini.cpp innosetup.cpp is.cpp java.cpp lisp.cpp nsis.cpp
   pascal.cpp perl.cpp php.cpp python.cpp rexx.cpp rsrc.cpp sgml.cpp sh.cpp
   siod.cpp sql.cpp tcl.cpp tex.cpp xml.cpp
 PATCH: [ 1471835 ] Fix setting filename in folder-compare report dialog
  Fix bug in the original patch
  Src: DirCmpReportDlg.cpp

2006-05-01 Takashi
 PATCH: [ 1475649 ] Enable selection margin and line numbers
  Src/res new file: mg_icons.bmp

2006-04-29 Takashi
 PATCH: [ 1475649 ] Enable selection margin and line numbers
  Src: GhostTextView.cpp GhostTextView.h Merge.rc MergeEditView.cpp
   MergeEditView.h OptionsDef.h OptionsInit.cpp resource.h
  Src/editlib: ccrystaltextview.cpp ccrystaltextview.h editcmd.h
  Src/Languages/*: Merge*.rc

2006-04-28 Tim
 PATCH: [ 1477957 ] Fix 'Help' button position in German translation
  Src/Languages/German: MergeGerman.rc

2006-04-26 Kimmo
 PATCH: [ 1476279 ] Cleanup CDiffContext::UpdateInfoFromDiskHalf() and its usage
  Src: Diffcontext.cpp DiffContext.h DirScan.cpp DirViewColItems.cpp

2006-04-25 Kimmo
 PATCH: [ 1475776 ] Optimize dirview UI updates
  Src: DirActions.cpp DirDoc.cpp DirDoc.h
 PATCH: [ 1472622 ] Czech translation - update (more dialog fixes)
  Submitted by: Jan Hryz
  Src/Languages/*: Merge*.rc

2006-04-24 Kimmo
 PATCH: [ 1474884 ] Fix XmlDoc not releasing file handles
  Src: XmlDoc.cpp XmlDoc.h
 PATCH: [ 1475092 ] Add DocumentsLoaded() to MergeDiffDetailView
  Src: MergeDiffDetailView.cpp MergeDiffDetailView.h MergeDoc.cpp
 Gal Hammer is now a developer
  Docs/Users: Contributors.txt

2006-04-23 Kimmo
 PATCH: [ 1473902 ] Add dialog for editing and saving project files
  Src: DirDoc.cpp DirDoc.h MainFrm.cpp MainFrm.h Merge.dsp Merge.rc MergeDoc.cpp
   MergeDoc.h resource.h
  Src new files: ProjectFilePathsDlg.cpp ProjectFilePathsDlg.h
  Src/Languages/*: Merge*.rc
 PATCH: [ 1472622 ] Czech translation - update
  Submitted by: Jan Hryz
  Src/Languages/Czech/MergeCzec.rc
 PATCH: [ 1472622 ] Czech translation - update (apply dialog fixes)
  Submitted by: Jan Hryz
  Src/Languages/*: Merge*.rc

2006-04-22 Kimmo
 PATCH: [ 1473635 ] Move some results update code to DirDoc
  Src: DirActions.cpp DirDoc.cpp DirDoc.h
 PATCH: [ 1468691 ] Center folder compare status dialog to mainframe
  Adding line I missed previous time applying the patch (2006-04-12)
  Src: DirView.cpp

2006-04-20 Kimmo
 TODO: [ 1469363 ] Need image for aborted status in folder compare
  Icon from Tim
  Src: DirView.cpp Merge.rc resource.h
  Src/res new file: aborted.ico
  Src/Languages/*: Merge*.rc
 PATCH: [ 1400653 ] Write project files using objects
  Submitted by Perry
  Src: Merge.dsp ProjectFile.cpp ProjectFile.h
  Src new files: XmlDoc.cpp XmlDoc.h

2006-04-18 Kimmo
 PATCH: [ 1471835 ] Fix setting filename in folder-compare report dialog
  Src: DirCmpReportDlg.cpp DirCmpReportDlg.h

2006-04-18 Takashi
 PATCH: [ 1445996 ] Fix wrong PgDown scrolling after mousescroll(2)
  Src/editlib: ccrystaltextview2.cpp

2006-04-12 WinMerge experimental release 2.5.3.6 (cvs)

2006-04-12 Kimmo
 PATCH: [ 1468691 ] Center folder compare status dialog to mainframe
  Src: DirView.cpp
 PaTCH: [ 1468783 ] Fix disabled scrollbars after loading files
  Src: MergeDoc.cpp MergeEditView.cpp MergeEditView.h

2006-04-11 Kimmo
 PATCH: [ 1467872 ] Fix diff navigation for first-line of diff
  Src: MergeEditView.cpp
 PATCH: [ 1443719 ] xml output reports
  Submitted by Perry, modified by me
  Src: DirCmpReport.cpp DirCmpReport.h DirCmpReportDlg.cpp DirCmpReportDlg.h
   DirView.cpp DirView.h Merge.dsp Merge.rc resource.h
  Src new file: DirReportTypes.h

2006-04-10 Kimmo
 PATCH: [ 1467305 ] Beep when long compare is ready
  Src: DirView.cpp DirView.h

2006-04-09 Tim
 BUG: [ 1461375 ] Forgot old patch #981526 for sgml.cpp, sh.cpp and tcl.cpp?
  Src\editlib: sgml.cpp sh.cpp tcl.cpp

2006-04-09 Kimmo
 BUG: [ 1383719 ] ShellExtension resources opening in IDE fails
  Fix from Sdottaka
  ShellExtension/Languages/*.rc
 BUG: [ 1465893 ] Compile error with VC6 (SuperComboBox.cpp)
  Fix from Gal Hammer
  Src/Common: SuperComboBox.cpp

2006-04-06 Kimmo
 BUG: [ 1463137 ] MergeArgs.h is empty file?
  Remove MergeArgs.h
  Src: Merge.dsp
  Src removed file: MergeArgs.h

2006-04-05 Tim
 PATCH: [ 1461896 ] Syntax highlighting of HTML for ASP not complete
  Src\editlib: asp.cpp

2006-04-05 Kimmo
 PATCH: [ 1460749 ] Print relative paths to patch files
  Src: DiffWrapper.cpp DiffWrapper.h MainFrm.cpp MergeDoc.cpp PatchDlg.h
   PatchTool.cpp PatchTool.h
 BUG: [ 1461328 ] Commandline handling overwrites flags?
  Fix from Gal Hammer
  Src: MergeArgs.cpp
 BUG: [ 1460236 ] Splash localization is broken
  Src: Merge.rc resource.h Splash.cpp
  Src/Languages/*: Merge*.rc
 PATCH: [ 1445426 ] Clear PrivateBuild flag in SetResourceVersions.wsf
  Submitted by Perry
  Src: SetResourceVersions.wsf

2006-04-05 Takashi
 BUG: [ 1458714 ] [Replace All] doesn't work
  Src/editlib: ceditreplacedlg.cpp

2006-03-27 Kimmo
 PATCH: [ 1459284 ] Update of MergeSwedish.rc for WinMerge 2.5.3.5+
  Submitted by Hans Eriksson
  Src/Languages/Swedish: MergeSwedish.rc
 PATCH: [ 1458852 ] Fix UI for multiple file patches
  Src: PatchDlg.cpp PatchDlg.h
 PATCH: [ 1441718 ] Auto Complete on files or folders selection
  Submitted by Gal Hammer
  Src/Common: SuperComboBox.cpp SupercompoBox.h
  Src: Merge.rc OpenDlg.cpp OptionsDef.h OptionsInit.cpp PropGeneral.cpp
   PropGeneral.h resource.h
  Src/Languages/*: Merge*.rc

2006-03-26 Kimmo
 PATCH: [ 1458066 ] Use / as path delimiter in patch files
  Src: DiffWrapper.cpp
 PATCH: [ 1406944 ] Compute text statistics in QuickCompare
  Src new file: FileTextStats.h

2006-03-24 Kimmo
 PATCH: [ 1457203 ] Create patch from multiple files in folder compare
  Src: DirView.cpp DirView.h MainFrm.cpp

2006-03-24 Tim
 PATCH: [ 1457306 ] Revamped Visual Basic syntax highlighter
  Src\editlib: basic.cpp

2006-03-24 Kimmo
 BUG: [ 1455656 ] GPL text still contains 'How to Apply These Terms...'
  Docs/Users: GPL.rtf

2006-03-22 WinMerge experimental release 2.5.3.5 (cvs)

2006-03-22 Kimmo
 PATCH: [ 1455706 ] Catalan translation update
  Submitted by Jordi Vilar
  Src/Languages/Catalan: MergeCatalan.rc
 PATCH: [ 1406944 ] Compute text statistics in QuickCompare
  Src: ByteComparator.cpp ByteComparator.h DiffFileInfo.cpp DiffFileInfo.h DiffWrapper.cpp
   Diffwrapper.h DirScan.cpp DirViewColItems.cpp Merge.dsp Merge.rc resource.h
  Src/diffutils/src: DIFF.H IO.C
  Src/Languages/*: Merge*.rc

2006-03-21 Tim
 PATCH: [ 1455663 ] Add new keywords to Visual Basic highlighter
  Src\editlib: basic.cpp

2006-03-21 Kimmo
 PATCH: [ 1448599 ] WinMerge Program Icon Set
  Submitted by Alexander Skinner
  Src/res: Merge.ico
 PATCH: [ 1452288 ] Add ASP.NET filefilter
  By By Jon Galloway and Josh Blair
  Filters new file: ASPNET.flt
 PATCH: [ 1454720 ] Fix resizable dialogs missing captionbar close button
  Src: Merge.rc
  Src/Languages/*: Merge*.rc
 PATCH: [ 1455430 ] New Splash Screen Revision 2
  Submitted by Alexander Skinner
  Src/res: splash.jpg
 Remove obsolete splashscreen image (for old splashscreen)
  Src/res removed file: WinMergesplash.psd

2006-03-19 Kimmo
 PATCH: [ 1449892 ] Add compare method to configlog
  Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
 PATCH: [ 1453252 ] Fix closing filecompare after error
  Src: MainFrm.cpp MergeDoc.cpp

2006-03-17 Tim
 PATCH: [ 1449571 ] Add '*.pm' and '*.plx' to Perl highlighter
  Src/editlib: ccrystaleditview.cpp

2006-03-14 Perry
 BUG: [ 1449947 ] Looks like diffutils bug for mac-style
 BUG: [ 1449949 ] crash comparing two simple test mac files
 Fix looping which missed mac case
  diffutils\src: IO.C

2006-03-15 Kimmo
 PATCH: [ 1449868 ] Fix difference counts
  Src: DiffWrapper.cpp

2006-03-14 Kimmo
 PATCH: [ 1449038 ] Add Help-button to Open-dialog
  Src: FileFiltersDlg.cpp FileFiltersDlg.h Merge.rc OpenDlg.cpp OpenDlg.h
   PropLineFilter.cpp PropLineFilter.h
  Src/Common: PreferencesDlg.cpp
  Src/Languages/*: Merge*.rc

2006-03-13 Kimmo
 PATCH: [ 1447927 ] Add Help Search to menu, open correct manual location
  Src: DirView.cpp DirView.h MainFrm.cpp MainFrm.h Merge.rc MergeEditView.cpp
   MergeEditView.h resource.h
  Src/Languages/*: Merge*.rc

2006-03-11 Kimmo
 PATCH: [ 1447506 ] Don't include splash bitmap to lang files
  Src/Languages/*: Merge*.rc
 Remove Catalan localized splash screen
  Src/Languages/Catalan/res removed files: splash1.bmp WinMergeSplash.psd
 BUG: [ 1447851 ] Not enough space for version info in new splash screen
  Src: Splash.cpp
 PaTCH: [ 1445377 ] WinMerge Logos (72 DPI)
  Submitted by Alexander Skinner
  Add new folder Docs/Logos
  New Docs/Logos files: readme.txt WinMerge_logo_24bit.png
   WinMerge_logo_shadow_24bit.png WinMerge_logo_shadow_trans.tif
   WinMerge_logo_trans.gif
 Change Splashscreen text to according to Dean's wish
  Src: Splash.cpp
 Add Alexander Skinner to contributors list
  Docs/Users: Contributors.txt
 PATCH: [ 1447348 ] Build language files to Build directory
  Src/Languages: BuildDll.bat
 PATCH: [ 1447806 ] Use JPEG splashscreen
  Src: Merge.dsp Merge.rc resource.h Splash.cpp Splash.h
  Src/Common new files: Picture.cpp Picture.h
  Src/res new file: splash.jpg
  Src/res deleted file: splash1.bmp
  Src/Languages/*: Merge*.rc

2006-03-11 Takashi
 BUG:  [ 1441389 ] Comparing root directory - mysterious
  Src: DiffWrapper.cpp

2006-03-11 Perry
 PATCH:  [ 1447539 ] Add explanatory comment to CCrystalTextBuffer::MoveLine
  Src/editlib: ccrystaltextbuffer.cpp
 PATCH: [ 1447547 ] Add more comments to CMergeDoc::PrimeTextBuffers
  Src: MergeDoc.cpp

2006-03-10 Kimmo
 Remove unneeded splash image (Splash2.bmp) as noted in Patch item #1441392
  Src/res removed file: Splash2.bmp

2006-03-10 Perry
 PATCH: [ 1445434 ] SyntaxColors scrambling reg values
  Src: SyntaxColors.cpp
  
2006-03-10 WinMerge experimental release 2.5.3.4 (cvs)

2006-03-09 Kimmo
 PATCH: [ 1445996 ] Fix wrong PgDown scrolling after mousescroll
  Src/editlib: ccrystaltextview2.cpp
 BUG: [ 1446648 ] cvs trunk doesn't compile
  Src: Splash.cpp

2006-03-08 Kimmo
 PATCH: [ 1441392 ] New Splash Screen
  Submitted by Alexander Skinner
  Src: Splash.cpp
  Src/res: splash1.bmp

2006-03-08 Perry
 Update MakeResDll readme with current information (MSVC.Net 2003 works
  now), and better explanation of how to pick a specific version.
  MakeResDll: readme.txt
 PATCH: [ 1443391 ] Update MakeResDll for VS.NET 2005
  MakeResDll: MakeResDll.cpp MakeResDll.dsp MakeResDll.rc
   StdAfx.cpp StdAfx.h readme.txt resource.h
  New MakeResDll: Merge.ico VsVersionDlg.cpp VsVersionDlg.h
 Bump MakeResDll version from 1.0.6.0 to 1.0.7.0.
  MakeResDll: MakeResDll.rc
 PATCH: [ 1442844 ] Make GetFileExt easier to understand
  Src: MergeDoc.cpp MergeDoc.h
 Add two minor comments to PropRegistry.
  PropRegistry.cpp

2006-03-06 WinMerge experimental release 2.5.3.3 (cvs)

2006-03-06 Perry
 BUG: [ 1444211 ] bug in current SelectFile
  Src: Merge.cpp
 PATCH: [ 1443841 ] Add header comment to Src/Changes.txt
  Src: Changes.txt

2006-03-06 Tim
 BUG: [ 1442866 ] German RC format error
  Src/Languages/German: MergeGerman.rc
 BUG: [ 1442865 ] languages lack generate patch & report bitmaps
  Src/Languages/*: Merge*.rc

2006-03-06 Perry
 PATCH: [ 1435361 ] Fix and cleanup project file code
  Src: DiffContext.cpp DiffContext.h DirDoc.cpp MainFrm.cpp
   Merge.cpp Merge.h Merge.rc MergeArgs.cpp ProjectFile.cpp
   resource.h
  Src/Languages/*: Merge*.rc

2006-03-04 Perry
 PATCH: [ 1396506 ] customizable text colors
 Fix compilation (MSVC.NET 2003 correctly gave error that MSVC6 ignored)
  Src: PreferencesDlg.cpp
 PATCH: [ 1442125 ] Improvements for MakeResDll parsing
  MakeResDll: MakeResDll.cpp MakeResDll.rc resource.h
  Src\Common: RegKey.cpp RegKey.h
 PATCH: [ 1442134 ] MakeResDll: check that RC file exists
  MakeResDll: MakeResDll.cpp MakeResDll.rc resource.h
 PATCH: [ 1442238 ] Fix MakeResDll to work with VS.NET 2003
  MakeResDll: MakeResDll.cpp MakeResDll.rc
 PATCH: [ 1442791 ] Update MakeResDll project
 Add Changes.txt to project.
 Change version copyright from "2003" to "2003-2006"
  MakeResDll: MakeResDll.dsp MakeResDll.rc

2006-03-04 Perry (MSVC6)
 Current selftests status: Failure count: 0 (of 756)

2006-03-04 Perry
 PATCH: [ 1396506 ] customizable text colors
  Src: MainFrm.cpp MainFrm.h Merge.dsp Merge.rc MergeDoc.cpp
   OptionsDef.h OptionsInit.cpp PropArchive.cpp PropArchive.h
   PropCodepage.cpp PropCodepage.h PropColors.cpp PropColors.h
   PropCompare.cpp PropCompare.h PropEditor.h PropGeneral.h
   PropRegistry.h PropSyntaxColors.cpp PropSyntaxColors.h
   PropVss.h SyntaxColors.cpp SyntaxColors.h resource.h
  Src\Common: PreferencesDlg.cpp PreferencesDlg.h
  Src/Languages/*: Merge*.rc
 PATCH: [ 1439335 ] Reset cwd in Merge.cpp SelectFile
  Src: Merge.cpp OpenDlg.cpp
 PATCH: [ 1442082 ] Fix MakeDirs to not error if directory exists
  Src\Common: coretools.cpp
 PATCH: [ 1396506 ] customizable text colors
 Add missing files
  Src: new PropTextColors.cpp PropTextColors.h

2006-03-03 Perry
 PATCH: [ 1442699 ] New Changes.txt file for MakeResDll
 Add Changes.txt change log (this file).
  MakeResDll: new Changes.txt
 PATCH: [ 1424636 ] New BuildOneLanguage.vbs & fix MakeResDll exit
  MakeResDll: MakeResDll.cpp StdAfx.h
  Src\Languages: BuildDll.bat BuildOneLanguage.vbs

2006-03-03 Kimmo
 PATCH: [ 1441387 ] Improve File Encoding dialog
  Src: Merge.rc
  Src/Languages/*: Merge*.rc
 PATCH: [ 1442107 ] Move About-dialog code to separate files from Merge.cpp
  Src: Merge.cpp Merge.dsp
  Src new files: AboutDlg.cpp AboutDlg.h

2006-03-02 Tim
 PATCH: [ 1437770 ] Icons for 'Generate Patch' and 'Generate Report'
  Src: MainFrm.cpp Merge.rc resource.h
  Src/res new files: patch.bmp report.bmp

2006-03-02 Kimmo
 PATCH: [ 1441124 ] Improve filter test dialog
  Src: Merge.rc
  Src/Languages/*: Merge*.rc

2006-03-01 Kimmo
 PATCH: [ 1424535 ] Czech Translation, Submitted by Jan Hryz
  Improve unpacker selection dialog and new filter location selection dialog
  Src: Merge.rc
  Src/Languages/*: Merge*.rc

2006-03-01 Tim
 PATCH: [ 1438233 ] New icons for 'notequalfile', 'lfile' and 'rfile'
  Src/res: lfile.ico notequalfile.ico rfile.ico

2006-03-01 Kimmo
 PATCH: [ 1436855 ] Typo in lang files (change pactch to patch)
  Src/Languages/*: Merge*.rc
 BUG: [ 1440774 ] Test button for file filters enabled for no filter
  Fix submitted by Gal Hammer
  Src: FileFiltersDlg.cpp
 PATCH: [ 1395847 ] Integration with Rational ClearCase
  Submitted by Gal Hammer
  Src: MainFrm.cpp MainFrm.h Merge.h MergeArgs.cpp MergeDoc.cpp MergeDoc.h
  Src/Common: coretools.cpp coretools.h

2006-02-28 Perry
 BUG: [ 1439360 ] Native languages sometimes suppressed in Unicode Build
 Add note to CLanguageSelect::GetNativeLanguageNameString
  explaining why codepage check is done even for Unicode build.
 Src/Common: LanguageSelect.cpp

2006-02-27 Perry
 BUG: [ 1439350 ] Russian language name in LanguageSelect?
  Src/Common: LanguageSelect.cpp

2006-02-26 Perry
 PATCH: [ 1435470 ] Remove CTextFile
  Src: Merge.dsp
  Deleted Src\Common: textfile.cpp textfile.h
 PATCH: [ 1439229 ] Fix CMergeDoc::SanityCheckD not to dereference illegal lines
 BUG: [ 1438390 ] Crash when editting the attached files
  Src: MergeDoc.cpp
 PATCH: [ 1434007 ] Move source control code out of MainFrm.cpp
  Src: MainFrm.cpp MainFrm.h Merge.dsp
  New Src: SourceControl.cpp

2006-02-24 Kimmo
 PATCH: [ 1437758 ] Improve diff selection when selected diff not visible
  Src: MergeEditView.cpp MergeEditView.h
 PATCH: [ 1431607 ] Fix worddiff highlight error
  Submitted by Perry
  Src: stringdiffs.cpp

2006-02-24 Tim
 PATCH: [ 1437677 ] Various Updates in German Translation for WinMerge 2.5
  Src/Languages/German: MergeGerman.rc

2006-02-22 Kimmo
 PATCH: [ 1435431 ] Fix GenerateReport lines
  Submitted by Perry
  Src: DirCmpReport.cpp
 PATCH: [ 1395721 ] VS.NET 2003 warning of SEH bug
  Src: Merge.dsp
 PATCH: [ 1428686 ] Catalan translation update
  By Jordi Vilar
  Src/Languages/Catalan: MergeCatalan.rc
 PATCH: [ 1430321 ] Swedish translation update and feedback on WinMerge 2.5.3.2
  By Hans Eriksson
  Src\Languages\Swedish: MergeSwedish.rc
 PATCH: [ 1434270 ] Fix difference counts
  Submitted by Perry
  Src: DiffWrapper.cpp

2006-02-21 Kimmo
 PATCH: [ 1435384 ] Add context menu for diff pane
  Src: Merge.rc MergeDiffDetailView.cpp MergeDiffDetailView.h resource.h
  Src/Languages/*: Merge*.rc
 PATCH: [ 1433125 ] Trap errors from filesystem during actions
  Src: FileActionScript.cpp

2006-02-21 Perry
 PATCH: [ 1405603 ] New Test dialog for file filters
  (Forgot to do all the language resources)
 and misc RC file fixes (eg, many fixes in editor proppage)
 New: Src/Languages: WinMerge_Resource_Discrepencies.txt

2006-02-20 Perry
 PATCH: [ 1405603 ] New Test dialog for file filters
  Src: FileFilterMgr.cpp FileFilterMgr.h FileFiltersDlg.cpp
   FileFiltersDlg.h Merge.dsp Merge.rc resource.h
  Src new: TestFilterDlg.cpp TestFilterDlg.h
 PATCH: [ 1433312 ] Add cvs tags to source files
  Src: ByteComparator.cpp SharedFilterDlg.cpp StdAfx.cpp
   TestFilterDlg.cpp TestFilterDlg.h ViewableWhitespace.cpp
  Src/Common: SortHeaderCtrl.cpp SortHeaderCtrl.h UniFile.cpp
   UniFile.h textfile.cpp textfile.h unicoder.cpp unicoder.h
   varprop.cpp varprop.h version.cpp version.h

2006-02-20 Kimmo
 PATCH: [ 1178743 ] Disable lang menu if no additional langs installed
  Src: Merge.cpp Merge.h
  Src/Common: LanguageSelect.cpp LanguageSelect.h

2006-02-19 Perry
 PATCH: [ 1433931 ] Add comment before isBin checks in DirView
  Src: DirView.cpp
 PATCH: [ 1424153 ] Remove VTS_PUI1 from lwdisp.h
 BUG: [ 1395475 ] VTS_UI1 & VTSPUI1 macro redefinition warnings (VS.NET)
  Src\Common: lwdisp.h
 PATCH: [ 1433927 ] Fix external editor default and messages
 BUG: [ 1433774 ] default editor is blank
  Src: MainFrm.cpp Merge.cpp Merge.rc OptionsInit.cpp resource.h
  Src/Languages/*: Merge*.rc
 PATCH: [ 1433353 ] Fix menu resources
  Src: MainFrm.cpp Merge.cpp Merge.rc resource.h
  Src/Languages/*: Merge*.rc

2006-02-19 Christian
 PATCH: [ 1429125 ] Return number of diffs instead of true/false
  Src: MergeDoc.cpp

2006-02-17 Perry
 BUG: [ 1395483 ] Signed/unsigned mismatch warning from LocationView.cpp
  Src: LocationView.cpp

2006-02-16 Perry
 BUG: [ 1395475 ] VTS_UI1 & VTSPUI1 macro redefinition warnings (VS.NET)
  Fixed VTS_PUI1 (which previous patch for this bug missed).
  Src\Common: lwdisp.h

2006-02-16 Kimmo
 PATCH: [ 1424535 ] Czech Translation, Submitted by Jan Hryz
  Improve folder compare columns dialog (idea for new arrows from Catalan translation)
  Src: Merge.rc
  Src/Languages/*: Merge*.rc

2006-02-16 Perry
 PATCH: [ 1431771 ] Alter CheckTranslations.vbs to YesNoCancel
  Src/Languages: CheckTranslations.vbs
 PATCH: [ 1419582 ] Polish translation update for latest v2.5
  Contributed by dr_prozac
  Src/Languages/Polish: MergePolish.rc
 PATCH: [ 1431846 ] Update Czech Translation
  Contributed by Jan Hryz
  Src/Languages/Czech: MergeCzech.rc
  ShellExtension/Languages/ShellExtensionCzech.rc
 A few control adjustments matching Czech to English (many left)
  Src/Languages/Czech: MergeCzech.rc

2006-02-15 Perry
 PATCH: [ 1431636 ] IgnoreEOL broken in cvs trunk
  Src: PropCompare.cpp

2006-02-15 Kimmo
 PATCH: [ 1431768 ] Write paths to patch files as given
  Src: DiffWrapper.cpp

2006-02-14 Perry
 PATCH: [ 1431205 ] Fix ViewWhitespace \r\n bug
 BUG: [ 1431012 ] View line differences adds additional EOL char
  Src/editlib: ccrystaltextview.cpp
 PATCH: [ 1431197 ] Fix off-by-one highlight error
  Src: stringdiffs.cpp
 Fix button movement on LanguageSelect (broken by PATCH#1423461).
 Also add cvs id comment at top, and doxygen file label.
  Src\Common: LanguageSelect.cpp

2006-02-14 Kimmo
 BUG: [ 1197976 ] GeneratePatch file browse not intialized correctly
  Fix submitted by Perry
  Src: PatchDlg.cpp

2006-02-14 Perry
 PATCH: [ 1431131 ] Fix VS.NET 2003 compilation
  Src\Common: coretools.cpp scbarg.cpp scbarg.h sizecbar.cpp sizecbar.h
 Shrink Swedish dialog IDD_PROPPAGE_LARGE to same size as English
  (all controls already were the same size anyway)
  Src\Languages\Swedish: MergeSwedish.rc

2006-02-13 Perry
 PATCH: [ 1212124 ] File encoding GUI
  Src: DiffContext.cpp DiffFileInfo.cpp DiffFileInfo.h DiffItem.cpp
   DiffItem.h DiffThread.cpp DiffWrapper.cpp DirActions.cpp
   DirScan.cpp DirView.cpp DirView.h DirViewColItems.cpp FileLocation.h
   MainFrm.cpp Merge.dsp Merge.rc MergeDoc.cpp MergeDoc.h OpenDlg.cpp
   codepage_detect.cpp codepage_detect.h resource.h
  NEW Src: FileTextEncoding.cpp FileTextEncoding.h IntToIntMap.h
   LoadSaveCodepageDlg.cpp LoadSaveCodepageDlg.h MergeDocEncoding.cpp
   dlgutil.cpp dlgutil.h

2006-02-12 Perry
 Adjust whitespace to match English translation
 Also update Russian options/editor controls to match English
  Src\Languages\Russian: MergeRussian.rc
  Src\Languages\Slovak: MergeSlovak.rc
  Src\Languages\Swedish: MergeSwedish.rc
  Src\Languages\Turkish: MergeTurkish.rc
 PATCH: [ 1424681 ] Widen labels on unpacker dialog
  Src: Merge.rc
  Src\Languages: Merge*.rc

2006-02-11 Perry
 PATCH: [ 1429517 ] Fix coretools.cpp compilation (for MakeResDll)
  Src/Common: coretools.cpp
 PATCH: [ 1427838 ] code cleanup bottom of merge.cpp
  Src: Merge.cpp
 Synchronizing Turkish translation to English where feasible.
  Src/Languages/Turkish: MergeTurkish.rc
 Update Swedish Options/Editor to current English layout
  Src/Languages/Swedish: MergeSwedish.rc

2006-02-10 Perry
 PATCH: [ 1428800 ] Fix ListCopy/AllLeft
 BUG: [ 1428791 ] All Left gave me a bunch of msgboxes
  Src: MergeDoc.cpp MergeDoc.h
 PATCH: [ 1428726 ] Fix for compilation under VS2005
  Src: BCMenu.cpp DiffWrapper.cpp DirCmpReport.cpp
   DirColsDlg.cpp DirViewColHandler.cpp GhostTextBuffer.cpp
   MergeArgs.cpp MergeDiffDetailView.cpp MergeDoc.cpp
   MergeEditView.cpp
  Src\Common: LanguageSelect.cpp SuperComboBox.cpp UniFile.cpp
   coretools.cpp multiformatText.cpp scbarg.cpp scbarg.h
   sizecbar.cpp sizecbar.h
  Src\editlib: asp.cpp basic.cpp batch.cpp ccrystaltextview.cpp
   cplusplus.cpp crystaltextblock.cpp csharp.cpp dcl.cpp
   fortran.cpp html.cpp ini.cpp innosetup.cpp is.cpp java.cpp
   lisp.cpp nsis.cpp pascal.cpp perl.cpp php.cpp python.cpp
   rexx.cpp rsrc.cpp sgml.cpp sh.cpp siod.cpp sql.cpp
   tcl.cpp tex.cpp xml.cpp
 PATCH: [ 1427563 ] Give descriptive name to CMergeDoc::SaveHelper
  Src: MainFrm.cpp MergeDiffDetailView.cpp MergeDoc.cpp
   MergeDoc.h MergeEditView.cpp
 PATCH: [ 1426593 ] Remove empty CMergeDoc::SetDiffViewMode()
  Submitted by Kimmo
  Src: MergeDoc.cpp MergeDoc.h

2006-02-09 WinMerge experimental release 2.5.3.2 (cvs)

2006-02-09 Kimmo
 PATCH: [ 1427851 ] Small cleanup for FileFilterMgr::AddFilter()
  Src: FileFilterMgr.cpp
 Add Jan Hryz as Czech translator and contributor
  Docs/Users: Contributors.txt

2006-02-08 Perry
 PATCH: [ 1427845 ] Double-click fails to open, no message
  Src: MergeDoc.cpp
 BUG: [ 1427956 ] Differences count in Folder Compare wrong?
  Make sure to set diff count to 0 just before counting them
  Src: DiffWrapper.cpp

2006-02-08 Kimmo
 PATCH: [ 1426499 ] Move Save Projectfile to File menu
  Src: DirDoc.cpp DirDoc.h MainFrm.cpp MainFrm.h Merge.rc MergeDoc.cpp
   MergeDoc.h OpenDlg.cpp OpenDlg.h resource.h
  Src/Languages/*: Merge*.rc

2006-02-08 Perry
 PATCH: [ 1424884 ] Fix UniStdioFile encoding of TCHAR
 BUG: [ 1402379 ] A character display and save error with encoding of unicode
  Src\Common: UniFile.cpp unicoder.cpp unicoder.h

2006-02-08 Perry
 Current selftests status: Failure count: 0 (of 756)

2006-02-08 Perry
 PATCH: [ 1426552 ] Add selftests between platform versions
  Src: Changes.txt ConfigLog.cpp DiffWrapper.cpp DiffWrapper.h
   DirDoc.cpp MainFrm.cpp MergeArgs.cpp MergeDoc.cpp
   MergeDocLineDiffs.cpp OptionsDef.h OptionsInit.cpp PatchTool.cpp
   PropCompare.cpp PropCompare.h 
  Src\editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h

2006-02-08 Perry
 Current selftests status: Failure count: 0 (of 588)

2006-02-08 Perry
 PATCH: [ 1424867 ] Fix common prefix code for \r\n
  Src\diffutils\src: IO.C
 PATCH: [ 1426793 ] Fix diffutils that counts lines in suffix
  Src\diffutils\src: IO.C

2006-02-07 Perry
 Current selftests status: Failure count: 0 (of 588)

2006-02-07 Kimmo
 PATCH: [ 1424535 ] Czech Translation, Submitted by Jan Hryz
  Fix dir compare report dialog layout
  Src: Merge.rc
  Src/Languages/*: Merge*.rc

2006-02-06 Perry
 Synchronizing Slovak translation to English where feasible.
  Src/Languages/Slovak: MergeSlovak.rc
 Synchronizing Swedish translation to English where feasible.
  Src/Languages/Swedish: MergeSwedish.rc
 PATCH: [ 1392413 ] Track lossy encodings & warn user
  Src: FileFilterMgr.cpp Merge.rc MergeDoc.cpp files.h resource.h
  Src/Common: UniFile.cpp UniFile.h unicoder.cpp
 PATCH: [ 1392413 ] Track lossy encodings & warn user
  Src/Languages/*: Merge*.rc

2006-02-05 Perry
 PATCH: [ 1414201 ] Cleanup Merge Line Flags
  Src: LocationView.cpp Merge.dsp MergeDiffDetailView.cpp MergeDoc.cpp
   MergeEditView.cpp MergeEditView.h 
  NEW Src: MergeLineFlags.h

2006-02-05 Kimmo
 PATCH: [ 1424264 ] Use 'Item' instead of file in View-menu
  Src: Merge.rc
  Src/Language: */Merge*.rc

2006-02-05 Perry
 Fix Italian Edit/Options/Editor line selection controls.
  Src/Languages/Italian/MergeItalian.rc
 PATCH: [ 1414904 ] updated italian translation for winmerge 2.5.3.1
  Submitted by A. Decorte
  New updates for selecting current diffs and wrap lines.
  Src/Languages/Italian/MergeItalian.rc

2006-02-05 Kimmo
 BUG: [ 1422257 ] Wrong text in tooltip
  (Dutch translation had wrong shortcut keys in tooltip)
  Src/Languages/Dutch/MergeDutch.rc
 PATCH: [ 1424535 ] Czech Translation
  Submitted by Jan Hryz
  Src/Languages/Czech/MergeCzech.rc

2006-02-04 Perry
 PATCH: [ 1424142 ] Wrap two lwdisp macros in ifndef
  Src/Common: lwdisp.h
 Undo PATCH: [ 1424142 ] Wrap two lwdisp macros in ifndef
  Src/Common: lwdisp.h
 BUG: [ 1383052 ] warning C4005: 'COMPILE_MULTIMON_STUBS' : macro redefinition
  (Wrap multimon def with ifndef
  Src: MainFrm.cpp
 PATCH: [ 1423461 ] Rearrange language select dialog
  Revise patch applied earlier: put Ok on left and Cancel on right.
  (Also fix French dialog which was left out before.)
  Src: Merge.rc
  Src/Languages: */Merge*.rc
 PATCH: [ 1421199 ] Fix plugin menu for when location or diff detail view active
  Src: ChildFrm.cpp ChildFrm.h MainFrm.cpp MainFrm.h MergeDoc.cpp MergeDoc.h
 PATCH: [ 1414904 ] updated italian translation for winmerge 2.5.3.1
  Submitted by A. Decorte
  Src/Languages/Italian: MergeItalian.rc
 PATCH: [ 1423907 ] Fix diffutils hashing of \r
  Src/diffutils: IO.C UTIL.C
 Current selftests status: Failure count: 0 (of 480)
 Created branch "R_diffutils_branch"
  
2006-02-03 Perry
 PATCH: [ 1409651 ] fix diffutils handling trailing whitespace
  Src/diffutils/src: IO.C UTIL.C
 Current selftests status: Failure count: 24 (of 480)
  Failing -b t002 (u & m platforms, all 4 builds)
  Failing -bi t002 (u & m platforms, all 4 builds)
  Failing -b bug1406950 (u & m platforms, all 4 builds)

2006-02-03 Perry
 PATCH: [ 1423060 ] Modify perl selftest to test all 4 builds
 Changes to selftest
 Current selftests status: Failure count: 36 (of 480)
  Failing -b t002 (all 3 platforms, all 4 builds)
  Failing -bi t002 (all 3 platforms, all 4 builds)
  Failing -b bug1406950 (all 3 platforms, all 4 builds)
 PATCH: [ 1421694 ] Widen comments label in Rational ClearCase dialog
  Src: Merge.rc
  Src/Languages: */Merge*.rc
 PATCH: [ 1423461 ] Rearrange language select dialog
  Src: MainFrm.cpp MainFrm.h Merge.rc OpenDlg.cpp OpenDlg.h
  Src/Common: LanguageSelect.cpp LanguageSelect.h
  Src/Languages: */Merge*.rc

2006-02-02 Perry
 PATCH: [ 1422052 ] Correction of Swedish for 2.5.3.1+
 Contributed by Hans Eriksson
 Src/Languages/Swedish: Merge Swedish
 
2006-02-01 Perry
 PATCH: [ 1412386 ] Adding readme files
  New WinMerge/readme.txt
  (Various other directories affected -- readme.txt & Changes.txt files)

2006-02-01 Kimmo
 PATCH: [ 1419329 ] Select Line Difference
  Src: Merge.rc MergeDiffDetailView.cpp MergeDiffDetailView.h MergeEditView.cpp
   MergeEditView.h resource.h
  Src/Language: */Merge*.rc

2006-02-01 Perry
 BUG: [ 1419317 ] link error on 8-bit cvs trunk
  Add HtmlHelp.lib to link lines MergeRelease, MergeDebug, MergeUnicodeRelease.
  Src: Merge.dsp
 PATCH: [ 1419582 ] Polish translation update for latest v2.5
  Contributed by dr_prozac
  Src/Languages/Polish: MergePolish.rc
 PATCH: [ 1421018 ] Fix handle leak in GetOpenFileName
 BUG: [ 1418765 ] 2.4.4.0U maintain opened a handle on folders
  Adds new method paths_GetWindowsDirectory & resets current
   directory to WINDIR after GetOpenFileName call
  Src: MainFrm.cpp OpenDlg.cpp paths.cpp paths.h
 Cosmetic: synchronizing whitespace to English version
  Src/Languages/*: MergeTurkish.rc MergeSwedish.rc MergeSpanish.rc
 Cosmetic: synchronizing whitespace to English version
  Src/Languages/*: MergePolish.rc
 Updating Polish dialog control layout to English (except where
  would hinder appearance)
  Src/Languages/*: MergePolish.rc

2006-01-31 Tim
 PATCH: [ 1419171 ] Various Updates in German Translation for WinMerge 2.5
  Src/Languages/German: MergeGerman.rc

2006-01-29 Perry
 PATCH: [ 1415895 ] Split cmdline help string into chunks
  Src: Merge.cpp Merge.h Merge.rc MergeArgs.cpp resource.h
  Src/Languages: */*.rc

2006-01-28 Perry
 PATCH: [ 1414904 ] updated italian translation for winmerge 2.5.3.1
  Submitted by A. Decorte
  InnoSetup\Languages: Italian.isl
 PATCH: [ 1415165 ] Updated Swedish translation for 2.5.3.1+
  Submitted by Hans Eriksson
  Src\Languages\Swedish: MergeSwedish.rc
 PATCH: [ 1414195 ] Delete two old TODO notes
  Src: ChildFrm.cpp
 PATCH: [ 1414196 ] Delete useless CChildFrame::OnNotify method
  Src: ChildFrm.cpp ChildFrm.h
 PATCH: [ 1414199 ] Fix outdated comment on DirView.cpp :: NumToStr
  Src: DirView.cpp

2006-01-26 Kimmo
 PATCH: [ 1413230 ] Use HtmlHelp API to open help
  Src: MainFrm.cpp Merge.dsp

2006-01-25 Perry
 BUG: [ 1412237 ] InitOption return value wrong if RegCreateKey fails
  Fix unused wrong return value of InitOption & improve one comment
  Src/Common: OptionsMgr.cpp
 BUG: [ 1414868 ] Bug in byte_compare (early finish)
  (Also added some comments.)
  Src: DiffWrapper.cpp

2006-01-24 WinMerge experimental release 2.5.3.1 (cvs)

2006-01-23 Kimmo
 PATCH: [ 1406840 ] Use HTMLHelp locally
  Src: MainFrm.cpp
 PATCH: [ 1411727 ] Merge inactive diff when cursor is inside it
  Src: MergeDoc.cpp MergeDoc.h MergeEditView.cpp MergeEditView.h

2006-01-23 Perry
 Add repro files to selftests from 
  BUG [ 1406950 ] QuickCompare vs diffutils, disagree on trailing whitespace
 Current selftests status: Failure count: 9 (of 108)
  Failing -b t002 (all 3 platforms)
  Failing -bi t002 (all 3 platforms)
  Failing -b bug1406950 (all 3 platforms)
 PATCH: [ 1406950 ] QuickCompare vs diffutils, disagree on trailing whitespace
  Src: ByteComparator.cpp
 (selftests results unimproved, because selftest uses diffutils core, not QuickCompare)

2006-01-22 Perry
 PATCH: [ 1405540 ] Cleanup filters dialog
  Src: FileFiltersDlg.cpp FileFiltersDlg.h

2006-01-22 Tim
 PATCH: [ 1411102 ] Add '*.dsl' and '*.jsp' to syntax highlighter
  Src/editlib: ccrystaleditview.cpp

2006-01-22 Perry
 PATCH: [ 1411406 ] self-tests and new arguments and new diff2winmerge.exe
  Src: Changes.txt MainFrm.cpp MainFrm.h Merge.cpp Merge.h MergeArgs.cpp
  Src/Common: OptionsMgr.cpp OptionsMgr.h
  New directory WinMerge/diff2winmerge, for diff2winmerge utility
  New directory WinMerge/selftests added
 Current selftests status: Failure count: 6 (of 108)
  Failing -b t002 (all 3 platforms)
  Failing -bi t002 (all 3 platforms)

2006-01-21 Kimmo
 PATCH: [ 1411150 ] Add GetActiveMergeView for MergeDoc
  Src: MergeDoc.cpp MergeDoc.h

2006-01-21 Perry
 PATCH: [ 1407740 ] Polish translation update (for version 2.4.4.0)
  Submitted by dr_prozac
  (Perry merging many of these to cvs trunk)
   Src/Language/Polish: MergePolish.rc

2006-01-20 Kimmo
 BUG: [ 1408587 ] Unused DoScroll() function in Merge*View
  Remove DoScroll() from CMergeEditView and CMergeDiffDetailView
  Src: MergeDiffDetailView.cpp MergeDiffDetailView.h MergeEditView.cpp
   MergeEditView.h

2006-01-17 Kimmo
 PATCH: [ 1406207 ] Fix error message for unique folders
  Src: DirView.cpp Merge.rc resource.h
  Src/Language: */Merge*.rc

2006-01-17 Perry
 PATCH: [ 1401711 ] A hybrid of word diff and char diff
 Submitted by Takashi Sawanaka
  Src: MergeDocLineDiffs.cpp PropEditor.cpp
   stringdiffs.cpp stringdiffs.h

2006-01-16 Kimmo
 PATCH: [ 1406203 ] Open unique files to external editor
  Src: DirView.cpp Merge.rc resource.h
  Src/Language: */Merge*.rc

2006-01-15 Perry
 PATCH: [ 1333600 ] Get rid of global MainFrame pointer (part1)
  Src: DirActions.cpp DirDoc.cpp DirView.cpp FileActionScript.cpp
   MainFrm.cpp MainFrm.h Merge.cpp MergeDoc.cpp MergeEditView.cpp
   OpenDlg.cpp PropRegistry.cpp
  Src\Common: PreferencesDlg.cpp

2006-01-14 Perry
 PATCH: [ 1403457 ] Support Unicode file filter files
  Src: FileFilterMgr.cpp

2006-01-14 Kimmo
 PATCH: [ 1372044 ] Add FileActionScript for folder compare actions
  Src: DirActions.cpp DirView.h Merge.dsp
  Src new files: FileActionScript.cpp FileActionScript.h
 PATCH: [ 1385672 ] Replace some 'file's with 'item's
  Src: Merge.rc
  Src/Language: */Merge*.rc
 PATCH: [ 1405340 ] Add XP shadow to folderskip.ico
  Submitted by Tim
  Src/res: folderskip.ico

2006-01-14 Perry
 TODO: [ 1395638 ] CChildFrame::PreCreateWindow() does nothing
  Src: ChildFrm.cpp ChildFrm.h MainFrm.cpp

2006-01-13 Perry
 PATCH: [ 1403454 ] Add comment to UniStdioFile.h
 (Cosmetic)
  Src/Common: UniFile.h
 PATCH: [ 1403893 ] Fix whitespace error in ByteCompare
 BUG: [ 1400779 ] Whitespace bug in ByteComparator
  Src: ByteComparator.cpp

2006-01-13 Kimmo
 PATCH: [ 1039677 ] Alter text of Reset button label
  Src: Merge.rc
  Src/Language: */Merge*.rc

2006-01-12 Kimmo
 PATCH: [ 1399263 ] Captioned panes (new style)
  Src: ChildFrm.cpp DiffViewBar.h LocationBar.h Merge.dsp Merge.rc resource.h
  Src/Common new files: scbarcf.cpp scbarcf.h
  Src/Language: */Merge*.rc
 PATCH: [ 1399738 ] Filename bars to use caption colors
  Src: ChildFrm.cpp FilePathEdit.cpp FilePathEdit.h

2006-01-12 Tim
 PATCH: [ 1403412 ] German: Option 'Line Difference Coloring' looks broken
  Src/Languages/German: MergeGerman.rc

2006-01-11 WinMerge beta release 2.5.2

2006-01-11 Kimmo
 PATCH: [ 1402774 ] Use dark red color for 'binarydiff.ico'
  Submitted by Tim
  Src/res: binarydiff.ico
 PATCH: [ 1400845 ] Allow Shift+Ctrl+F3 to search selected text backwards
  With addition from Takashi for Shift+F3 backwards search
  Src: Merge.rc
  Src/editlib: ccrystaltextview.cpp
  Src/Language: */Merge*.rc
 BUG: [ 1400829 ] Crash trying to open location pane context menu
  Src: LocationView.cpp

2006-01-11 Tim
 PATCH: [ 1401420 ] New 'MergeDir' icon
  Src/res: MergeDir.ico

2006-01-10 Perry
 PATCH: [ 1400830 ] Fix drop to only do LoadProjectFile when 1 file dropped
 BUG: [ 1400797 ] Dropping two project files doesn't work to compare them
  (Also fixes extension test to be case-sensitive)
  Src: MainFrm.cpp

2006-01-09 Perry
 BUG: [ 1396222 ] CDirView::MoveSelection() is confused
 (Rename MoveSelection to MoveFocus & add more commenting)
  Src: DirActions.cpp DirView.cpp DirView.h

2006-01-07 Perry
 PATCH: [ 1398064 ] Catalan translation update
 By Jordi Vilar
  Src/Languages/Catalan: MergeCatalan.rc
 PATCH: [ 1398959 ] Implement GuessEncoding in QuickCompare
  Src: codepage_detect.cpp DiffWrapper.cpp DiffWrapper.h

2006-01-05 WinMerge experimental release 2.5.0.5 (cvs)

2006-01-04 Kimmo
 PATCH: [ 1393635 ] Save pane sizes and positions when they change
  Src: ChildFrm.cpp ChildFrm.h DiffViewBar.cpp DiffViewBar.h LocationBar.cpp
   LocationBar.h LocationView.cpp LocationView.h MergeDiffDetailView.cpp
   MergeDiffDetailView.h StdAfx.h
 PATCH: [ 1396413 ] Update Open dialog controls when its activated
  Src: OpenDlg.cpp OpenDlg.h

2006-01-04 Perry
 Cosmetic; normalizing blank lines to agree with English Merge.rc
  Src\Languages:
   Brazilian\MergeBrazilian.rc
   ChineseSimplified\MergeChineseSimplified.rc
   Korean\MergeKorean.rc
   Norwegian\MergeNorwegian.rc

2006-01-03 Kimmo
 PATCH: [ 1394877 ] Find selected text with Ctrl+F3
  Src: Merge.rc
  Src/editlib: ccrystaltextview.cpp
  Src/Language: */Merge*.rc
 PATCH: [ 1395584 ] Update CSizingControlBar to latest version
  Src: DiffViewBar.cpp DiffViewBar.h LocationBar.cpp LocationBar.h Merge.dsp StdAfx.h
  Src/Common: sizecbar.cpp sizecbar.h
  Src/Common new files: scbarg.cpp scbarg.h
  Src/Common deleted files: sizecbarg.cpp sizecbarg.h
 PATCH: [ 1383262 ] Fix bitmap leak in ShellExtension
  Also bump version number to 1.7.1
  Submitted by Perry
  ShellExtension: ShellExtension.rc WinMergeShell.cpp WinMergeShell.h

2006-01-03 Takashi
 PATCH: [ 1390104 ] fix for BUG: [ 1384069 ] Wrapped lines have incorrect column
  Src: MergeEditView.cpp
  Src/editlib: ccrystaltextview.cpp ccrystaltextview.h

2006-01-03 Perry
 BUG: [ 1390849 ] cvs trunk MergeChineseSimplified doesn't compile
  Src/Languages: ChineseSimplified: MergeChineseSimplified.rc
 PATCH: [ 1212161 ] Fix handling of \r\n in ByteComparator
  Src: ByteComparator.cpp

2006-01-02 Perry
 PATCH: [ 1383802 ] Cleanup line difference options in Editor-options
  Src: Merge.rc PropEditor.cpp PropEditor.h resource.h
 PATCH: [ 1383802 ] Cleanup line difference options in Editor-options
  Translations
  Src/Language: */Merge*.rc
 PATCH: [ 1391550 ] vbs script to check & optionally merge WinMerge resources
  Src: new CheckTranslations.vbs

2006-01-02 Kimmo
 PATCH: [ 1395474 ] Define WINVER for compiling with VS.net
  Src: StdAfx.h
 PATCH: [ 1395018 ] Small cleanup for CMergeDoc::PrimeTextBuffers()
  Src: DiffList.cpp DiffList.h MergeDoc.cpp

2006-01-02 Perry
 PATCH: [ 1395487 ] Unused local variable in UniStdioFile::DoOpen()
  (Delete unused variable)
  Src/Common: UniFile.cpp
 BUG: [ 1395497 ] Unused local variables in CMergeDoc::GetWordDiffArray()
  (Delete unused variables)
  Src: MergeDocLineDiffs.cpp
 BUG: [ 1395494 ] stringdiffs.cpp / LastChar() returning uninitialized value?
  Src: stringdiffs.cpp

2006-01-02 Kimmo
 Remove unused variable from VSSHelper.cpp/VSSHelper::ReLinkVCProj()
  Src: VSSHelper.cpp

2006-01-02 Perry
 PATCH: [ 1392647 ] Prefix members with m_ in storage_for_plugins
  Src/Common: multiformatText.cpp multiformatText.h
 PATCH: [ 1394717 ] Fix resource.h include for translations
  Src/Languages: */Merge*.rc
  Src/Languages deleted: UpdateAll_resource_h.bat
  Src/Languages deleted: */resource.h (localized versions of resource.h)
 BUG: [ 1395107 ] MergeKorean.rc not compile in cvs trunk
  (resource.h => ..\..\resource.h fix missed Korean somehow)
  Src/Languages/Korean: MergeKorean.rc
 PATCH: [ 1394073 ] Fix ByteComparator: m_bol0
  (Change in ByteComparator.h is cosmetic typo fix in comment)
  (Fixes some bad tabbing as well)
  Src: ByteComparator.cpp ByteComparator.h

2006-01-01 Kimmo
 PATCH: [ 1394759 ] Allows quotes in Rational ClearCase checkout comment
  Submitted by Gal Hammer
  Src: MainFrm.cpp
 Add Gal Hammer to contributors list
  Docs/Users: Contributors.txt

2006-01-01 Perry
 BUG: [ 1394857 ] cvs trunk does not compile, ANSI, FindEncodingIdFromNameOrAl
  Src: codepage_detect.cpp

2006-01-01 Kimmo
 PATCH: [ 1392347 ] Fix status after synching unique binary files
  Src: DirScan.cpp
 PATCH: [ 1394464 ] Find again code doesn't recognize dos/mac EOLs
  Src/editlib: ccrystaltextview.cpp
 BUG: [ 1394851 ] cvs trunk does not compile (DirScan.cpp, sRule)
  Src: DirScan.cpp

2005-12-31 Perry
 PATCH: [ 1394247 ] Fix GuessEncoding recognition of codepages
 BUG: [ 1394234 ] GuessEncodings fails to recognize CP-437
  Src: codepage_detect.cpp
 PATCH: [ 1393979 ] Delete unused DiffWrapper fnc cleanup_script
  Src: DiffWrapper.cpp

2005-12-30 Perry
 PATCH: [ 1391732 ] Do not offer to unify codepages in UNICODE build
  Also introduces new error IDS_DIFFERENT_UNICODINGS and new
   global function IsUnicodeBuild.
  (Post-application)
  Doing language synchronizations for this patch.
  Src: Merge.rc
   Languages\Brazilian\MergeBrazilian.rc
   Languages\Bulgarian\MergeBulgarian.rc
   Languages\Catalan\MergeCatalan.rc
   Languages\ChineseSimplified\MergeChineseSimplified.rc
   Languages\ChineseTraditional\MergeChineseTraditional.rc
   Languages\Czech\MergeCzech.rc
   Languages\Danish\MergeDanish.rc
   Languages\Dutch\MergeDutch.rc
   Languages\German\MergeGerman.rc
   Languages\Hungarian\MergeHungarian.rc
   Languages\Italian\MergeItalian.rc
   Languages\Japanese\MergeJapanese.rc
   Languages\Korean\MergeKorean.rc
   Languages\Norwegian\MergeNorwegian.rc
   Languages\Polish\MergePolish.rc
   Languages\Russian\MergeRussian.rc
   Languages\Slovak\MergeSlovak.rc
   Languages\Spanish\MergeSpanish.rc
   Languages\Swedish\MergeSwedish.rc
   Languages\Turkish\MergeTurkish.rc
 PATCH: [ 1212368 ] Display correct paths in context patches
  (Post-application)
  Revising patched code, removing unneeded dispname added when patch applied
  Src: DiffWrapper.cpp
  diffutils\src: CONTEXT.C DIFF.H
 PATCH: [ 1393239 ] Split functions out of RunFileDiff
  Src: DiffWrapper.cpp DiffWrapper.h
 PATCH: [ 1392229 ] Fix Column item handling
  Src: DirView.h DirViewColHandler.cpp DirViewColItems.cpp
   DirViewColItems.h

2005-12-29 Perry
 PATCH: [ 1390774 ] Rename CRegOptions to CRegOptionsMgr
  Docs\Developers: Options.html
  Src\Common: OptionsMgr.cpp OptionsMgr.h
  Src: FileTransform.cpp MainFrm.cpp MainFrm.h SyntaxColors.cpp
   SyntaxColors.h codepage.h
 PATCH: [ 1392650 ] Fix locals of CDiffWrapper::RunFileDiff
  Src: DiffWrapper.cpp DiffWrapper.h MergeDoc.cpp PatchTool.cpp
 PATCH: [ 1392729 ] Cleanup variables in RunFileDiff
  Src: DiffWrapper.cpp
 BUG: [ 1369646 ] Confusing half-commented lines in DiffFileData::prepAndCompa
  Src: DiffWrapper.cpp
 BUG: [ 1392740 ] Clutter in debug output
  Src: DirScan.cpp
 PATCH: [ 1391766 ] Sync language resources to English
  Src: Merge.rc
   Languages\Brazilian\MergeBrazilian.rc
   Languages\Bulgarian\MergeBulgarian.rc
   Languages\Catalan\MergeCatalan.rc
   Languages\ChineseSimplified\MergeChineseSimplified.rc
   Languages\ChineseTraditional\MergeChineseTraditional.rc
   Languages\Czech\MergeCzech.rc
   Languages\Danish\MergeDanish.rc
   Languages\Dutch\MergeDutch.rc
   Languages\German\MergeGerman.rc
   Languages\Hungarian\MergeHungarian.rc
   Languages\Italian\MergeItalian.rc
   Languages\Japanese\MergeJapanese.rc
   Languages\Korean\MergeKorean.rc
   Languages\Norwegian\MergeNorwegian.rc
   Languages\Polish\MergePolish.rc
   Languages\Russian\MergeRussian.rc
   Languages\Slovak\MergeSlovak.rc
   Languages\Spanish\MergeSpanish.rc
   Languages\Swedish\MergeSwedish.rc
   Languages\Turkish\MergeTurkish.rc
 PATCH: [ 1212368 ] Display correct paths in context patches
  Src: DiffWrapper.cpp DiffWrapper.h
  diffutils\src: CONTEXT.C DIFF.H
 PATCH: [ 1390454 ] new commandline arguments (prediffer, ignorews...)
  Src: ConfigLog.cpp DirDoc.cpp DirDoc.h FileTransform.cpp
   MainFrm.cpp MainFrm.h Merge.cpp Merge.dsp Merge.h
   MergeEditView.cpp MergeEditView.h
   PluginManager.cpp PluginManager.h Plugins.cpp Plugins.h
   ProjectFile.cpp
  Src New files: MergeArgs.h MergeArgs.cpp
  Src/Common: CmdArgs.cpp CmdArgs.h OptionsMgr.cpp OptionsMgr.h

2005-12-28 Perry
 PATCH: [ 1391732 ] Do not offer to unify codepages in UNICODE build
  Also introduces new error IDS_DIFFERENT_UNICODINGS and new
   global function IsUnicodeBuild.
  Src: ConfigLog.cpp MainFrm.cpp Merge.rc resource.h StdAfx.cpp StdAfx.h

2005-12-27 Perry
 PATCH: [ 1390793 ] New global function GetOptionMgr
  Src: DirActions.cpp DirDoc.cpp DirView.cpp DirViewColHandler.cpp
   LocationView.cpp MainFrm.cpp MainFrm.h MergeDiffDetailView.cpp
   MergeDoc.cpp MergeEditView.cpp OpenDlg.cpp
  Src/Common: OptionsMgr.h

2005-12-27 Perry
 PATCH: [ 1382130 ] New line-based RCLocalizationHelper
  See plugins.

2005-12-26 Perry
 PATCH: [ 1388704 ] Simplified Chinese language .rc file for RC1
  Src/Languages/ChineseSimplified: MergeChineseSimplified.rc
 Update language versions of resource.h
  Src/Languages/*: resource.h

2005-12-25 Perry
 Update & synchronize translations: Danish Dutch French Hungarian Italian Japanese
  Src: Merge.rc
  Src/Languages:
   Danish: MergeDanish.rc
   Dutch: MergeDutch.rc
   French: MergeFrench.rc
   Hungarian: MergeHungarian.rc
   Italian: MergeItalian.rc
   Japanese: MergeJapanese.rc
 Remove needless cast
  Src/Common: unicoder.cpp
 Update & synchronize translations: Korean Norwegian Polish Russian
  Src: Merge.rc
  Src/Languages:
   Korean: MergeKorean.rc
   Norwegian: MergeNorwegian.rc
   Polish: MergePolish.rc
   Russian: MergeRussian.rc

2005-12-23 Kimmo
 PATCH: [ 1388456 ] Convert rest of folder compare bitmaps to icons
  Icons from Tim (Thanks!)
  Src: CompareStatisticsDlg.cpp DirView.cpp Merge.dsp Merge.rc resource.h
  Src/res added files: binarydiff.ico equalbinary.ico equalfile.ico error.ico
   fileskip.ico folderup.ico folderup_disable.ico lfile.ico notequalfile.ico
   rfile.ico sigma.ico unknown.ico
  Src/res removed files: binary.bmp binarydiff.bmp error.bmp fileskip.bmp
   folderup.bmp folderup_disable.bmp lfile.bmp notequal.bmp rfile.bmp
   sigma.bmp unknown.bmp
  Src/Languages: *.rc resource.h

2005-12-21 WinMerge experimental release 2.5.0.4 (cvs)

2005-12-21 Kimmo
 BUG: [ 1385518 ] Batch file syntax highlighting weirdness
  Fix from Tim
  Src/editlib: batch.cpp
 PATCH: [ 1387297 ] Swedish translation update for 2.5.0.3+
  Submitted by Hans Eriksson
  Src/Languages/Swedish: MergeSwedish.rc

2005-12-21 Perry
 PATCH: [ 1386442 ] Local variable uses m_ prefix in CChildFrame
  Src: ChildFrm.cpp

2005-12-19 Kimmo
 PATCH: [ 1384646 ] Replace Question icons with warning icons in messageboxes
  Src: DirActions.cpp FileFiltersDlg.cpp MainFrm.cpp MergeDoc.cpp PatchDlg.cpp

2005-12-19 Perry
 PATCH: [ 1383120 ] Fix background colors in WinMerge
  Src: SyntaxColors.cpp SyntaxColors.h
  Src/Common: OptionsMgr.cpp OptionsMgr.h
 PATCH: [ 1384181 ] Fix byte difference fencepost/infinite loop
  Src: CompareOptions.h ConfigLog.cpp DiffWrapper.cpp DiffWrapper.h
   Merge.dsp PatchDlg.cpp stringdiffs.cpp

2005-12-17 Kimmo
 BUG: [ 1379277 ] typo fix for docs
  Docs/Developers: Plugins.html
 BUG: [ 1375661 ] Readme incomplete in WinMerge 2.5.0.3
  Docs/Users: ReadMe.txt
 PATCH: [ 1382966 ] Remove empty CMergeEditView::AddMod() and ResetMod()
  Src: MergeEditView.cpp MergeEditView.h

2005-12-17 Takashi
 PATCH: [ 1378771 ] Fix for BUG:[ 1376552 ] char offset not getting updated when...
  Src: ChildFrm.cpp MergeEditView.cpp

2005-12-17 Takashi
 PATCH: [ 1378795 ] The searched word is not highlighted correctly
  Src/editlib: ccrystaltextview.cpp

2005-12-17 Perry
 PATCH: [ 1382955 ] Remove unused CompareStats.h include from DirFrame.cpp
  Src: DirFrame.cpp
 PATCH: [ 1376711 ] Change CFile::GetStatus to paths_DoesPathExist
  Src: files.cpp MainFrm.cpp MainFrm.h Merge.cpp MergeDoc.cpp OpenDlg.cpp
   PathContext.cpp
  Src/Common: coretools.cpp

2005-12-16 Kimmo
 PATCH: [ 1381984 ] Folder compare progressdialog could be drawn off-screen
  Src: DirCompProgressDlg.cpp

2005-12-16 Perry
 PATCH: [ 1380083 ] Fix EditBinaryFiles Plugin BuildTmp paths
  Plugins\src_VCPP\EditBinaryFiles: EditBinaryFiles.dsp

2005-12-16 Kimmo
 PATCH: [ 1381975 ] Don't open Open-dialog outside screen
  Src: MainFrm.cpp OpenDlg.cpp
  Src removed file: multimon.h

2005-12-16 Perry
 BUG: [ 1380019 ] Bulgarian translation has wrong language id
  Src/Languages/Bulgarian: MergeBulgarian.rc
 PATCH: [ 1382131 ] English rc file has numbers instead of symbols for language
  Src: Merge.rc
 PATCH: [ 1379227 ] Fix ExpatLibs BuildTmp paths
  Src/ExpatLib: expat_static.dsp
  Src/ExpatMapLib: expat_maps_static.dsp
 PATCH: [ 1379228 ] Fix Merge7zInstaller BuildTmp paths
  Merge7zInstaller: Merge7zInstaller.dsp

2005-12-16 Kimmo
 PATCH: [ 1381935 ] Simplify DirView icon loading
  Src: DirView.cpp

2005-12-16 Jochen
 BUG: [ 1382021 ] Merge7z432 missing?
  Merge7z new files: Merge7z431.dsp Merge7z432.dsp

2005-12-15 Perry
 PATCH: [ 1188787 ] New Chinese translation rc file (from PATCH 1183476)
  Some more synchronizing from submitted patch
  Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
 PATCH: [ 1379226 ] Fix Display Plugins BuildTmp paths
  (See plugins)  
 PATCH: [ 1188787 ] New Chinese translation rc file (from PATCH 1183476)
  Last updates from submitted patch
  Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
 BUG: [ 1381879 ] Unused variable in unicoder.cpp
  Src/common: unicoder.cpp

2005-12-14 Perry
 Update & synchronize translations: ChineseTraditional Czech Danish Dutch
  Src/Languages:
  ChineseTraditional: MergeChineseTraditional.rc
  Czech: MergeCzech.rc
  Danish: MergeDanish.rc
  Dutch: MergeDutch.rc
 Update & synchronize translations: French German Hungarian Italian Japanese
  Src/Languages:
  French: MergeFrench.rc
  German: MergeGerman.rc
  Hungarian: MergeHungarian.rc
  Italian: MergeItalian.rc
  Japanese: MergeJapanese.rc

2005-12-13 Perry
 PATCH: [ 1379894 ] Fix handling of unknown encoding
  Src: MainFrm.cpp
  Src/Common: unicoder.cpp
 Update & synchronize translations: Brazilian Bulgarian Catalan ChineseSimplified
  Src/Languages:
  Brazilian: MergeBrazilian.rc
  Bulgarian: MergeBulgarian.rc
  Catalan: MergeCatalan.rc
  ChineseSimplified: MergeChineseSimplified.rc

2005-12-13 Kimmo
 PATCH: [ 1378174 ] Share Src/res between translations
  Src/Languages: *.rc
  Src/Languages/res: removed .bmp .cur and .ico files and WinMergeSplash.psd
   splash1.bmp and splash WinMergeSplash.psd not removed from Catalan

2005-12-13 Perry
 PATCH: [ 1377545 ] Remove needless casts

2005-12-11 Perry
 PATCH: [ 1372549 ] readme for Merge7z distributables
  Merge7z: readme.txt

2005-12-11 Kimmo
 PATCH: [ 1371994 ] Enable hi-color icons for folder compare
  Icons from Tim (Thanks!)
  Src: CompareStatisticsDlg.cpp DirView.cpp Merge.rc resource.h
  res new files: folder.ico folderskip.ico lfolder.ico rfolder.ico
  res deleted files: folder.bmp folderskip.bmp lfolder.bmp rfolder.bmp
  Src/Languages: *.rc resource.h
  Src/Languages/res: new and deleted files like in res above

2005-12-10 Perry
 PATCH: [ 1371384 ] Move Expat maps into WinMerge src
  Plugins\src_VCPP\DisplayXMLFiles: DisplayXMLFiles.dsp
  Src\ExpatMapLib added
  Many files moved from DisplayXMLFiles to new ExpatMapLib
 PATCH: [ 1373020 ] Carry unicoding, codepage, & file path together
 & PATCH: [ 1377545 ] Remove needless casts
  Src: DiffWrapper.cpp DiffWrapper.h DirScan.cpp DirView.cpp
   MainFrm.cpp MainFrm.h Merge.dsp MergeDoc.cpp MergeDoc.h
  Src\Common: RegKey.cpp
  NEW Src\FileLocation.h

2005-12-09 Perry
 PATCH: [ 1188787 ] New Chinese translation rc file (from PATCH 1183476)
  Remainder of dialogs
  Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
 BUG: [ 1376825 ] infinite loop bug in byte diffs
  Src: stringdiffs.cpp
 PATCH: [ 1188787 ] New Chinese translation rc file (from PATCH 1183476)
  A few string resources
  Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
 PATCH: [ 1249007 ] Short size column
  Src: DirViewColItems.cpp locality.cpp locality.h Merge.rc resource.h
 PATCH: [ 1377362 ] Fix coretools to MakeResDll compiles
 BUG: [ 1377361 ] MakeResDll broken b/c coretools broken
  Src/Common: coretools.cpp
   
2005-12-08 Perry
 PATCH: [1374728 ] Fix filter dialog delete
  Src: FileFilterMgr.cpp

2005-12-08 Kimmo
 PATCH: [ 1374782 ] fix for bug 1300957 Crash on save 'unique' file comparison
  Submitted by Oliver Mellet, some additional comment improvements by me.
  Src: DirDoc.cpp
 Takashi is now developer, Olivier Mellet submitted a patch
  Docs/Users: Contributors.txt

2005-12-08 Perry
 PATCH: [ 1376457 ] Need clarification in platform test in ShellExtension
  ShellExtension: ShellExtension.cpp

2005-12-08 Takashi
 fix two-line-end-markers bug that was reported in:
  "PATCH: [ 1372716 ] patch for RFE:[ 922992 ] Word Wrap/split long lines" 
 Src: stringdiffs.cpp

2005-12-08 Takashi
 PATCH: [ 1372716 ] patch for RFE:[ 922992 ] Word Wrap/split long lines 
  Src: Merge.rc MergeDoc.cpp MergeEditView.cpp MergeEditView.h OptionsDef.h
   OptionsInit.cpp resource.h 
  Src/editlib: ccrystaltextview.cpp ccrystaltextview.h ccrystaltextview2.cpp
   crystalparser.cpp editcmd.h 
  Src/Languages: *.rc resource.h

2005-12-07 Perry
 PATCH [ 1374931 ] Bugfixes & upload binary for RCLocalizationHelper
  (RCLocalizationHelper plugin)

2005-12-06 Perry
 PATCH [ 1372575 ] Fix link for DisplayXmlFiles plugin
  (DisplayXMLFiles plugin)
 TODO [ 1341058 ] ToDoDeleteThisValidateColumnOrdering()
  Src: DirView.cpp DirView.h DirViewColHandler.cpp

2005-12-06 WinMerge experimental release 2.5.0.3 (cvs)

2005-12-06 Kimmo
 PATCH: [ 1372589 ] Document tildas in config
  Submitted by Perry
  Src: ConfigLog.cpp
 PATCH: [ 1373037 ] Fix filter dialog to correctly add new filters
  Submitted by Perry
  Src: FileFiltersDlg.cpp
 PATCH: [ 1370183 ] ShellExtension: better way to check for WinMerge executable
  ShellExtension: WinMergeShell.cpp
 Bump ShellExtension version to 1.7.0
  ShellExtension: ShellExtension.rc

2005-12-04 Perry
 PATCH: [ 1372974 ] Make local function "GuessEncoding_from_bytes" static
  Src: codepage_detect.cpp
 PATCH: [ 1368762 ] Fix assignment in DirScan_GetItems
  Also add explanatory comment, for what variable does.
  Src: DirScan.cpp

2005-12-04 Jochen
 CMarkdown::FileImage::GuessByteOrder(), GuessCodepageEncoding(): Fix UTF-8 signature detection
 CMarkdown::GetTagName(): Strip bogus trailing slash in name of empty tag
  Src: markdown.cpp codepage_detect.cpp

2005-12-03 Perry
 PATCH: [ 1335128 ] Ignore uninstalled codepages
  Src: MergeDoc.cpp MergeDoc.h codepage.cpp codepage_detect.cpp
  Src/Common: unicoder.cpp

2005-12-02 Kimmo
 PATCH: [ 1358408 ] Import and export for options
  Increase buffer size
  Src/Common: OptionsMgr.cpp

2005-12-02 Perry
 PATCH: [ 1369660 ] Delete unused variables m_msgUpdateStatus
  Cosmetic cleanup
  Src: DirDoc.cpp DiffContext.cpp DiffContext.h DiffThread.cpp
   DiffThread.h

2005-11-30 Perry
 PATCH: [ 1369657 ] Delete unused variable DiffFuncStruct::msgStatusUpdate
  Src: DiffThread.cpp
 BUG: [ 1369856 ] Crashed when interface language is changed
  Src: DirDoc.cpp
 BUG: [ 1368755 ] Want comment on format line in 7ZCommon.cpp
  Cosmetic: adding explanatory comment to Merge7z::Proxy::operator->
  Src: 7zCommon.cpp

2005-11-30 Kimmo
 PATCH: [ 1369544 ] Catalan translation update
  Submitted by Jordi Vilar
  Docs/Users/Languages: ReadMe-Catalan.txt
  Src/Languages/Catalan: MergeCatalan.rc
 PATCH: [ 1265295 ] Swap file compare panes (use pointers for buffers)
  Forgot to update resource.h in language folders
  Src/Languages: resource.h

2005-11-30 Perry
 Cosmetic: add comment to DiffThread giving value of msgID variable
  (to help debugging).
  Src: DiffThread.cpp

2005-11-28 Perry
 BUG: [ 1368492 ] cvs ASSERT failing
 Fix reversion bug from Patch [ 1265295 ]

2005-11-28 Kimmo
 PATCH: [ 1265295 ] Swap file compare panes (use pointers for buffers)
  Submitted by Takashi Sawanaka
  Src: ChildFrm.cpp DiffList.cpp DiffList.h DirDoc.cpp EditorFilepathBar.cpp
   EditorFilepathBar.h LocationView.cpp LocationView.h MainFrm.cpp Merge.rc
   MergeDiffDetailView.cpp MergeDiffDetailView.h MergeDoc.cpp MergeDoc.h
   MergeDocLineDiffs.cpp MergeEditView.cpp MergeEditView.h PathContext.cpp
   PathContext.h resource.h
  Src/Languages: *.rc resource.h

2005-11-28 Perry
 PATCH: [ 1336598 ] Add extensions DisplayXMLFiles plugin
 Add several new extensions, bump version (1.0.2.0 -> 1.0.3.0)
  Plugins\src_VCPP\DisplayXMLFiles:
   DisplayXMLFiles.dsp DisplayXMLFiles.rc WinMergeScript.cpp
  Plugins\dlls:
   DisplayXMLFiles.dll

2005-11-26 Perry
 PATCH: [ 1241935 ] Implement Line Diff coloring on byte diffs
  Src: MergeDoc.cpp MergeDoc.h MergeDocLineDiffs.cpp PropEditor.cpp

2005-11-23 WinMerge experimental release 2.5.0.2 (cvs)

2005-11-22 Tim
 PATCH: [ 1363114 ] Add '*.ctl;*.pag;*.dsr' to Visual Basic highlighter
  Src/editlib: ccrystaltextview.cpp

2005-11-22 Kimmo
 PATCH: [ 1362882 ] Remove option for autoclosing compare statepane
  Src: Merge.rc OptionsDef.h OptionsInit.cpp PropGeneral.cpp PropGeneral.h resource.h
  Src/Languages: *.rc resource.h
 BUG: [ 1355884 ] 2.4.2 fails to open dvd files
  File/folder selection dialog couldn't open read-only folders
  Src: OpenDlg.cpp

2005-11-22 Perry
 PATCH: [ 1334277 ] Show asterisk in #diffs for QuickCompare results
  Src: DiffWrapper.cpp DiffWrapper.h DirViewColItems.cpp
 PATCH: [ 1334589 ] Encoding maps for Expat parser, for DisplayXmlFiles plugin
  Plugins/src_VCPP/DisplayXMLFiles
 BUG: [ 1277320 ] Plugins.txt not up-to-date
  Plugins/dll/IgnoreCommentsC

2005-11-19 Jochen
 Merge7z DllBuild 0017
  Merge7z: StdAfx.h Merge7zCommon.cpp Merge7zCommon.h revision.txt
  Merge7z new files: Merge7z430.dsp
  Merge7zInstaller: Files.rc2 Installer.cpp Merge7zInstaller.dsp

2005-11-18 Kimmo
 PATCH: [ 1358408 ] Import and export for options
  Src: Merge.rc resource.h
  Src/Common: OptionsMgr.cpp OptionsMgr.h PreferencesDlg.cpp PreferencesDlg.h
  Src/Languages: *.rc resource.h

2005-11-17 Kimmo
 PATCH: [ 1349645 ] Folder Compare Statistics dialog
 PATCH: [ 1347787 ] Use non-modal dialog for dir compare status
  Src: DirDoc.cpp DirDoc.h DirFrame.cpp DirFrame.h DirView.cpp DirView.h Merge.cpp Merge.dsp
   Merge.rc resource.h
  Src new files: CompareStatisticsDlg.cpp CompareStatisticsDlg.h DirCompProgressDlg.cpp
   DirCompProgressDlg.h
  Src deleted files: DirCompStateBar.cpp DirCompStateBar.h
  Src/res new file: sigma.bmp
  Src/Languages: *.rc resource.h

2005-11-16 Kimmo
 PATCH: [ 1356783 ] Use OptionsMgr in SyntaxColors class
  Src: MainFrm.cpp SyntaxColors.cpp SyntaxColors.h

2005-11-09 Kimmo
 PATCH: [ 1350638 ] Move options read/write code to options panels
  Src: MainFrm.cpp Merge.dsp PropArchive.cpp PropArchive.h PropCodepage.cpp PropCodepage.h
   PropColors.cpp PropColors.h PropCompare.cpp PropCompare.h PropEditor.cpp PropEditor.h
   PropGeneral.cpp PropGeneral.h PropRegistry.cpp PropRegistry.h PropVss.cpp PropVss.h
  Src new file: IOptionsPanel.h
  Src/Common: PreferencesDlg.cpp PreferencesDlg.h

2005-11-08 Kimmo
 Merge Perry's fix for OpenDlg/SelectFile() to Merge.cpp/SelectFile() (PATCH #1348733)
  Src: Merge.cpp
 PATCH: [ 1350489 ] Use SelectFile() for external editor selection
  Src: PropRegistry.cpp

2005-11-06 Jochen
 PATCH: [ 1327413 ] Fix bug in CDirDoc::AllowUpwardDirectory()
 Change CDirView::AreItemsOpenable() to consider archive files as openable
  Src: DirActions.cpp DirDoc.cpp DirView.cpp

2005-11-05 Perry
 PATCH: [ 1337905 ] Allow comparing binary files with binary unpacker
  Src: DirView.cpp
 PATCH: [ 1348733 ] Fix open dialog for cvs version 2.4
  Src: OpenDlg.cpp

2005-11-04 Perry
 PATCH: [ 1335072 ] Add text to Plugins.txt to cover DisplayXMLFiles
  Plugins/dlls: Plugins.txt

2005-11-02 WinMerge experimental release 2.5.0.1 (cvs)

2005-11-02 Kimmo
 BUG: [ 1341243 ] Current Find string is too fragile
  Was resetting find string after rescanning
  Src/editlib: ccrystaltextview.cpp
 PATCH: [ 1342550 ] Modernize file selection dialog
 PATCH: [ 1345110 ] Properly compare projectfile extension
  Src: Merge.cpp Merge.h OpenDlg.cpp
 Bump ShellExtension version to 1.6.2
  ShellExtension: ShellExtension.rc

2005-11-02 Tim
 PATCH: [ 1345382 ] Translated Shell Extension to German
  ShellExtension/Languages: ShellExtensionGerman.rc

2005-10-31 Kimmo
 RFE: [ 1324314 ] CTRL+W to close current diff
  Src: Merge.rc
  Src/Languages: *.rc
 PATCH: [ 1342871 ] Disable Copy Filenames for folders
  Src: DirView.cpp DirView.h
 PATCH: [ 1343059 ] Swedish translation update for 2.5.0.1 experimental
  Submitted by Hans Eriksson
  Src/Languages/Swedish: MergeSwedish.rc

2005-10-30 Kimmo
 PATCH: [ 1341813 ] VSS project linking misdetects project files
  Src: VSSHelper.cpp
 PATCH: [ 1310710 ] Fix bug #1309450
  Submitted by Jochen
  Src: DiffContext.cpp DiffContext.h DiffFileInfo.cpp DiffFileInfo.h DirScan.cpp

2005-10-29 Kimmo
 PATCH: [ 1341183 ] Fix VSS checkout canceling
  Src: DirActions.cpp MainFrm.cpp
 Open 2.4 manual (update link)
  Src: MainFrm.cpp

2005-10-25 Perry
 PATCH: [ 1334444 ] Remove needless (& therefore confusing) cast
  Src: LocationView.cpp

2005-10-23 Perry
 PATCH: [ 1334484 ] Skip location view paint if buffer not initialized
  Src: LocationView.cpp MergeDoc.cpp MergeDoc.h
   MergeEditView.cpp MergeEditView.h
 Cosmetic changes to GetFunctionsFromScript, to document 
  arguments passed to GetTypeInfo.
 Src: Plugins.cpp

2005-10-21 Kimmo
 PATCH: [ 1333545 ] Small improvement to Open-dialog folder selection
  Src: OpenDlg.cpp
 PATCH: [ 1333581 ] Increase quick compare limit and make it option
  Src: DiffContext.h DiffWrapper.cpp DirDoc.cpp OptionsDef.h OptionsInit.cpp

2005-10-20 Tim
 PATCH: [ 1330179 ] Icon for 'Print'
  Src: MainFrm.cpp Merge.rc resource.h
  Src/res new file: print.bmp
  Src/Languages: *.rc resource.h
  Src/Languages/res new file: print.bmp

2005-10-20 Kimmo
 PATCH: [ 1332365 ] Make some DirActions.cpp functions consts
  Src: DirActions.cpp DirView.h

2005-10-19 Kimmo
 PATCH: [ 1329951 ] Readme.txt points to version 2.2 manual
  Docs/Users: ReadMe.txt
  Docs/Users/Languages: ReadMe-Catalan.txt ReadMe-Swedish.txt
 BUG: [ 1326621 ] Extention ".WinMerge" is omitted
  Src: OpenDlg.cpp

2005-10-18 Tim
 PATCH: [ 1330059 ] Translated 3 missing sentences to German
  Src/Languages/German: MergeGerman.rc

2005-10-15 Perry
 PATCH: [ 1326813 ] Fix binary detection to allow archives
  Src: DirView.cpp

2005-10-13 Kimmo
 PATCH: [ 1305541 ] Rational ClearCase support
  Submitted by Greg (rys1908)
  Src: CCPrompt.cpp CCprompt.h DirActions.cpp MainFrm.cpp MainFrm.h Merge.rc resource.h
  Src/Common: coretools.cpp
  Src/Languages: *.rc resource.h

2005-10-12 Kimmo
 PATCH: [ 1323107 ] Patch for crash on save filenames with different cases
  From anonymous submitter
  Src: DirDcoc.cpp
 PATCH: [ 1286629 ] print support
  Submitted by Markus Rollmann
  Src: MainFrm.cpp Merge.rc MergeEditView.cpp MergeEditView.h
  Src/Common: SplitterWndEx.cpp SplitterWndEx.h
  Src/editlib: ccrystaleditview.cpp
  Src/Languages: *.rc
 Add Markus Rollmann to Contributors.txt
  Docs/Users/Contributors.txt

2005-10-05 Perry
 PATCH: [ 1242008 ] Update status to binary if open fails because binary
  Follow on for 2nd case
 Src: DirView.cpp MergeDoc.cpp

2005-10-03 Perry
 PATCH: [ 1302710 ] generating a report is slow
  Perry added comments explaining one code line
  Src: DirCmpReport.cpp

2005-10-03 Kimmo
 PATCH: [ 1302710 ] generating a report is slow
  Submitted by Takashi Sawanaka
  Src: DirCmpReport.cpp
 PATCH: [ 1310214 ] Shell extension italian translation
  Submitted by Andrea Decorte
  ShellExtension/Languages: ShellExtensionItalian.rc

2005-10-02 Perry
 PATCH: [ 1253949 ] cosmetic comment fix
  Src: DiffItem.h
 PATCH: [ 1253950 ] cosmetic--remove old code in InitInstance
  Src: Merge.cpp
 PATCH: [ 1253951 ] trivial cosmetic comment upgrade in arg parsing
  Src: Merge.cpp

2005-10-02 Jochen
 Merge7z DllBuild 0015
  Merge7z: Merge7zCommon.cpp Merge7zCommon.h revision.txt
  Merge7z new files: Merge7z427.dsp Merge7z428.dsp Merge7z429.dsp
 Merge7zInstaller update
  Merge7zInstaller: Files.rc2 Installer.cpp Installer.rc

2005-09-30 Tim
 PATCH: [ 1309423 ] Small typo in MergeSwedish.rc
  Submitted by Hans Eriksson
  Src/Languages/Swedish: MergeSwedish.rc

2005-09-27 Perry
 PATCH: [ 1229867 ] RFE [ 1205516 ], RFE [ 887948 ], and other issues
  Cosmetic, transcribing comment from patch discussion
  Src: 7zCommon.cpp

2005-09-26 Kimmo
 PATCH: [ 1302608 ] crash on generating a report
  Submitted by Takashi Sawanaka
  Src: DirCmpReport.cpp

2005-09-24 Kimmo
 BUG: [ 1298687 ] The files marked as 'skipped' are compared
  Fix from Takashi Sawanaka, comment updates by me
   Src: DirScan.cpp

2005-09-23 Perry
 PATCH: [ 1301504 ] Danish ShellExtension translation
  Submitted by Christial List
   ShellExtension/Languages: ShellExtensionDanish.rc

2005-09-22 Kimmo
 PATCH: [ 1297642 ] Japanese translation update
  Submitted by Takashi Sawanaka
   ShellExtension/Languages: ShellExtensionJapanese.rc
   Src/Languages/Japanese: MergeJapanese.rc

2005-09-21 Kimmo
 PATCH: [ 1297406 ] updated hungarian translation
  Submitted by Márton Balázs
  Src/Languages/Hungarian: MergeHungarian.rc

2005-09-20 Kimmo
 PATCH: [ 1295701 ] Scrolling for dir compare report filename
  Src: Merge.rc
  Src/Languages: *.rc
 PATCH: [ 1295758 ] Update URL for downloads page (archive options)
  Src: PropArchive.cpp

2005-09-19 Tim
 PATCH: [ 1295767 ] German Translation for 'Highlight Line * Diff'
  Src/Languages/German: MergeGerman.rc

2005-09-19 Kimmo
 PATCH: [ 1294514 ] Set file loading traces debug-only
  Src: MergeDoc.cpp
 PATCH: [ 1295473 ] updated italian rc file for winmerge 2.3.6
  Submitted by Andrea Decorte
  Src/Languages/Italian: MergeItalian.rc

2005-09-16 Kimmo
 PATCH: [ 1292120 ] More significant diff navigations fixes
  Src: DiffList.cpp DiffList.h MergeDoc.cpp MergeEditView.cpp
 BUG: [ 1290305 ] ShellExtensionU.dll info missing from config log
  Src: ConfigLog.cpp

2005-09-15, Tim
 PATCH: [ 1292279 ] Various Updates in German Translation
  Src/Languages/German: MergeGerman.rc

2005-09-14 Kimmo
 PATCH: [ 1290477 ] Catalan translation update
  Submitted by Jordi Vilar
  Src/Languages/Catalan: MergeCatalan.rc

2005-09-13 Kimmo
 PATCH: [ 1289037 ] Some (non)significant diff count fixes
  Src: DiffList.cpp DiffList.h MergeDoc.cpp MergeEditView.cpp

2005-09-12 Kimmo
 PATCH: [ 1284150 ] Fix Shell Extension registering problem
  Also bump version to 1.6
  ShellExtension: ShellExtension.cpp ShellExtension.rc

2005-09-09, Perry
 BUG: [ 1284304 ] StaticLink crashes after mouse over event
  Changed signature of CStaticLink::OnSetCursor to start with CWnd *
  Src\Common: StaticLink.cpp StaticLink.h

2005-09-09, Tim
 PATCH: [ 1285404 ] Various Updates in German Translation
  Src/Languages/German: MergeGerman.rc

2005-09-08, Perry
 PATCH: [ 1284890 ] Use Changes.txt instead of readme.txt for ChangeLog
  Added ChangeLogs folder to project, and put Changes.txt (this),
  readme.txt, and CHANGELO into new ChangeLogs folder.
 PATCH: [ 1283466 ] French translation
  New translation by Jean-F Jolin
  Src/Languages/French: MergeFrench.rc

2005-09-07, Perry
 Previous change history is in file readme.txt

 2005-09-07
 Old history from 2002-11-18 through 2005-09-07.
 See Changes.txt for more up-to-date information.

2005-09-07 2.3.6 WinMerge beta 2.3.6.0 released
2005-09-07 R2_4 branch created for 2.4 release

2005-09-07 Kimmo
 PATCH: [ 1283217 ] Inactive linediff color is too bright
  Src: OptionsInit.cpp

2005-09-07 Perry
 PATCH: [ 1282587 ] Allow compare 2 items when one on both sides
  Src: DiffItem.h DirActions.cpp DirView.cpp
 BUG: [ 1283986 ] Cannot drill into directories
  Src: DirView.cpp

2005-09-06 Kimmo
 PATCH: [ 1273040 ] Fix buffer handling in Quick Compare
  Submitted by Perry
  Src: DiffWrapper.cpp
 PATCH: [ 1282322 ] Use different cursor (hand) with static link
  Src: Merge.dsp Merge.rc resource.h
  Src/Common: StatLink.cpp StatLink.h
  Src/res new file: hand.cur
  Src/Languages: *.rc resource.h
  Src/Languages/*/res new file: hand.cur

2005-09-05, Perry
 PATCH: [ 1281371 ] Allow comparing 2 items against each other in DirView
  Src: DirActions.cpp DirView.cpp DirView.h

2005-09-05 Kimmo
 PATCH: [ 1281735 ] Don't silently overwrite project file
  Src: OpenDlg.cpp

2005-09-04 Perry
 Cosmetic: Perry adding comments about usage of dllpstub
  Src: dllpstub.cpp dllpstub.h markdown.h
 Cosmetic: Adding comment about 7ZCommon.h include of dllpstub.h, which is not obvious
  Src: 7ZCommon.h
 Cosmetic: Adding class comment to union CMarkdown::_HSTR
  Src: markdown.h

2005-09-04 Kimmo
 PATCH: [ 1281059 ] Avoid uninitialised members in CLanguageSelect
  Submitted by Csaba Raduly
  Src/Common: LanguageSelect.cpp

2005-09-01 WinMerge experimental release 2.3.5.4 (cvs)

2005-09-01 Kimmo
 PATCH: [ 1278708 ] Updated Swedish.rc for 2.4
  Submitted by Hans Eriksson
  Src/Languages/Swedish: MergeSwedish.rc
 PATCH: [ 1276921 ] Replace 'Directory' with 'Folder' in Open-dialog
  Src: Merge.rc

2005-08-31 Jochen
 PATCH: [ 1275273 ] Convert CDirView to use LVN_GETDISPINFO
 BUG: [ 1275247 ] Temp path shown in caption
 BUG: [ 1275711 ] No backslash between top-level archive directories in header
  Src: DirDoc.cpp DirDoc.h DirView.cpp DirView.h DirViewColHandler.cpp

2005-08-31 Perry
 BUG: [ 1277300 ] version number
 PATCH: [ 1277596 ] Fix version string (IDS_VERSION_FMT) in Portuguese
  Fix IDS_VERSION_FMT string for Portuguese/Brazilian (was missing %1)
  Src/Languages/Brazilian: MergeBrazilian.rc

2005-08-31 Kimmo
 PATCH: [ 1265182 ] cannot transfer cmdargs from WinMergeU to WinMerge
  Submitted by Takashi Sawanaka
  Src: MainFrm.cpp MainFrm.h Merge.cpp
 PATCH: [ 1276916 ] Add Window/Close All menuitem
  Src: MainFrm.cpp MainFrm.h Merge.rc resource.h
  Src/Languages: *.rc resource.h
 PATCH: [ 1277420 ] Swedish translation update for 2.4
  Submitted by Hans Eriksson
  Src/Languages/Swedish: MergeSwedish.rc
  ShellExtension/Languages: ShellExtensionSwedish.rc
 PATCH: [ 1277588 ] Change lstrcpyW to wcscpy
  Submitted by Perry
  Src: MainFrm.cpp Merge.cpp

2005-08-30 Kimmo
 PATCH: [ 1275833 ] Fix difference navigation with ignored diffs
  Src: DiffList.cpp DiffList.h MergeDoc.cpp MergeEditView.cpp
 PATCH: [ 1275940 ] Merge/Delete enabled for single item only
  Src: DirView.cpp
 PATCH: [ 1276588 ] Catalan translation update
  Submitted by Jordi Vilar
  ShellExtension/Languages: ShellExtensionCatalan.rc
  Src/Languages/Catalan: MergeCatalan.rc

2005-08-29 Kimmo
 PATCH: [ 1275345 ] Archive support options
  Src: Merge.dsp Merge.rc OptionsDef.h OptionsInit.cpp resource.h
  Src new files: PropArchive.cpp PropArchive.h
  Src/Common: PreferencesDlg.cpp PreferencesDlg.h

2005-08-28 Kimmo
 PATCH: [ 1274504 ] Build Shellextension dlls to same folders than WinMerge.exes
  ShellExtension: ShellExtension.dsp
 BUG: [ 1269022 ] Additional backslash shown for root paths
  Src: PathContext.cpp

2005-08-26 Kimmo
 PATCH: [ 1273222 ] Change COpenDlg::SelectFile() to show resizable dialog
  Src: OpenDlg.cpp
 PATCH: [ 1267510 ] Allow stopping quick compare after first difference
  Src: DiffContext.cpp DiffContext.h DiffWrapper.cpp DiffWrapper.h DirDoc.cpp
   Merge.rc OptionsDef.h OptionsInit.cpp PropCompare.cpp PropCompare.h resource.h
  Src/Common: PreferencesDlg.cpp
  Src/Languages: *.rc resource.h

2005-08-25 Perry
 PATCH: [ 1273039 ] Fix fencepost error in binary check in QuickCompare
  (Fix plus some improved commenting)
  Src: DiffWrapper.cpp
 PATCH: [ 1269567 ] Abortable quick compare
  Src: DiffContext.cpp DiffContext.h DiffItem.h DiffThread.cpp
   DiffWrapper.cpp DiffWrapper.h DirCompStateBar.cpp DirCompStateBar.h
   DirDoc.cpp DirScan.cpp DirScan.h DirView.cpp DirViewColItems.cpp
   Merge.dsp Merge.rc resource.h stringdiffs.cpp
  Src new files: IAbortable.h

2005-08-25 Jochen
 Fix broken Merge7z::GuessFormatByExtension()
  Merge7z: Merge7zCommon.cpp Merge7zCommon.h revision.txt

2005-08-24 WinMerge experimental release 2.3.5.3 (cvs)

2005-08-24 Kimmo
 PATCH: [ 1267375 ] Allow to resize file open/save dialog
  Src: Merge.cpp
 PATCH: [ 1267383 ] Use our SelectFile() to select Project file to open
  Src: MainFrm.cpp
 PATCH: [ 1267520 ] byte_compare_files() opens files in text mode
  From Perry
  Src: DiffWrapper.cpp
 PATCH: [ 1265045 ] GUI freeze after changing language
  Submitted by Takashi Sawanaka
  Src: ChildFrm.h DirFrame.h
  Src/Common: LanguageSelect.cpp

2005-08-24 Jochen
 PATCH: [ 1264728 ] Guess archive format by signature
  src: 7zCommon.cpp ConfigLog.cpp Merge.rc resource.h

2005-08-23 Jochen
 PATCH: [ 1264723 ] Merge7z DllBuild 0013
  Merge7z: Merge7z.h Merge7zCommon.cpp Merge7zCommon.h StdAfx.h tools.cpp tools.h revision.txt
  Merge7z new files: Merge7z423.dsp Merge7z424.dsp Merge7z425.dsp Merge7z426.dsp

2005-08-23 Kimmo
 PATCH: [ 1266442 ] Small cleanup for ShellExtension
  Also bump version number to 1.5
  ShellExtension: ShellExtension.rc WinMergeShell.cpp
 PATCH: [ 1266476 ] Add ending backslash for directories opened from commandline
  Src: MainFrm.cpp

2005-08-22 Kimmo
 PATCH: [ 1265006 ] Japanese translation update
  Submitted by Takashi Sawanaka
  Src/Languages/Japanese: MergeJapanese.rc

2005-08-22 Jochen
 Fix bugs from PATCH: [ 1247875 ] codepage detection based on CMarkdown class
 - sscanf() was used in an unsafe way
 - GuessCodepageEncoding() did not work
  Src: codepage_detect.cpp
 PATCH: [ 1264721 ] Change AllowUpwardDirectory() policy
  Src: DirDoc.cpp DirDoc.h DirView.cpp MainFrm.cpp Merge.rc resource.h

2005-08-21 Kimmo
 PATCH: [ 1264957 ] fix Bug:[ 1246957 ] 2.3.4 regular expression replace borked
  Submitted by Takashi Sawanaka
  Src/editlib: cregexp.cpp

2005-08-20 Jochen
 PATCH: [ 1247875 ] codepage detection based on CMarkdown class
  Src: codepage_detect.cpp codepage_detect.h markdown.cpp markdown.h

2005-08-19 Kimmo
 BUG: [ 1262229 ] Crash with differing line endings and View Line Differences
  Src/editlib: ccrystaltextview.cpp

2005-08-18 Kimmo
 PATCH: [ 1261220 ] Add Compare item for dirview menus
  Src: DirActions.cpp DirView.cpp DirView.h Merge.rc resource.h
  Src/Languages: *.rc resource.h
 PATCH: [ 1262428 ] Fix toolbar problems with XP theming
  Src: MainFrm.cpp Merge.dsp
  Src/Common new files: ToolBarXPThemes.cpp ToolBarXPThemes.h

2005-08-17 Kimmo
 PATCH: [ 1260244 ] Initialization of non-existing struct-members in editor
  Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
 PATCH: [ 1261244 ] Proper update for Merge/Delete-menuitem
  Src: DirView.cpp DirView.h

2005-08-16 Kimmo
 PATCH: [ 1258270 ] ShellExtension: allow re-selecting first item
  ShellExtension: Resource.h ShellExtension.rc WinMergeShell.cpp WinMergeShell.h
  ShellExtension/Languages: *.rc
 PATCH: [ 1260258 ] Show origin side for Copy To.. folder browse dialog
  Src: DirActions.cpp Merge.rc resource.h
  Src/Languages: *.rc resource.h

2005-08-14 Kimmo
 PATCH: [ 1255864 ] Different icons for Folder and File Comparison
  Icon submitted by Tim
  Src: Merge.cpp Merge.rc resource.h
  Src/res new file: MergeDir.ico
  Src/Languages: *.rc resource.h
  Src/Languages/res new file: MergeDir.ico
 PATCH: [ 1258063 ] Fix cursor position after pane change
  Src: MergeEditView.cpp
 PATCH: [ 1258584 ] Catalan translation update
  Submitted by Jordi Vilar
  Src/Languages/Catalan: MergeCatalan.rc
  ShellExtension/Languages/ShellExtensionCatalan.rc

2005-08-12 Kimmo
 PATCH: [ 1253326 ] Allow opening files to external editor from file compare
  Src: Merge.rc MergeEditView.cpp MergeEditView.h resource.h
  Src/Languages: *.rc resource.h

2005-08-11 Kimmo
 PATCH: [ 1244009 ] Add userflags to diffitem and remember hidden status
  Src: DiffItem.h DiffItemList.cpp DiffItemList.h DirDoc.cpp DirDoc.h
   DirView.cpp DirView.h Merge.rc resource.h
  Src/Languages: *.rc resource.h

2005-08-10 WinMerge experimental release 2.3.5.2 (cvs)

2005-08-10 Kimmo
 BUG: [ 1254903 ] WinMerge 2.3.5.1: Not enough memory at File Comparison
  Fix from Perry
  Src: DiffList.cpp

2005-08-08 WinMerge experimental release 2.3.5.1 (cvs)

2005-08-07 Perry
 PATCH: [ 1248259 ] Preserve trivial diffs in diff chain
  Src: DiffList.cpp DiffList.h DiffWrapper.cpp LocationView.cpp
   LocationView.h MergeDiffDetailView.cpp MergeDiffDetailView.h
   MergeDoc.cpp MergeEditView.cpp MergeEditView.h

2005-08-07 Kimmo
 PATCH: [ 1253100 ] Shorter paths in captions
  Src: DirDoc.cpp MergeDoc.cpp paths.cpp paths.h
 PATCH: [ 1253205 ] Remove dynamic dll loading from FilePathEdit
  Src: FilePathEdit.cpp FilePathEdit.h
 PATCH: [ 1253350 ] Use new-style folder browse dialog
  Src: Merge.cpp

2005-08-06 Kimmo
 PATCH: [ 1201945 ] Localization of ShellExtension.dll
  Submitted by Takashi Sawanaka
  ShellExtension: Register.bat ShellExtension.dsp ShellExtension.rc WinMergeShell.cpp
  shellExtension new file: ShellExtensionU.def
  ShellExtension new folder: Languages

2005-08-05 Kimmo
 PATCH: [ 1252076 ] Improve About-dialog (unicode info, better layout)
  Src: Merge.cpp Merge.rc resource.h
  Src/Languages: *.rc resource.h
 PATCH: [ 1238168 ] Convert using BCMenu with pointers
  Src: MainFrm.cpp MainFrm.h MergeEditView.cpp

2005-08-04 Kimmo
 BUG: [ 1247700 ] Cannot browse to parent folders of selected folders
  Fix from Jochen
  Src: DirDoc.cpp

2005-07-31 Perry
 PATCH: [ 1248180 ] fix moved block code
 BUG: [ 1248172 ] Assert failure in CDiffWrapper::RunFileDiff
 BUG: [ 1186199 ] Assert from moved block code
  Src: DiffWrapper.cpp

2005-07-30 Perry
 PATCH: [ 1247483 ] Create folder if one doesn't exist (for reports and patches)
 BUG: [ 1248017 ] WinMerge\Src\DirCmpReport.cpp(80) : error C2065: 'IDS_FOLDER
  Creating IDS_FOLDER_NOTEXIST as "Folder does not exist." and checking in to cvs trunk.
   Src: Merge.rc resource.h
   Src/Languages: resource.h Merge*.rc
 Cosmetic: grammar fix in comment ("same...than" => "same...as")
  Src/LocationView.cpp

2005-07-30 Kimmo
 PATCH: [ 1247375 ] Use Shell Edit command primarily to open files
  Src: DirActions.cpp
 PATCH: [ 1247483 ] Create folder if one doesn't exist (for reports and patches)
  Src: DirCmpReport.cpp PatchTool.cpp

2005-07-29 Kimmo
 PATCH: [ 1245773 ] Scan full files in quick contents compare
  Src: DiffWrapper.cpp

2005-07-26 Kimmo
 PATCH: [ 1208493 ] Suggest change in title of codepage options
  Src: Merge.rc
  Src/Languages: *.rc

2005-07-26 Perry
 PATCH: [ 1242008 ] Update status to binary if open fails because binary
  Src: DiffItem.h DiffItemList.cpp DiffItemList.h DirDoc.h DirView.cpp
   MainFrm.cpp MainFrm.h MergeDoc.cpp MergeDoc.h
 PATCH: [ 1208208 ] Move resizeable dialogs position in registry
  Src: OpenDlg.cpp SaveClosingDlg.cpp
  Src/Common: CMoveConstraint.cpp CMoveConstraint.h

2005-07-26 Kimmo
 PATCH: [ 1244804 ] Add hourglass for report creating
  Src: DirCmpReport.cpp Merge.rc resource.h
  Src/Languages: *.rc resource.h
 Remove invalid ASSERT
  Src: CompareStats.cpp
 PATCH: [ 1238174 ] Fix diff counts in quick contents compare
  Src: DiffWrapper.cpp DirScan.cpp
 Handle empty filename for report
  Src: DirCmpReportDlg.cpp

2005-07-26 Perry
 PATCH: [ 1241270 ] Fix paths.cpp GetDirName for root paths
  Src: paths.cpp
 PATCH: [ 1241275 ] New Shared or Private Filter dialog
  Src: FileFilterHelper.cpp FileFilterHelper.h FileFiltersDlg.cpp
   Merge.dsp Merge.rc paths.cpp paths.h resource.h
  Src new files: SharedFilterDlg.cpp SharedFilterDlg.h
 PATCH: [ 1241275 ] New Shared or Private Filter dialog
  New shared filter dialog
   Src/Languages: */Merge*.rc */resource.h

2005-07-25 Perry
 BUG: [ 1241766 ] Debug warning: Warning: no listbox item selected.
  Src/Common: LanguageSelect.cpp LanguageSelect.h
 PATCH: [ 1244808 ] Remove LanguageSelect include from Merge.h
  Src: codepage.cpp DirActions.cpp Merge.cpp Merge.h
  Src/Common: LanguageSelect.h
 PATCH: [ 1241962 ] Record zero byte location info
  Src/Common: UniFile.cpp UniFile.h

2005-07-25 Kimmo
 PATCH: [ 1243655 ] Directory compare reporting
  Src: DirView.cpp DirView.h DirViewColItems.cpp Merge.dsp Merge.rc resource.h
  Src new files: DirCmpReport.cpp DirCmpReport.h DirCmpReportDlg.cpp DirCmpReportdlg.h
  Src/Common: coretools.h coretools.cpp
  Languages: *.rc resource.h
 BUG: [ 1244415 ] Bad T2A call in DirCmpReport::SaveToFile
  Src: DirCmpReport.cpp

2005-07-24 Perry
 PATCH: [ 1242297 ] Fix CPatchDlg::OnOK for empty paths & greatly simplify
  Src: Merge.rc PatchDlg.cpp resource.h 
  Src/Languages: */resource.h */Merge*.rc
  
2005-07-24 Kimmo
 PATCH: [ 1220485 ] Move Redisplay() from doc to view
  Src: DirDoc.cpp DirDoc.h DirView.cpp DirView.h DirViewColHandler.cpp

2005-07-24 Perry
 PATCH: [ 1211574 ] Wrap GetTempPath and GetTempFileName for CString use
  Src: DiffWrapper.cpp FileTransform.cpp PathContext.cpp VSSHelper.cpp
   paths.cpp paths.h
 PATCH: [ 1241930 ] Rename stringdiffs_Get to sd_ComputeWordDiffs
  (This is cosmetic function rename)
  Src: MergeDocLineDiffs.cpp stringdiffs.cpp stringdiffs.h stringdiffsi.h

2005-07-23 Kimmo
 BUG: [ 1241289 ] Edit point or "anchor" not updated when navigating diffs
  Src: MergeEditView.cpp
 PATCH: [ 1243221 ] Cleanup CompareStats
  Src: CompareStats.cpp CompareStats.h DiffThread.cpp DirCompStateBar.cpp
   DirCompStateBar.h DirDoc.cpp 

2005-07-22 Perry
 PATCH: [ 1242339 ] Fix CMergeDoc::Rescan to set bIdentical in all cases
  Src: DiffWrapper.cpp DiffWrapper.h MergeDoc.cpp PatchTool.cpp
 BUG: [ 1241990 ] Typo in MergeDoc.h: additionnal => additional
  Fix spelling additionnal => additional
  Src: MergeDoc.h MergeEditView.h

2005-07-21 Perry
 PATCH: [ 1226311 ] Record notes about why compare failed
  Src: DiffItem.h DiffWrapper.cpp DiffWrapper.h

2005-07-20 Perry 
 PATCH: [ 1241753 ] Fix DirViewColItems int64 cast warnings
  Src: DirViewColItems.cpp
 Cosmetic: Add function header comment to CMergeDoc::GetWordDiffArray
  Src: MergeDocLineDiffs.cpp

2005-07-19 Kimmo
 PATCH: [ 1238194 ] Use proper member names in MergeDiffDetailView
  Src: MergeDiffDetailView.cpp MergeDiffDetailView.h
 PATCH: [ 1236623 ] Increase Quick contents compare buffer size
  Src: DiffWrapper.cpp

2005-07-18 Perry
 BUG: [ 1232382 ] Inconsistent language name casing in Spanish UI (v2.3.4.0)
  Make all language names capitalized in Spanish, as in Catalan
   Src/Languages/Spanish: MergeSpanish.rc
 Cosmetic: add explanatory comments to comment inside of SetResourceVersions.wsf
  Src: SetResourceVersions.wsf

2005-07-17 Jochen
 BUG: [ 1239605 ] Cannot open diff due to 7zip error
  Src: DirView.cpp

2005-07-17 Perry
 PATCH: [ 1239275 ] Fixes for sd_ComputeByteDiff
  Src: stringdiffs.cpp

2005-07-15 Jochen
 PATCH: [ 1229867 ] RFE [ 1205516 ], RFE [ 887948 ], and other issues (w/o command line tool integration)
  Src: 7zCommon.cpp 7zCommon.h DiffContext.cpp DiffItem.cpp DiffItem.h DiffThread.cpp DiffWrapper.cpp DirActions.cpp DirDoc.cpp
   DirDoc.h DirScan.cpp DirScan.h DirView.cpp DirView.h DirViewColItems.cpp FileFilterHelper.h MainFrm.cpp MergeDoc.cpp
 PATCH: [ 1225880 ] Project file parsing based on CMarkdown class
  Src: markdown.cpp markdown.h ProjectFile.cpp

2005-07-13 Kimmo
 PATCH: [ 1236602 ] Add icon for messagebox about overwriting patch file
  Src: PatchDlg.cpp
 PATCH: [ 1236598 ] Add binary file check to quick contents compare
  Src: ByteComparator.cpp ByteComparator.h DiffWrapper.cpp

2005-07-11 Perry
 PATCH: [ 1229024 ] Rename CPropFilter to CPropLineFilter
  Remove PropFilter.cpp PropFilter.h
  Add PropLineFilter.cpp PropLineFilter.h
  Src: Merge.dsp MainFrm.cpp
 PATCH: [ 1229024 ] Rename CPropFilter to CPropLineFilter
  Rename class
   Src: PropLineFilter.cpp PropLineFilter.h
 PATCH: [ 1234629 ] New Chinese(Simplified) translation .rc file
  Src/Languages: MergeChineseSimplified.rc

2005-07-08 Tim
 PATCH: [ 1232760 ] Icon for 'Merge->Delete'
  Src: MainFrm.cpp Merge.rc resource.h
  Src/res new file: delete.bmp
  Src/Languages: *.rc resource.h
  Src/Languages/res new file: delete.bmp

2005-07-08 Kimmo
 PATCH: [ 1234390 ] Compare >2 MB files with quick contents
  Src: DiffWrapper.cpp DiffWrapper.h DirScan.cpp
 PATCH: [ 1234793 ] Patch generate: 11-line context doesn't work
  Src: PatchDlg.cpp

2005-07-07 Kimmo
 PATCH: [ 1232499 ] Language dialog box Simplified Chinese's name correction
  Submitted by xmpdhml at sourceforge.net
  Src/Common: LanguageSelect.cpp

2005-06-30 WinMerge beta 2.3.4.0 released

2005-06-30 Kimmo
 PATCH: [ 1228647 ] MergeCatalan.rc v209 update
  Submitted by Jordi Vilar
  Src/Languages/Catalan: MergeCatalan.rc
 PATCH: [ 1230344 ] MergeSwedish.rc for 2.3.4.0 beta
  Submitted by Hans Eriksson
  Src/Languages/Swedish: MergeSwedish.rc
 PATCH: [ 1229867 ] RFE [ 1205516 ], RFE [ 887948 ], and other issues
  Submitted by Jochen, apply some parts now:
  DIFFITEM API cleanup, use const CString&
   Src: DiffItem.cpp DiffItem.h
  Add missing ProgressBar initialisation
   Src: DirCompStateBar.cpp
  Misc cleanups and optimizations
   Src: DirDoc.cpp DirDoc.h DirView.cpp DirView.h
  Cannot create valid (archive) temp paths without valid document pointer
   Src: MainFrm.cpp
 PATCH: [ 1193262 ] Switch language on run-time not change all menus
  Src/Common: LanguageSelect.cpp

2005-06-29 Perry
 PATCH: [ 1220421 ] warning in cvs trunk (probably a bool/BOOL mismatch)
  Src: DirDoc.cpp

2005-06-29 Kimmo
 PATCH: [ 1229315 ] Fix item number for non-recursive compare
  Src: DirView.cpp
 PATCH: [ 1229297 ] Align filesize column text to right
  Src: DirView.cpp DirView.h DirViewColHandler.cpp DirViewColItems.cpp DirViewColItems.h
 PATCH: [ 1229164 ] Add dir compare progress info
  Src: CompareStats.cpp CompareStats.h DiffThread.cpp DirCompStateBar.cpp
   DirCompStateBar.h DirDoc.cpp DirScan.cpp DirView.cpp Merge.rc Resource.h
  Src/Languages: *.rc resource.h

2005-06-27 Christian
 PATCH: [ 1219818 ] Plugin to display XML files
  Two new dirs added:
  Src/ExpatLib - This is the expat xml parser version 1.95.8
  Plugins/src_VCPP/DisplayXMLFiles - A plugin which uses the expat parser

2005-06-27 Perry
 PATCH: [ 1213781 ] Fill item location into statusbar in dirview
  DirFrame.cpp DirFrame.h DirView.cpp DirView.h Merge.rc resource.h
 Apply new strings to translated resource files
  (IDS_DIRVIEW_STATUS_FMT_FOCUS & IDS_DIRVIEW_STATUS_FMT_NOFOCUS)
  Src/Languages: *.rc resource.h
 Docs/Users/Manual/Filters.xml
  (First line in file filters description) Minor grammar fixes, 
  and rewrite of one incomprehensible line.
 Add example user-specific filter paths to manual.
 Add example paths to function header comment of FileFilterHelper::LoadFileFilterDirPattern
  Docs/Users/Manual/Filters.xml
  Src/FilterFilterHelper.cpp
 BUG: [ 1228493 ] Copy Pathnames/Right doesn't work
  Src: DirView.cpp

2005-06-23 Kimmo
 BUG: [ 1225257 ] cvs: FileFilters broken?
  Restore behavior in 2.3.3.5 and earlier for directory filtering
  Src: DirScan.cpp

2005-06-22 Jochen
 RFE: [ 1205833 ] You can unzip more than just zip #1: Treat .ear and .war like .zip
  Merge7z: Merge7zCommon.cpp Merge7zCommon.h revision.txt
 Change recommended version of 7-Zip to 4.20; remove noise from Merge7z Nagbox
  Src: 7zCommon.cpp  
 PATCH: [ 1215162 ] Merge7zInstaller update
  Merge7zInstaller: Files.rc2 Installer.cpp Installer.rc Merge7zInstaller.dsp 

2005-06-22 Kimmo
 PATCH: [ 1225090 ] Fix bug that additional item gets selected in dircompare
  Src: DirActions.cpp

2005-06-22 Perry
 Cosmetic: Fix grammar in comment (directory -> directories)
  Src: FileFilterHelper.cpp

2005-06-21 Kimmo
 PATCH: [ 1223754 ] Improve dircompare stats system
  Src: DiffContext.cpp DiffContext.h DiffThread.cpp DirCompareStateBar.cpp
   DirCompareStateBar.h DirDoc.cpp DirDoc.h DirFrame.cpp DirFrame.h DirScan.cpp
   DirScan.h DirView.cpp Merge.dsp
  Src new files: CompareStats.cpp CompareStats.h

2005-06-21 WinMerge experimental release 2.3.3.6 (cvs)

2005-06-21 Kimmo
 PATCH: [ 1224249 ] Use constant for dirview special items
  Src: DirActions.cpp DirView.cpp DirView.h

2005-06-17 Kimmo
 PATCH: [ 1221672 ] MergeSwedish. rc 1.207 update
  Submitted by Hans Eriksson
  Src/Languages/Swedish: MergeSwedish.rc
 BUG: [ 1222705 ] DiffFileInfo copy constructor broken (current CVS)
  Src: DiffFileInfo.cpp DiffFileInfo.h DiffItem.cpp DiffItem.h FileInfo.cpp FileInfo.h
 PATCH: [ 1220492 ] Improve backup-fail message to show actual filename
  Src: MainFrm.cpp Merge.rc
  Src/Languages: *.rc

2005-06-15 Kimmo
 PATCH: [ 1220472 ] Don't lose selection when deleting items from dir compare
  Src: DirActions.cpp

2005-06-15 Perry
 PATCH: [ 1220416 ] error C2065: '_stat' : undeclared identifier
  Src: DirScan.cpp

2005-06-13 Kimmo
 PATCH: [ 1219333 ] Wrong confirmation message when deleting unique items
  Src: DirActions.cpp
 PATCH: [ 1218661 ] Rescan selected items
  Src: DiffItem.h DiffThread.cpp DiffThread.h DirActions.cpp DirDoc.cpp DirDoc.h
   DirScan.cpp DirScan.h DirView.cpp DirView.h Merge.rc resource.h
  Src/Languages: *.rc resource.h

2005-06-12 Kimmo
 BUG: [ 1218133 ] German options dialog is too wide
  Src/Languages/German: MergeGerman.rc
 PATCH: [ 1213634 ] Don't store two path copies in PathContext
  Src: PathContext.cpp PathContext.h

2005-06-11 Tim
 BUG: [ 1218096 ] Options: 'Line Diff Coloring' frame don't fit
  Src: Merge.rc
  Src/Languages: *.rc

2005-06-11 Perry
 PATCH: [ 1217850 ] French Translation R2_3_5
  Updated French translation by Jean-F Jolin
  Src/Languages/French: MergeFrench.rc
 PATCH: [ 1213909 ] Updated Dutch translation
  Dutch update by Jigal van Hemert
  (for 2.2, but propagating many translations to trunk)
   Src/Languages/Dutch: MergeDutch.rc

2005-06-08 Kimmo
 PATCH: [ 1213649 ] Add copyconstructor to (Diff)FileInfo
  Src: DiffFileInfo.cpp DiffFileInfo.h FileInfo.cpp FileInfo.h
 PATCH: [ 1205724 ] Two-phase directory compare
  Src: 7zCommon.cpp 7zCommon.h DiffContext.cpp DiffContext.h DiffThread.cpp
   DirActions.cpp DirDoc.h DirScan.cpp DirScan.h DirView.cpp DirView.h
   DirViewColHandler.cpp Merge.dsp 
  Src new files: DiffItem.cpp DiffItem.h DiffItemList.cpp DiffItemList.h

2005-06-08 Perry
 PATCH: [ 1213238 ] noninteractive switch
  Src: MainFrm.cpp MainFrm.h Merge.cpp Merge.dsp Merge.h
  Src new files: CmdArgs.cpp CmdArgs.h

2005-06-08 WinMerge experimental release 2.3.3.5 (cvs)

2005-06-08 Kimmo
 PATCH: [ 1216706 ] Ignore case for project file file-extension
  Src: Merge.cpp
 BUG: [ 1216821 ] Untitled buffers, Save doesn't work
  Src: MergeDoc.cpp

2005-06-08 Perry
 Remove nonexistent stampver.inf from Merge.dsp
  (No patch because sourceforge.net is unresponsive)
  Src: Merge.dsp

2005-06-07 Kimmo
 PATCH: [ 1216033 ] Options to enable/disable multiple compare documents
  Src: DirDoc.cpp DirDoc.h DirView.cpp MainFrm.cpp MainFrm.h Merge.rc
   OptionsDef.h OptionsInit.cpp PropGeneral.cpp PropGeneral.h resource.h
  Src/Common: PreferencesDlg.cpp
  Src/Languages: *.rc resource.h

2005-06-06 Kimmo
 PATCH: [ 1215235 ] Allow removing items from comboboxes
  Src: OpenDlg.cpp OpenDlg.h
  Src/Common: SuperComboBox.cpp

2005-06-05 Tim
 RFE: [ 1203923 ] New refresh icon
  Src/res: Toolbar.bmp
  Src/Languages: Toolbar.bmp

2005-06-04 Kimmo
 PATCH: [ 1214575 ] Add 'Delete' item for dir compare main menu
 Trying again applying languages..
  Src/Languages: *.rc resource.h

2005-06-05 Jochen
 Support 7-Zip 4.20
  Merge7z new files: Merge7z420.dsp

2005-06-04 Kimmo
 PATCH: [ 1214575 ] Add 'Delete' item for dir compare main menu
  Src: DirActions.cpp DirView.cpp DirView.h Merge.rc resource.h
  Src/Languages: *.rc resource.h

2005-06-02 Perry
 PATCH: [ 1213161 ] Set return code based on last diff result
 Src: DirDoc.cpp Merge.cpp Merge.h MergeDoc.cpp

2005-06-01 Perry
 Add commenting & array bounds checking to CMergeApp::LoadProjectFile
  Src: Merge.cpp

2005-06-01 Kimmo
 PATCH: [ 1210059 ] Sanity check difference before merging it
  Src: Merge.rc MergeDoc.cpp MergeDoc.h resource.h
  Src/Languages: *.rc resource.h

2005-05-31 Perry
 PATCH: [ 1206727 ] decouple codepage module from options files
  Src: codepage.cpp codepage.h MainFrm.cpp MainFrm.h
  Src/Common: LanguageSelect.cpp
 BUG: [ 1209386 ] Comparing by quick differences jams WinMerge
  Src: ByteComparator.cpp

2005-05-27 Kimmo
 PATCH: [ 1209294 ] Remove running stampver-tool post-build
  Src: Merge.dsp

2005-05-26 Kimmo
 BUG: [ 1201463 ] Prediffer submenu looks broken
  Src: Merge.rc
  Src/Languages: *.rc
 BUG: [ 1198263 ] MergeKorean translation credit wrong?
  Src/Languages/Korean: MergeKorean.rc
 BUG: [ 1208504 ] Newer right file marked identical comparing by modified date
  Src: DirScan.cpp

2005-05-26 Jochen
 PATCH: [ 1191245 ] Merge7z DllBuild 0011
  Merge7z: Merge7z311.cpp Merge7z409.cpp Merge7zCommon.cpp Merge7zCommon.h revision.txt
   Merge7z416.dsp Merge7z417.dsp Merge7z418.dsp Merge7z419.dsp
 PATCH: [ 1191248 ] Merge7zInstaller update
  Merge7zInstaller: Files.rc2 Installer.cpp Installer.rc Merge7zInstaller.dsp

2005-05-26 Kimmo
 PATCH: [ 1208537 ] Small cleanup for CDirView::OpenSelection()
  Src: DirView.cpp
 PATCH: [ 1208801 ] SetFilter() must set default filter in error case
  Src: FileFilterHelper.cpp FileFilterHelper.h MainFrm.cpp OpenDlg.cpp OptionsInit.cpp

2005-05-25 Kimmo
 PATCH: [ 1207820 ] Remove non-const GetPath() from PathContext
  Src: PathContext.h
 Remove unused strings from CDirView::GetItemFileNames()
  Src: DirActions.cpp

2005-05-25 Perry
 PATCH: [ 1206753 ] Make SaveClosing dialog resizable
  Src: Merge.rc SaveClosingDlg.cpp SaveClosingDlg.h

2005-05-24 Perry
 PATCH: [ 1206808 ] Store temp filename in variable in FileTransform_Unpacking
  Src: FileTransform.cpp
 PATCH: [ 1206757 ] Remove unneeded include from DiffViewBar.cpp
  Src: DiffViewBar.cpp
 PATCH: [ 1206732 ] Remove unneeded include from VssPrompt.cpp
  Src: VssPrompt.cpp
 BUG: [ 1207417 ] Two GetDocument() functions in CDirView
  Cosmetic: Added explanatory comment per discussion
  Src: DirView.h
 PATCH: [ 1206755 ] Remove unneeded include from ColorButton.cpp
  Src: ColorButton.cpp
 PATCH: [ 1206734 ] Remove unneeded include from FilepathEdit.cpp
  Src: FilepathEdit.cpp
 PATCH: [ 1206730 ] Remove meaningless comments on includes in Splash.cpp
  Src: Splash.cpp
 PATCH: [ 1208198 ] Update CMoveConstraint with settable grip
  Src/Common: CMoveConstraint.cpp CMoveConstraint.h

2005-02-23 Kimmo
 PATCH: [ 1206647 ] Add trailing slash to MRU paths
  Src: MainFrm.cpp

2005-05-21 Perry
 PATCH: [ 1206085 ] Translate new options dialog to German
  Src/Languages/German: MergeGerman.rc

2005-05-20 Perry
 PATCH: [ 1187777 ] New LoadConfig function
  Src/Common: OptionsMgr.cpp OptionsMgr.h
  Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp MainFrm.h
   Merge.rc resource.h

2005-05-18 WinMerge experimental release 2.3.3.4 (cvs)

2005-05-18 Kimmo
 PATCH: [ 1203680 ] Fix tab adding spaces in unicode builds
  Src/editlib: ccrystaltextview.cpp
 PATCH: [ 1203615 ] Fix opening manual from new Options-dialog
  Src/Common: PreferencesDlg.cpp PreferencesDlg.h

2005-05-18 Perry
 PATCH: [ 1197969 ] New script to update production version in translations
  Src new files: SetResourceVersions.bat SetResourceVersions.wsf
  Docs/Developers/readme-developers.html.
 PATCH: [ 1201804 ] Fix anchor & caret in shift-f4 operation
  Src: MergeDocLineDiffs.cpp
  Src/editlib: ccrystaltextview.h
 Update language count (19->21, three occurrences)
  Docs/Developers/readme-developers.html.
 Note that sourceforge tracker doesn't display tabs.
  Docs/Developers/readme-developers.html.

2005-05-17 Perry
 PATCH: [ 1203707 ] tiny code rearrangement for debugging
  Src: MergeDoc.cpp

2005-05-17 Kimmo
 PATCH: [ 1203079 ] Don't ask about saving files after options change
  Src: MainFrm.cpp MergeEditView.cpp
 PATCH: [ 1202813 ] Swedish translated ReadMe.txt
  Submitted by Hans Eriksson
  Docs/Users/Languages: ReadMe-Swedish.txt
 PATCH: [ 1201834 ] Remove old readme-translations
  Removed files: Docs/Users/Languages: *.rtf Contributors.txt Read me.txt

2005-05-16 Kimmo
 Add change to DirView.cpp I missed from patch #1184626 (single instance/multidoc)
  Src: DirView.cpp

2005-05-15 Perry
 PATCH: [ 1201961 ] Japanese translation update
  (version 2, to translate syntax colors)
  Src/Languages/Japanese: MergeJapanese.rc
 PATCH: [ 1188787 ] New Chinese translation rc file (from PATCH 1183476)
  More dialogs, and most of the strings
  Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
 PATCH: [ 1202060 ] Recognize .lang files as having versioninfo
  Src: DiffContext.cpp

2005-05-14 Perry
 PATCH: [ 1201703 ] Swedish MergeSwedish.rc update
  Src/Languages/MergeSwedish.rc
 (Copy update note from this readme to Docs/Users/Manual/readme.txt
  for patch 1199600)
 PATCH: [ 1188787 ] New Chinese translation rc file (from PATCH 1183476)
  Applied some dialog translations.
  Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
 PATCH: [ 1201961 ] Japanese translation update
  Src/Languages/Japanese: MergeJapanese.rc
 BUG: [ 1190652 ] warning in cvs code in DirScan.cpp
  Src: DirScan.cpp

2005-05-13 Kimmo
 PATCH: [ 1201434 ] New ReadMe.txt
  Innosetup: WinMerge Localized.iss
  Innosetup removed file: Read Me.htm
  Users/Docs new file: ReadMe.txt
  Users/Docs removed files: Read me.txt Read Me.rtf

2005-05-13 Perry
 PATCH: [ 1201029 ] Catalan translation update
  Src/Languages/Catalan: MergeCatalan.rc
 BUG: [ 1197964 ] MergeBulgarian string versioninfo translated
  Added English/1252 section to Bulgarian, as MergeCatalan has.
  (Adding English/1251 section did not work on US Windows system.)
  Src/Languages/Bulgarian: MergeBulgarian.rc
 PATCH: [ 1201125 ] Add checking to AppendMenu calls in building prediffer subme
  Src: MergeEditView.cpp
 PATCH: [ 1201130 ] Fix prediffers menu for multiple menu brokenness
  Src: MainFrm.cpp
 Cosmetic: Expand header comments on GetScriptsSubmenu & GetPrediffersSubmenu
  Src: MainFrm.cpp
 Cosmetic: Fix synchro spelling in MergeFrench.rc (one currence LANGAGE => LANGUAGE)
  Src/Languages/French: MergeFrench.rc

2005-05-12 Kimmo
 BUG: [ 1198435 ] Comma missing from ID_LOCBAR_GOTODIFF menuitem
  Src: Merge.rc
  Src/Languages: *.rc
 PATCH: [ 1199889 ] Ask to save modified files before creating a patch
  Src: MainFrm.cpp Merge.rc resource.h
  Src/Languages: *.rc resource.h

2005-05-12 Perry
 PATCH: [ 1199600 ] Minor update to text encoding docs in manual
  Docs/Users/Manual: Text_encoding.xml

2005-05-11 Kimmo
 PATCH: [ 1199194 ] Optimization for difflist
  Src: DiffList.cpp DiffList.h
 PATCH: [ 1198955 ] Discard all button on Save modified pane
  Submitted by Ferenc Kubatovics
  Src: Merge.rc MergeDoc.cpp resource.h SaveClosingDlg.cpp SaveClosingDlg.h
  Src/Languages: *.rc resource.h
 Update UpdateAll_resource_h.bat to update Turkish too
  Src/Languages: UpdateAll_resource_h.bat
 Update Contributors list
  Docs/Users: Contributors.txt

2005-05-10 Perry
 BUG [ 1198622 ] Generated patch is broken when comparing UTF8 files
  Bail out of OlecharToUTF8 if BOM not UCS-2 (to avoid scrambling text).m
  Src/Common: multiformatText.cpp
 Improve comments heading & in OlecharToUTF8
  Src/Common: multiformatText.cpp

2005-05-09 Perry
 PATCH [ 1195486 ] Remember dircompare sort column
  Fix to save options after editing, so columns don't revert.
  Src: DirView.cpp

2005-05-09 WinMerge experimental release 2.3.3.3 (cvs)

2005-05-09 Kimmo
 BUG: [ 1198235 ] Debug warnings under Unicode Debug
  Fix memory leak from PropSyntaxColors.cpp
  Src: PropSyntaxColors.cpp

2005-05-09 Perry
 PATCH: [ 1197727 ] New method ResMsgBox1 to simplify cookie-cutter code
  Src: MainFrm.cpp PatchDlg.cpp StdAfx.cpp StdAfx.h
 BUG: [ 1197972 ] current cvs doesn't compile
  Src: MainFrm.h
 BUG [ 1193561 ] v2.2, version copyrights not all up-to-date
  Adjusted all to say 1996-2005 just as English
  Src/Languages: Merge*.rc
 BUG: [ 1198258 ] Several lang dlls do not have versioninfo
  Fixed hex-encoded codepage in string portion of versioninfo
  Src/Languaegs: Merge*.rc


2005-05-08 Kimmo
 PATCH: [ 1196889 ] Move options initializations to own file
  Src: MainFrm.cpp Merge.dsp
  Src new file: OptionsInit.cpp

2005-05-08 Perry
 BUG: [ 1193163 ] "Gerenate Patch" deletes the original files if UTF-8/16
  Added argument (areTempFiles) to method SetCompareFiles, and used in RunFileDiff.
 (also BUG [ 1197527 ] Patch Generator browse button not defaulting correctly)
  Src: DiffWrapper.cpp DiffWrapper.h MergeDoc.cpp PatchDlg.cpp PatchTool.cpp

2005-05-07 Perry
 BUG: [ 1197310 ] Turkish fails to compile, current CVS
 BUG: [ 1197310 ] Turkish trunk translation is from v2.2
  Src/Languages/Turkish: MergeTurkish.rc
 BUG: [ 1193229 ] options/codepage dialog out-of-date
  Added ",.xml" to message (replaced all non-1252 messages)
  Src: Merge.rc
  Src/Languages/*: *.rc
 BUG: [ 1166574 ] IDS_SUGGEST_IGNORECODEPAGE is misleading
  Src: Merge.rc
  Src/Languages/*: *.rc
 BUG: [ 1193562 ] v2.2 charset in MergeGerman wrong
  Src: Merge.rc
  Src/Languages/*: *.rc
 BUG: [ 1197397 ] Turkish missing from BuildAll.bat
  Src/Languages/BuildAll.bat
 BUG: [ 1197310 ] Turkish trunk translation is from v2.2
  Copy all dialogs & string tables from English
  Also remove some obsolete keywords (PURE, DISCARDABLE, etc)
  Src/Languages/Turkish: MergeTurkish.rc resource.h

2005-05-06 Kimmo
 BUG: [ 1193260 ] Problems with the current German translation
  Src: MainFrm.cpp
 PATCH: [ 1196119 ] Select syntax highlight colors
  Src: MainFrm.cpp MainFrm.h Merge.dsp Merge.rc MergeDiffDetail.cpp MergeDoc.cpp
   MergeEditView.cpp resource.h
  Src new files: PropSyntaxColors.cpp PropSyntaxColors.h Syntaxcolors.cpp SyntaxColors.h
  Src/Common: PreferencesDlg.cpp PreferencesDlg.h
  Src/editlib: asp.cpp basic.cpp batch.cpp ccrystaltextview.cpp ccrystaltextview.h
   cplusplus.cpp csharp.cpp dcl.cpp fortran.cpp html.cpp ini.cpp innosetup.cpp is.cpp
   java.cpp lisp.cpp nsis.cpp pascal.cpp perl.cpp php.cpp python.cpp rexx.cpp rsrc.cpp
   sgml.cpp sh.cpp siod.cpp sql.cpp tcl.cpp tex.cpp xml.cpp
  Src/Languages: *.rc resource.h

2005-05-06 Perry
 PATCH: [ 1188787 ] New Chinese translation rc file (from PATCH 1183476)
  Most of the menu updates from patch; no other updates from patch
  Src/Languages/ChineseTraditional: MergeChineseTraditional.rc resource.h
 PATCH: [ 1188787 ] New Chinese translation rc file (from PATCH 1183476)
  Some of the string table translations
  Src/Languages/ChineseTraditional: MergeChineseTraditional.rc

2005-05-05 Kimmo
 PATCH: [ 1195486 ] Remember dircompare sort column
  Src: DirView.cpp DirView.h DirViewColHandler.cpp MainFrm.cpp OptionsDef.h

2005-05-03 Perry
 PATCH: [ 1157486 ] New options for wordbreak characters
  (Fixed patch to use existing OPT_WORDDIFF_HIGHLIGHT instead of new option)
  Src: MainFrm.cpp Merge.rc MergeDoc.cpp MergeDoc.h MergeDocLineDiffs.cpp
   OptionsDef.h PropEditor.cpp PropEditor.h resource.h stringdiffs.cpp
   stringdiffs.h stringdiffsi.h
  Src/Languages: *.rc
 Add Turkish translation (direct copy from version 2.2)
  Src/Languages/Turkish: * and res/*

2005-05-02 Kimmo
 BUG: [ 1193059 ] Problems with the mouse at file comparison
  Don't refresh filecompare every time mouse is clicked
  Src: MergeEditView.cpp
 PATCH: [ 1193447 ] Optimise location pane update.
  Src: LocationView.cpp
 BUG: [ 1193260 ] Problems with the current German translation
  Src/Languages/German: MergeGerman.rc

2005-05-01 Kimmo
 PATCH: [ 1193033 ] Clarify file saving failed messagebox
  Src: Merge.rc MergeDoc.cpp
  Src/Languages: *.rc

2005-04-30 Kimmo
 PATCH: [ 1192741 ] Fix panes resetting when right-clicking with mouse
  Src: LocationView.cpp MergeEditView.cpp
 BUG: [ 1189723 ] COpenDlg::RemoveTrailingSlash() is unused
  Src: OpenDlg.cpp OpenDlg.h

2005-04-28 Tim
 PATCH: [ 1190544 ] Translated Read Me-German.rtf
  Docs/Users/Languages: Read Me-German.rtf

2005-04-28 WinMerge experimental release 2.3.3.2 (cvs)

2005-04-26 Kimmo
 PATCH: [ 1189875 ] Small cleanup for line replace code
  Src: MergeDoc.cpp
 PATCH: [ 1189718 ] OpenDlg: add trailing slash to directory names
  Src: OpenDlg.cpp paths.cpp paths.h
 PATCH: [ 1189692 ] Cleanup Dircompare init
  Src: DirDoc.cpp DirDoc.h MainFrm.cpp PathContext.cpp PathContext.h
 BUG: [ 1181883 ] Inconsistent behavior: select font vs. Use default
  Src: MainFrm.cpp MainFrm.h
 PATCH: [ 1190173 ] Hungarian translation (based on 2.3.3.1)
  Submitted by Márton Balázs
  Src/Languages/Hungarian: MergeHungarian.rc

2005-04-25 Kimmo
 BUG: [ 1179790 ] ReadMe-Hungarian.rtf file is missing
  docs/Users/Languages new file: Read Me-Hungarian.rtf
 PATCH: [ 1183368 ] Add option to ignore less than 3 seconds time difference
  Src: MergeDoc.cpp

2005-04-24 Kimmo
 PATCH: [ 1186884 ] Restrict access to DirDoc's DiffContext
  Src: 7zCommon.cpp DiffContext.cpp DiffContext.h DirActions.cpp DirDoc.cpc
   DirDoc.h DirView.cpp DirView.h DirViewColHandler.cpp DirViewColItems.cpp
   MainFrm.cpp MergeDoc.cpp
 BUG: [ 1183031 ] Shared file give "parameter not correct error"
  Additional fix from Perry
  Src/Common: UniFile.cpp
 PATCH: [ 1183368 ] Add option to ignore less than 3 seconds time difference
  Src: DiffContext.cpp DiffContext.h DirDoc.cpp DirScan.cpp MainFrm.cpp Merge.rc
   OptionsDef.h PropRegistry.cpp PropRegistry.h resource.h stdafx.h
  Src/Common: PreferencesDlg.cpp

2005-04-23 Kimmo
 PATCH: [ 1184626 ] Allow only single instance to run. (2)
 BUG: [ 1188363 ] Cannot open include file: 'sinstance.h': No such file or dir
  Src/common new files: sinstance.h sinstance.cpp

2005-04-22 Kimmo
 BUG: [ 1187714 ] Cannot save my newly created text file (add missing line)
  Src: PathContext.h
 PATCH: [ 1184626 ] Allow only single instance to run. (2)
  Submitted by Takashi Sawanaka
  Src: ChildFrm.cpp DirDoc.cpp DirDoc.h DirView.cpp MainFrm.cpp MainFrm.h Merge.cpp
   Merge.dsp Merge.h Merge.rc OptionsDef.h PropGeneral.cpp PropGeneral.h resource.h
  Src/Common: PreferencesDlg.cpp
  Src/Languages: resource.h *.rc
 BUG: [ 1183031 ] Shared file give "parameter not correct error"
  Fix from Robin Sandlin and Perry
  Src/Common: UniFile.cpp

2005-04-22 Perry
 BUG: [ 1188063 ] UTF-8 file saving problem, the file header BOM missing.
 Src/Common: UniFile.cpp

2005-04-22 Kimmo
 BUG: [ 1187714 ] Cannot save my newly created text file
  Src: MergeDoc.cpp PathContext.h
 Correct Polish translator name in Contributors list
  Docs/Users: Contributors.txt

2005-04-20 Kimmo
 PATCH: [ 1185489 ] Tempfile path context
  Src: MergeDoc.cpp MergeDoc.h PathContext.cpp PathContext.h
 PATCH: [ 1184023 ] Syntax highlighting for Inno Setup files
  Submitted by Tim
  Src: Merge.dsp
  Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
  Src/editlib new file: innosetup.cpp

2005-04-19 Kimmo
 PATCH: [ 1183772 ] Update Italian translation + readme
  Submitted by Andrea Decorte
  Src/Languages/Italian: MergeItalian.rc
  Docs/users/Languages: Read Me-Italian.rtf

2005-04-18 Kimmo
 PATCH: [ 1183481 ] Updated Polish translation
  From Pawel Wawrzysko
  Src/Languages/Polish: MergePolish.rc
  Docs/users/Languages: Read Me-Polish.rtf
  InnoSetup/Languages: Pölish.isl
 PATCH: [ 1183669 ] Updated ReadMe-ChineseTraditional.rtf
  From Koko
  Docs/users/Languages: Read Me-Chinese_Traditional.rtf
 PATCH: [ 1181092 ] Path context class
  Src: DiffContext.cpp DiffContext.h DirDoc.cpp DirDoc.h MainFrm.cpp Merge.dsp
   MergeDoc.cpp MergeDoc.h
  Src new files: PathContext.cpp PathContext.h

2005-04-17 Perry
 (Cosmetic) Add HTML entity escapes for Chinese simplified
  Src/Common: LanguageSelect.cpp

>>>>>>> 1.1601
2005-04-14 Kimmo
 PATCH: [ 1182416 ] Fix Compare by date hang
  Src: DiffContext.cpp DiffContext.h DiffWrapper.cpp DiffWrapper.h DirScan.cpp 

2005-04-13 Perry
 BUG: [ 1181906 ] Comment in LoadFromDirectory maybe wrong?
  (cosmetic)
  Src: FileFilterMgr.cpp

2005-04-12 Perry
 (Cosmetic) Add HTML entity escapes for several language names
  Src/Common: LanguageSelect.cpp
 PATCH: [ 1162668 ] Serialize font settings
  Src: MainFrm.cpp Merge.dsp
  Src new files: AppSerialize.cpp AppSerialize.h

2005-04-12 WinMerge experimental release 2.3.3.1 (cvs)

2005-04-12 Kimmo
 PATCH: [ 1179941 ] Syntax highlighting for NSIS files
  Submitted by Tim
  Src: Merge.dsp
  Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
  Src/editlib new file: nsis.cpp
 PATCH: [ 1181157 ] Swedish translation update
  Submitted by Hans Eriksson
  Src/Languages/Swedish: MergeSwedish.rc
 Fix Russian lang file compile error
  Src/Languages/Russian: MergeRussian.rc

2005-04-11 Kimmo
 PATCH: [ 1180768 ] Russian translation update
  Submitted by Dmitriy Aleshkowskiy
  Src/Languages/Russian: MergeRussian.rc

2005-04-08 Kimmo
 PATCH: [ 1178885 ] Merge diffs inside selection (with normal merge item)
  Src: Merge.rc MergeEditView.cpp MergeEditView.h resource.h
  Src/Languages: *.rc resource.h

2005-04-07 Kimmo
 PATCH: [ 1175731 ] Own menus for file- and directory compare
  Src: MainFrm.cpp MainFrm.h Merge.cpp Merge.rc resource.h
  Src/Languages: *.rc resource.h

2005-04-05 Kimmo
 PATCH: [ 1176040 ] French translation 2.3 branch
  Submitted by Jean-F Jolin
  Src/Languages/French: MergeFrench.rc
 PATCH: [ 1176574 ] catalan translation update (setup)
  Submitted by Jordi Vilar
  InnoSetup: WinMerge Localized.iss
  InnoSetup/Languages: Catalan.isl
  Docs/Users/Languages: Read Me-Catalan.rtf
 PATCH [ 1176741 ] Swedish ReadMe-Swedish.rtf file
  Submitted by Hans Eriksson
  Docs/Users/Languages: Read Me-Swedish.rtf
 Update contributors file (Add Dutch and French translators)
  Docs/Users: Contributors.txt
 PATCH: [ 1176600 ] Drag location pane indicator with mouse
  Src: LocationView.cpp LocationView.h
 PATCH: [ 1168568 ] Cleanup some VSSHelper code
  Src: VSSHelper.cpp VSSHelper.h

2005-04-03 Kimmo
 PATCH: [ 1175319 ] Dutch translation update
  Submitted by Michel Coene
  Src/Languages/Dutch: MergeDutch.rc

2005-04-02 Kimmo
 PATCH: [ 1175065 ] Use view lines when scrolling from location pane
  Src: LocationView.cpp LocationView.h MergeEditView.cpp

2005-04-01 Kimmo
 PATCH: [ 1174935 ] Russian translation update
  Submitted by Dmitriy Aleshkowskiy
  Src/Languages/Russian: MergeRussian.rc

2005-03-30 Kimmo
 PATCH: [ 1173072 ] hungarian translation for current beta (2.3.2.0)
  Submitted by Márton Balázs
  Src/Languages: Hungarian/MergeHungarian.rc

2005-03-29 Kimmo
 PATCH: [ 1171805 ] Update italian translation
  Submitted by Andrea Decorte
  InnoSetup/Languages: Italian.isl
 PATCH: [ 1172427 ] Norwegian translation for 2.2.2 / CVS head
  Submitted by Hans Fr. Nordhaug
  Src/Languages/Norwegian: MergeNorwegian.rc

2005-03-29 Jochen
 BUG: [ 1172080 ] Unable to translate IDD_MERGE7ZMISMATCH string
  Src: Merge.rc
  Src/Languages: Merge*.rc
 Widen Merge7z plugin download button in catalan translation
  Src/Languages/Catalan: MergeCatalan.rc
 Fix typo in MergeGerman.rc
  Src/Languages/German: MergeGerman.rc

2005-03-28 Kimmo
 PATCH: [ 1169997 ] catalan translation update
  Submitted by Jordi Vilar
  Src/Languages/Catalan: MergeCatalan.rc

2005-03-23 Kimmo
 PATCH: [ 1168733 ] Doc for options
  Docs/Developers new file: Options.html

2005-03-21 Kimmo
 BUG: [ 1162037 ] Missing localization (German)
  Translation update from Tim Gerundt
  Src/Languages/German/MergeGerman.rc
 PATCH: [ 1162644 ] Tree-style options-dialog
  Src: MainFrm.cpp Merge.dsp Merge.rc resource.h
  Src/Common new files PreferencesDlg.cpp PreferencesDlg.h PropertyPageHost.cpp
   PropertyPageHost.h wclassdefines.h WinClasses.cpp WinClasses.h
  Src/Languages: Merge*.rc resource.h

2005-03-20 Kimmo
 PATCH: [ 1165515 ] Improve drawing location pane moved block lines
  Src: LocationView.cpp LocationView.h

2005-03-20 Jochen
 Update IDD_MERGE7ZMISMATCH resource in localized RC files
  Src/Languages: Merge*.rc

2005-03-19 Perry
 PATCH: [ 1157769 ] Move GuessEncoding functions into one file
  Src: DiffContext.cpp DiffContext.cpp MainFrm.cpp Merge.dsp
  Src/Common: UniFile.cpp UniFile.h
  Src new: codepage_detect.cpp codepage_detect.h

2005-03-18 Perry
 PATCH: [ 1155977 ] Log scriptlet plugin errors
  Src: Plugins.cpp
 PATCH: [ 1162571 ] Simplify SplitFilename
  Src/Common: coretools.cpp
 Cosmetic (new comments)
  Src/Common: LanguageSelect.cpp

2005-03-16 Kimmo
 PATCH: [ 1161709 ] Virtual InitOption() and SaveOption() for COptionsMgr
  Src/Common: OptionsMgr.h

2005-03-16 Jochen
 Widen controls to display Merge7z plugin names (unicode names got chopped off)
  Src: Merge.rc
 BUG: [ 1154551 ] Merge7zInstaller download link focus issue
  Src: 7zCommon.cpp

2005-03-15 Jochen
 Add Merge7z415(U).dll to Merge7zInstaller
  Merge7zInstaller: Files.rc2
 Merge7zInstaller - Initialize filename in Open dialog to "*.exe"
  Merge7zInstaller: Installer.cpp
 Fix typo in IDD_MERGE7ZMISMATCH dialog
  Src: Merge.rc

2005-03-15 WinMerge beta 2.3.2.0 released

2005-03-15 Kimmo
 Add include I missed from fix to bug #1154153
  Src: MainFrm.cpp
 Remove version numbers accidentally applied earlier
  Src: Merge.rc

2005-03-14 Kimmo
 BUG: [ 1154153 ] Poor font choice for default font
  Fix submitted by Takashi Sawanaka
  Src: MainFrm.cpp

2005-03-13 Kimmo
 BUG: [ 1162374 ] Recent WinMerge doesn't support NT4
  Src/Common: UniFile.cpp

2005-03-13 Jochen
 BUG: [ 1162369 ] short path name problem
  Fix paths_GetLongPath(), which erroneously added trailing backslash when passing in short path.
  Src: paths.cpp

2005-03-13 Kimmo
 PATCH: [ 1161671 ] Convert couple of VCS options to COptionsMgr
  Src: MainFrm.cpp MainFrm.h OptionsDef.h
 BUG: [ 1160919 ] Bad layout in the OpenDialog
  Fix submitted by Tim
  Languages/German: MergeGerman.rc

2005-03-11 Kimmo
 PATCH: [ 1160923 ] Remove CMainFrame::m_nCompMethod (ugly hack)
  Src: DirDoc.cpp MainFrm.cpp MainFrm.h

2005-03-10 Kimmo
 PATCH: [ 1160064 ] Undo for Copy All
  Src: MergeDoc.cpp MergeDoc.h
 Fix invalid compare for VSS dialog returnvalue
  Src: MainFrm.cpp

2005-03-09 Perry
 PATCH: [ 1157359 ] Minor change for FILEFILTER_INFOLIST
  Src: FileFilterHelper.h
 PATCH: [ 1159465 ] Add Jesus (Mack) to contributors/Spanish
  Add [Jesús M. Delgado 'MacK'] to Spanish contributors. 
  Alphabetize Swedish contributors.
  Users/Docs: Contributors.txt

2005-03-08 Perry
 Cosmetic: Added & doxygen'd comments, and prefixed members with m_.
  Src: FilepathEdit.cpp FilepathEdit.h
 BUG: [ 1143619 ] Unicode chars in filename display as '_'
  Remove ES_OEMCONVERT from edit boxes in IDD_EDITOR_HEADERBAR.
  Src: Merge.rc
  Src/Languages: Merge*.rc

2005-03-08 WinMerge experimental release 2.3.1.6 (cvs)

2005-03-08 Kimmo
 PATCH: [ 1158456 ] Fix setting font for headerbar editcontrols
  Src: EditorFilepathBar.cpp EditorFilepathBar.h
 PATCH: [ 1158484 ] Fix assert from headerbar-setactive() when closing views
  Src: EditorFilepathBar.cpp EditorFilepathBar.h
 PATCH: [ 1159112 ] Swedish translation revision
  Submitted by Hans Eriksson
  Languages/Swedish: MergeSwedish.rc
 PATCH: [ 1158136 ] Spanish translation revised
  Submitted by Jesus M. Delgado 'Mack'
  Languages/Spanish: MergeSpanish.rc

2005-03-07 Perry
 PATCH: [ 1157859 ] Add LVS_SHOWSELALWAYS style to dirview
 Postlude: Alter WindowStyle_Add to call CWnd::ModifyStyle.
  Src/Common: WindowStyle.cpp

2005-03-06 Tim
 PATCH: [ 1156198 ] Non-standard html in developer docs
  Docs/Developers: readme-developers-*.html

2005-03-06 Perry
 PATCH: [ 1157524 ] Fix view line length
  editlib: ccrystaltextview.cpp ccrystaltextview.h
 PATCH: [ 964676 ] rc file lacks bytes after DIALOGEX defs
  Add 0,0,0x1 to any FONT line lacking it, for all DIALOGEX dialogs
  Src: Merge.rc
  Languages: Merge*.rc
 PATCH: [ 968285 ] DBCS fixes from Sawanaka
  (continuing editlib portions)
  Src/editlib: batch.cpp crystaleditview.cpp crystaltextview2.cpp cplusplus.cpp
   cregexp.cpp csharp.cpp dcl.cpp filesup.cpp fortran.cpp html.cpp js.cpp
   java.cpp list.cpp pascal.cpp perl.cpp php.cpp python.cpp rexx.cpp rsrc.cpp
   sgml.cpp sh.cpp siod.cpp sql.cpp tcl.cpp tex.cpp xml.cpp
 PATCH: [ 1157859 ] Add LVS_SHOWSELALWAYS style to dirview
  Src: DirView.cpp Merge.dsp
  Common new files: WindowStyle.cpp WindowStyle.h


2005-03-05 Perry
 Rename CDirFrame::SetFilter to CDirFrame::SetFilterStatusDisplay for easier greps.
  Src: DirDoc.cpp DirFrame.cpp DirFrame.h
 More filter clarifying renames
  Src: DirDoc.cpp FileFilterHelper.cpp FileFilterHelper.h MainFrm.cpp OpenDlg.cpp
 Rename FilterHelper's GetUseMask to IsUsingMask.
  Src: FileFilterHelper.cpp FileFilterHelper.h MainFrm.cpp OpenDlg.cpp
 BUG: [ 1153184 ] DiffWrapper.cpp missing NEW redefinition
  Added boilerplate new redefintion for DEBUG builds to DiffWrapper.cpp
  Src: DiffWrapper.cpp
 PATCH: [ 1157015 ] Spanish translation update
  Lots of updates to Spanish translation by Jesus M. Delgado 'Mack'
  Src/Languages/Spanish: MergeSpanish.rc
 PATCH: [ 1157145 ] FileFilterHelper doesn't have boilerplate new redefinition
  Src: FileFilterHelper.cpp
 PATCH: [ 968285 ] DBCS fixes from Sawanaka
  Applied asp & basic portions (there are many more)
  editlib: asp.cpp basic.cpp

2005-03-04 Perry
 PATCH: [ 1147039 ] experimental patch for colored word diff
  Merge all the easy new Japanese string translations
   (Omit major changes to IDD_PROPPAGE_EDITOR & IDD_MERGE7ZMISMATCH.
  Languages: Japanese/MergeJapanese.rc
 PATCH: [ 1112871 ] new byte_compare function to bypass diffutils
  Src: DiffContext.h DiffWrapper.cpp DiffWrapper.h DirDoc.cpp DirScan.cpp Merge.dsp
  Src new files: ByteComparator.cpp ByteComparator.h

2005-03-04 Kimmo
 PATCH: [ 1155319 ] Select font for dir compare view
  We must allow selecting file compare font even if no open views
  Src: Mainfrm.cpp
 PATCH: [ 1155436 ] Remove non-const GetDiffAt() from CDiffContext
  Src: DiffContext.cpp DiffContext.h DirDoc.cpp DirView.h DirViewColHandler.cpp
 PATCH: [ 1156188 ] Updated readme-innosetup
  Docs/Developers: readme-developers-InnoSetup.html
 PATCH: [ 1147039 ] experimental patch for colored word diff
  Submitted by Takashi Sawanaka
  Src: MainFrm.cpp Merge.rc MergeDiffDetailView.cpp MergeDiffDetailView.h MergeDoc.h
   MergeDocLineDiffs.cpp MergeEditView.cpp MergeEditView.h OptionsDef.h
   PropColors.cpp PropColors.h resource.h
  Src/editlib: asp.cpp basic.cpp batch.cpp ccrystaltextview.cpp ccrystaltextview.h
   cplusplus.cpp csharp.cpp dcl.cpp fortran.cpp html.cpp ini.cpp is.cpp java.cpp
   lisp.cpp pascal.cpp perl.cpp php.cpp python.cpp rexx.cpp rsrc.cpp sgml.cpp sh.cpp
   siod.cpp sql.cpp tcl.cpp tex.cpp xml.cpp
  Src/Languages: *.rc resource.h

2005-03-04 Perry
 PATCH: [ 1156253 ] Fix filter helper handling of new filters
 BUG: [ 1153018 ] Create new filter, now cannot find it
  Src: FileFilterHelper.cpp FileFilterHelper.h FileFiltersDlg.cpp Merge.cpp
   Merge.h paths.cpp paths.h

2005-03-03 Kimmo
 PATCH: [ 1155319 ] Select font for dir compare view
  Src: DirView.cpp DirView.h MainFrm.cpp MainFrm.h Merge.rc OptionsDef.h
  Languages: *.rc
 PATCH: [ 1154667 ] Make CDiffContext paths private members
  Src: DiffContext.cpp DiffContext.h DirActions.cpp DirDoc.cpp DirScan.cpp DirView.cpp

2005-03-02 Perry
 PATCH: [ 1154259 ] Non blurred 'error.bmp'
  New clearer error bitmap from Tim Gerundt
 Languages: res/error.bmp

2005-03-03 Perry
 PATCH: [ 1151951 ] Alter getRightFilepath for root paths
 re: BUG: [ 1105933 ] Problem accessing files in network shares and removables
  Src: DiffContext.cpp

2005-03-02 Kimmo
 BUG: [ 975226 ] Editor: Always refresh with Del-Key
  Fix submitted by Takashi Sawanaka
  Src: MergeEditView.cpp

2005-03-02 Perry
 PATCH: [ 1154259 ] Non blurred 'error.bmp'
  New clearer error bitmap from Tim Gerundt
  Src/Res: error.bmp
 PATCH: [ 1153127 ] Rename Filepath to FilepathWithEncoding
  Src: DiffWrapper.cpp DiffWrapper.h
 PATCH: [ 967230 ] Initialize default language from locale
  Src/Common: LanguageSelect.cpp LanguageSelect.h


2005-03-01 WinMerge experimental release 2.3.1.5 (cvs)

2005-03-01 Kimmo
 PATCH: [ 1153870 ] Disable redrawing dir compare view while adding items
  Src: DirDoc.cpp

2005-03-01 Jochen
 PATCH: [ 1152341 ] Merge7z update (DllBuild_Merge7z_10)
  Merge7z: Merge7z.h Merge7z311.cpp Merge7z311.dsp Merge7z312.dsp Merge7z313.dsp Merge7z407.dsp Merge7z408.dsp
   Merge7z409.cpp Merge7z409.dsp Merge7z410.dsp Merge7z411.dsp Merge7z412.dsp Merge7z413.dsp Merge7z414.dsp
   Merge7z415.dsp Merge7zCommon.cpp Merge7zCommon.h revision.txt tools.cpp tools.h
 PATCH: [ 1152469 ] Add Merge7zInstaller download link
  Src: 7zCommon.cpp 7zCommon.h dllpstub.cpp dllpstub.h markdown.cpp markdown.h Merge.dsp Merge.rc

2005-02-28 Perry
 BUG: [ 895732 ] paths_GetLongPath usually ignores 2nd parameter
  Remove 2nd parameter entirely from paths_GetLongPath, and improve documentation.
  Src: Merge.cpp OpenDlg.cpp paths.cpp paths.h readme.txt

2005-02-28 Kimmo
 PATCH: [ 1153091 ] Fix selecting default font from View menu
  Src: MainFrm.cpp MainFrm.h OptionsDef.h
 PATCH: [ 1144545 ] Project Handling Patch3 (remember last valid project path)
  Submitted by Andreas Morsing
  Src: MainFrm.cpp OpenDlg.cpp OptionsDef.h

2005-02-28 Perry
 BUG: [ 1039158 ] Confusing EOL differences messagebox
  Src: Merge.rc
  Languages: Merge*.rc

2005-02-27 Perry
 PATCH: [ 1112636 ] Suggest cosmetic change in DiffFileData::OpenFiles
  (new method DiffFileData::Filepath::AssignPath)
  Src: DiffWrapper.cpp DiffWrapper.h
 BUG [ 1144425 ] German: Options/codepage dlg needs adjust
  (Fix by Tim Gerundt)
  Languages: MergeGerman.rc
 PATCH: [ 925085 ] Propose failing files 2gigs+ in size
  Src/Common: UniFile.cpp

2005-02-27 Kimmo
 BUG: [ 1153017 ] FileFilterHelper::SetFilter ASSERTS on empty string
  Src: FileFilterHelper.cpp

2005-02-27 Perry
 BUG: [ 1152913 ] LocationView type bugs?
  (Fixed 17 type conversion warnings in MSVC.NET 2003, mostly by explicit casts)
  Src: LocationView.cpp
 PATCH: [ 1152967 ] Fix re_match_2 declaration warnings
  Src/diffutils/lib: REGEX.C
 BUG: [ 1038897 ] Weird comment in DiffWrapper.cpp
  cosmetic: removing obsolete comment, improving existing comments
  Src: DiffWrapper.cpp
 Cosmetic: Add more explanation to function header of 
  FileFilterHelper::LoadFileFilterDirPattern.
  Src: FileFilterHelper.cpp
 BUG: [ 1152911 ] CListCtrlEx::Dump is an infinite loop.
  Src/Common: listvwex.h

2005-02-26 Jochen
 PATCH: [ 1152256 ] UniFile may fail to read last line
  Src/Common: UniFile.cpp
 Attempt to fix bug [1152375] 'Help -> Archive Support disabled' broken
  Src: 7zCommon.cpp

2005-02-26 Perry
 PATCH: [ 1151949 ] Fix CDirDoc::FindItemFromPaths for root
  Src: DirDoc.cpp

2005-02-23 Perry
 PATCH: [ 1145016 ] i18n the version control strings
  Src: Merge.rc PropVss.cpp PropVss.h resource.h
  Languages: resource.h Merge*.rc

2005-02-23 WinMerge experimental release 2.3.1.4 (cvs)

2005-02-23 Kimmo
 PATCH: [ 1149081 ] Invalid string compare in CChildFrm.cpp
  Src: ChildFrm.cpp
 PATCH: [ 1149365 ] Check linenumber to goto for upper limit
  Src: MergeEditView.cpp
 PATCH: [ 1149388 ] Check for previous compare text before find again
  Src/editlib: ccrystaltextview.cpp
 Add compiler-selecting ifdef to Unifile.cpp to make it compile with MSVC6 and MSVC7
  Src/Common: UniFile.cpp

2005-02-22 Kimmo
 PATCH: [ 1145522 ] fix crash on search
  Submitted by Takashi Sawanaka
  Src/editlib: ccrystaltextview.cpp
 BUG: [ 1144580 ] markdown.cpp compile error with VS 2003
  Fix from Jochen
  Src: markdown.h

2005-02-21 Kimmo
 Update Docbook instructions in devel doc (path changed in sf.net)
  Docs/Developers: readme-developers.html

2005-02-20 Perry
 BUG [ 1144978 ] No languages available in development
  Fix CopyAll.bat, and cosmetic changes to LanguageSelect.*
  Src/Common: LanguageSelect.cpp LanguageSelect.h
  Languages: CopyAll.bat

2005-02-20 Tim
 Fix 'cliboard' typo in rc files.
  Languages: *.rc

2005-02-20 Perry
 BUG: [ 1144917 ] cvs source does not compile: '_stati64' : undeclared identif
  Fix ANSI compilation of stati64
  Src/Common: UniFile.cpp

2005-02-20 Kimmo
 PATCH: [ 1144588 ] Remove show bak files setting from configlog
  Src: ConfigLog.cpp ConfigLog.h

2005-02-19 Kimmo
 PATCH: [ 1144059 ] Allow getting filestatus from open file in UniXXXFile
  Common: UniFile.cpp UniFile.h
 Fix compile error in MainFrm.cpp
  Src: MainFrm.cpp
 Add typecast for VC6
  Common UniFile.cpp

2005-02-18 Kimmo
 PATCH: [ 1124475 ] Update of the swedish translation
  Submitted by Hans Eriksson
  Src/Languages/Swedish: MergeSwedish.rc

2005-02-17 Kimmo
 PATCH: [ 1124380 ] Use _tstati64() in UniLocalFile::DoGetFileStatus()
  Common: UniFile.cpp UniFile.h

2005-02-16 Kimmo
 PATCH: [ 1123539 ] Small improvement for code creating backup copy
  Src: MainFrm.cpp

2005-02-13 Kimmo
 PATCH: [ 1118261 ] Allow creating and deleting filefilters from UI
  Src: FileFilterHelper.cpp FileFilterHelper.h FileFilterMgr.cpp FileFilterMgr.cpp
   FileFiltersDlg.cpp FileFiltersDlg.h Merge.cpp Merge.rc Plugins.cpp Plugins.h resource.h
  Filters new file: FileFilter.tmpl

2005-02-10 Kimmo
 PATCH: [ 1116778 ] Project Handling patch
  Submitted by Andreas Morsing
  Src: MainFrm.cpp MainFrm.h Merge.rc OpenDlg.cpp OpenDlg.h ProjectFile.cpp ProjectFile.h resource.h
  Languages: *.rc resource.h
  Docs/Users: Contributors.txt

2005-02-07 Kimmo
 PATCH: [ 1117375 ] Rememer status/toolbar visible status
  Src: MainFrm.cpp MainFrm.h OptionsDef.h

2005-01-22 Jochen
 PATCH: [ 1107467 ] Detect 7-Zip version from 7zip_pad.xml (2)
  Src: 7zCommon.cpp 7zCommon.h ConfigLog.cpp Merge.dsp Merge.rc paths.cpp paths.h 
  Src new files: charsets.c charsets.h language.c language.h markdown.cpp markdown.h
  Src/Common: version.cpp version.h

2005-02-03 Kimmo
 PATCH: [ 1114360 ] Non-blocking file filter editing
  Src: DiffFileInfo.cpp DiffFileInfo.h DirDoc.cpp DirViewColItems.cpp FileFilterHelper.cpp
   FileFilterHelper.h FileFilterMgr.cpp FileFilterMgr.h MainFrm.cpp Merge.dsp
  Src new files: FileInfo.cpp FileInfo.h

2005-02-02 Kimmo
 BUG: [ 1039592 ] No differences shown after changing EOL options when loading
  Src: MergeDoc.cpp MergeEditView.cpp MergeEditView.h

2005-02-01 Kimmo
 Backout fix for bug [ 1110826 ] Regex $ breaks linefilter
  Src: MainFrm.cpp

2005-01-30 Kimmo
 BUG: [ 1110826 ] Regex $ breaks linefilter
  Src: MainFrm.cpp
 PATCH: [ 1112111 ] Confusing message for identical scratchpads
  Src: MergeDoc.cpp

2005-01-29 Kimmo
 PATCH: [ 1108716 ] Load lang files from 'Languages' subdirectory
  Src/Common: LanguageSelect.cpp

2005-01-28 Perry
  Src/Common: unicoder.cpp
   cosmetic: add comments to get_unicode_char

2005-01-27 Kimmo
 PATCH: [ 946600 ] Copy lines with linenumbers
  Src: Merge.rc MergeEditView.cpp MergeEditView.h resource.h
  Languages: *.rc resource.h

2005-01-24 WinMerge experimental release 2.3.1.3 (cvs)

2005-01-23 Perry
 PATCH: [ 1062082 ] Fix bug [1057997] (long lines issue)
  (Applied UniFile.cpp portion of this patch)
  Src/Common: UniFile.cpp UniFile.h
  Src: MergeDoc.cpp
 BUG: [ 1029643 ] (Catalan) Options/codepage too crowded
  Moved codepage edit box over 20 units, widened label 10 units
  Languages/Catalan: MergeCatalan.rc
 PATCH: [ 1062082 ] Fix bug [1057997] (long lines issue)
  (Applied UniFile.cpp portion of this patch)
  Minor adjustment (remove "sline(1024)" which broken VS.NET compilation).
  Src: MergeDoc.cpp

2005-01-23 Kimmo
 PATCH: [ 1107508 ] Add dirview statusbar panel showing current filter name
  Src: DirDoc.cpp DirFrame.cpp DirFrame.h resource.h
  Languages: resource.h
 Update MASM filter file
  Submitted by Matt Bossard (to forum)
  Filters file: MASM.flt
 Fix bug that left path was shown twice in caption
  Src: DirDoc.cpp

2005-01-23 Perry
 PATCH: [ 1107516 ] Suggest code simplification for DiffFileInfo ctr
  Src: DiffFileInfo.h
 PATCH: [ 1103530 ] Include codepages in "force unification" question
  Src: MainFrm.cpp Merge.rc
  Languages: *.rc
 Minor grammar fixes & wording changes
  Docs/Developers/readme-developers.html
 Add section on "Forcing compiler version with MakeResDll"
  Docs/Developers/readme-developers.html
 PATCH: [ 1107686 ] Fix LANGAGE to LANGUAGE in Merge.rc
  Src: Merge.rc
  Languages: *.rc
 PATCH: [ 1103530 ] Include codepages in "force unification" question
  Placeholder in Japanese text.
  Languages/Japanese: MergeJapanese.rc
 PATCH: [ 1039228 ] add codepage info strings
  Src: codepage.cpp codepage.h Merge.rc resource.h
  Src/Languages: Merge*.rc, resource.h
 BUG: [ 1162653 ] CMainFrame::ShowVSSError doesn't always log error
  Src: MainFrm.cpp
 BUG: [ 1157554 ] MergeKorean IDD_FILEFILTERS not DIALOGEX
  Src/Languages/Korean: MergeKorean.rc

2005-01-22 Perry
 PATCH: [ 1107484 ] Fix broken version columns
  Src: DiffContext.cpp DiffContext.h DiffFileInfo.cpp DiffFileInfo.h 
   DirViewColItems.cpp

2005-01-22 Jochen
 PATCH: [ 1103266 ] Merge7z update (DllBuild_Merge7z_9)
  Merge7z: Merge7z.h Merge7z311.cpp Merge7z311.dsp Merge7z312.dsp Merge7z313.dsp Merge7z407.dsp Merge7z408.dsp
   Merge7z409.cpp Merge7z409.dsp Merge7z410.dsp Merge7z411.dsp Merge7z412.dsp Merge7z413.dsp Merge7z414.dsp
   Merge7zCommon.cpp Merge7zCommon.h revision.txt
 PATCH: [ 1103274 ] Merge7z interface plugin installer
  Merge7zInstaller: Files.rc2 Installer.cpp Installer.rc Merge7zInstaller.dsp resource.h

2005-01-21 Perry
 PATCH: [ 1103542 ] Declare _MBCS in ANSI builds
  Src: Merge.dsp

2005-01-21 Kimmo
 BUG: [ 1002327 ] "Untitled left" not translated when language switches
  Src: MergeDoc.cpp
 PATCH: [ 1106330 ] Change position in locationpane with single mouseclick
  Src: LocationView.cpp LocationView.h
 PATCH: [ 1106383 ] Show few chars of 'context' when horizontal scrolling lines
  Src/editlib: ccrystaltextview.cpp

2005-01-20 Kimmo
 PATCH: [ 1105640 ] Properly update locationpane visible area indicator
  Src: LocationView.cpp LocationView.h MergeEditView.cpp MergeEditView.h
 Add new MASM filter file
  Submitted by Matt Bossard (to forum)
  Filters new file: MASM.flt

2005-01-18 Kimmo
 PATCH: [ 1062082 ] Fix bug [1057997] (long lines issue)
  View scrolling optimisation from Takashi Sawanaka
  Src/editlib: ccrystaltextview.cpp

2005-01-13 Kimmo
 PATCH: [ 1001341 ] Update edit view status bar on language change
  Submitted by Perry
  Src: ChildFrm.cpp ChildFrm.h DirDoc.cpp DirFrame.cpp DirView.cpp
   MainFrm.cpp MergeDoc.cpp MergeDoc.h MergeEditView.cpp 

2005-01-12 Kimmo
 PATCH: [ 1100462 ] Center find result in file compare
  Src/editlib: ccrystaltextview.cpp

2005-01-11 WinMerge experimental release 2.3.1.2 (cvs)

2005-01-11 Kimmo
 PATCH: [ 1100176 ] small fix in DirDoc RefreshOptions
  Submitted by Jim Fougeron
  Src: DirDoc.cpp
 Update contributors.txt (Jim Fougeron)
  Doc/Users: Contributors.txt

2005-01-10 Kimmo
 Add Hungarian to resource.h updates in UpdateAll_resource_h.bat
  Src/Languages: UpdateAll_resource_h.bat
 PATCH: [ 1099011 ] Added "Hide files" to right click menu (onthefly filter)
  Submitted by Jim Fougeron
  Src: DirView.cpp DirView.h Merge.rc resource.h
  Src/Languages: *.rc resource.h

2005-01-09 Kimmo
 PATCH: [ 1019445 ] IDS_WINMERGE_THIS_DIRECTORY is unused
  Src: Merge.rc resource.h
  Src/Languages: *.rc resource.h

2005-01-08 Kimmo
 PATCH: [ 1098340 ] crash rarely when starting many winmerge continuously
  Anonymous submission
  Src: FileFilterMgr.cpp

2005-01-06 Kimmo
 PATCH: [ 1096609 ] Show tooltips for filefilter dialog list
  Src: FileFiltersDlg.cpp FileFiltersDlg.h

2005-01-05 Kimmo
 PATCH: [ 1094534 ] Add description field for file filters
  Src: FileFilterHelper.cpp FileFilterHelper.h FileFilterMgr.cpp FileFilterMgr.h
   FileFiltersDlg.cpp FileFiltersDlg.h MainFrm.cpp Merge.rc resource.h
  Src/Languages: *.rc resource.h
  Filters: ADAMulti.flt Merge_GnuC_loose.flt Merge_VB_loose.flt Merge_VC_loose.flt
   XML_html.flt
 PATCH: [ 1094467 ] Update contributors: Tim is now developer
  Docs/Users: Contributors.txt

2005-01-03 Kimmo
 PATCH: [ 1094474 ] Visible area indicator for location pane
  Src: LocationView.cpp LocationView.h MergeEditView.h

2005-01-02 Kimmo
 PATCH: [ 1088049 ] Ask about saving when Window/Close is selected
  Src: MergeEditView.cpp MergeEditView.h

2004-12-29 Perry
 BUG: [ 1064942 ] Copyright notice????
  Bumped copyright year to continue through 2005
   Src: Merge.rc
 BUG: [ 859995 ] convertToBuffer assumes ISO-8895-1 codepage
  Add comment about flawed code in actual code
   Src/Common: unicoder.cpp
 BUG: [ 859995 ] convertToBuffer assumes ISO-8895-1 codepage
  Removed flawed and unused method convertToBuffer.
   Src/Common: unicoder.cpp unicoder.h

2004-12-17 Kimmo
 PATCH: [ 1086601 ] Dircompare statepane miscounting skipped items
  Src: DirCompStateBar.cpp
 PATCH: [ 1086745 ] Find- and Replace-dialogs to remember strings too
  Src/editlib: ccrystaltextview.cpp ceditreplacedlg.cpp ceditreplacedlg.h
   cfindtextdlg.cpp cfindtextdlg.h

2004-12-15 Tim
 RFE: [ 1085099 ] 'fileskip.bmp' looks to similar to 'equal.bmp'
  Src/res: fileskip.bmp
  Languages: fileskip.bmp

2004-12-05 WinMerge experimental release 2.3.1.1 (cvs)

2004-12-04 Kimmo
 PATCH: [ 1078505 ] Use DOS eol as filename/pathname clipboard separator
  Src: DirView.cpp
 PATCH: [ 981218 ] Show filenames/paths in caption
  Src: DirDoc.cpp DirDoc.h DirView.cpp DirView.h MainFrm.cpp MergeDoc.cpp MergeDoc.h 

2004-12-03 Kimmo
 PATCH: [ 1068011 ] Partial French translation
  Submitted by Matthieu Pupat
  Src/Languages/French: MergeFrench.rc
  Docs/Users: Contributors.txt

2004-12-01 Kimmo
 PATCH: [ 1075591 ] Disable file filter edit button for no filter selection
  Src: FileFiltersDlg.cpp FileFiltersDlg.h
 PATCH: [ 1062082 ] Fix bug [1057997] (long lines issue)
  Additional optimisation from Takashi Sawanaka
  Src/editlib: ccrystaltextview.cpp
 
2004-11-27 Jochen
 Remove unneeded system.cpp (no longer present in 7z411+) from Merge7z DSPs
  Merge7z: Merge7z311.dsp Merge7z312.dsp Merge7z313.dsp
  Merge7z407.dsp Merge7z408.dsp Merge7z409.dsp Merge7z410.dsp Merge7z411.dsp Merge7z412.dsp

2004-11-20 Kimmo
 PATCH: [ 1058142 ] update coloring of batch file
  Submitted by Andre Arpin
  Src/editlib: batch.cpp

2004-11-17 Kimmo
 PATCH: [ 1067374 ] Norwegian translation for 2.2.0
  Submitted by Hans Fr. Nordhaug
  Src/Languages/Norwegian: MergeNorwegian.rc

2004-11-14 Kimmo
 PATCH: [ 1065462 ] Show all skipped items when selected so
  Src: DirDoc.cpp

2004-11-12 Kimmo
 PATCH: [ 1057062 ] Separate Skipped flags from compare result flags
  Src: DiffContext.h DirCompStateBar.cpp DirDoc.cpp DirScan.cpp
   DirView.cpp DirViewColItems.cpp

2004-11-11 Kimmo
 PATCH: [ 1063342 ] Fix problem in XML syntax highlight and backslash
  Src/editlib: xml.cpp
 BUG: [ 1063100 ] Files with a space not handled (Clearcase integration)
  Src: MainFrm.cpp
 PATCH: [ 1059785 ] Simplify dir compare item update after copy etc
  Src: DiffContext.cpp DiffContext.h DiffFileInfo.cpp DiffFileInfo.h
   DirActions.cpp DirDoc.cpp DirDoc.h

2004-11-09 Jochen
 PATCH: [ 1062082 ] Fix bug [1057997] (long lines issue)
  Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
 PATCH: [ 1059604 ] Fix bug [1048997] archive popup interferes with Help menu
  Src: 7zCommon.cpp

2004-11-09 Perry
 PATCH: [ 1050329 ] readme-developers-InnoSetup.html
  Docs/Developers: readme-developers-InnoSetup.html

2004-11-07 Kimmo
 BUG: [ 828065 ] More overlapping letters in Dansk/Norsk
  Fix from Christian
  Src/Languages/Danish: MergeDanish.rc 

2004-11-06 Perry
 PATCH: [ 1053475 ] Exponentially grow long lines when reading
  Src/Common: UniFile.cpp UniFile.h
  Src: Merge.dsp MergeDoc.cpp
 Fix UniFile.cpp for UNICODE build (PATCH: [ 1053475 ]).

2004-11-05 Kimmo
 PATCH: [ 1061155 ] Updated danish translation
  Submitted by Christian
  Src/Languages/Danish: MergeDanish.rc

2004-11-03 Kimmo
 PATCH: [ 1058992 ] More flexible whitespaces for file filter files
  Src: FileFilterMgr.cpp
 BUG: [ 1058947 ] Filter files sensitive to spaces
  Add new file filter for ADAMulti (from jpizzi)
  Filters new file: ADAMulti.flt
 PATCH: [ 1053282 ] Korean translation
  Submitted by Sukjoon, Hwang
  Src/Languages/Korean: MergeKorean.rc

2004-11-02 Kimmo
 PATCH: [ 1058293 ] The finished german language file
  Submitted by Tim Gerundt
  Src/Languages/German: MergeGerman.rc
 BUG: [ 1057699 ] GetModTime() in DirDoc.cpp is unused
  Src: DirDoc.cpp

2004-11-01 Kimmo
 PATCH: [ 1057719 ] Add Hungarian translator to Contributors list
  Docs/Users: Contributors.txt

2004-10-31 Perry
 PATCH: [ 1036683 ] unicoder.cpp always use GetACP codepage (remove dead variable)
  Src/Common: unicoder.cpp

2004-10-30 Perry
 PATCH: [ 1055624 ] The finished hungarian language file
  (translation credit in versioninfo)
 Src/Languages: Hungarian/MergeHungarian.rc

2004-10-29 Jochen
 Add Merge7z410.dsp
  Merge7z: Merge7z410.dsp

2004-10-29 Kimmo
 PATCH: [ 1055681 ] Add Bool type for options and convert existing options
  Src: DirActions.cpp DirDoc.cpp DirView.cpp MainFrm.cpp MergeDiffDetailView.cpp
   MergeDoc.cpp MergeEditView.cpp OpenDlg.cpp
  Src/Common: OptionsMgr.cpp OptionsMgr.h varprop.h

2004-10-28 Kimmo
 PATCH: [ 1055551 ] Move cursor to begin of previous line when deleting diff
  Src: MergeDoc.cpp MergeDoc.h MergeEditView.cpp
 PATCH: [ 1053234 ] Suggested expansions for Organization.txt
  Submitted by Perry
  Docs/Developers: Organisation.txt

2004-10-28 Perry
 PATCH: [ 1055067 ] Add Hungarian support
  Src/Common: LanguageSelect.cpp
 PATCH: [ 1055624 ] The finished hungarian language file
  Src/Languages: Hungarian/*
 PATCH: [ 1053421 ] Changing warning level to 3 in release targets
  Src: Merge.dsp

2004-10-27 Perry
 PATCH: [ 1003457 ] Move difflist to new class DiffList
  Fix warnings for signed/unsigned comparison
  Src: DiffList.cpp

2004-10-26 Kimmo
 PATCH: [ 1003457 ] Move difflist to new class DiffList
  Last minute updates to files I forgot to add (thanks Perry!)
  Src: DiffList.cpp DiffList.h

2004-10-25 Perry
 PATCH: [ 1003457 ] Move difflist to new class DiffList
  Src: DiffList.cpp DiffList.h

2004-10-25 Kimmo
 PATCH: [ 1003457 ] Move difflist to new class DiffList
  Src: DiffWrapper.cpp DiffWrapper.h LocationView.h Merge.dsp
   MergeDiffDetailView.cpp MergeDoc.cpp MergeDoc.h MergeEditView.cpp
 BUG: [ 1052762 ] WinMerge VERY slow to startup
  Src: BCMenu.cpp

2004-10-24 WinMerge experimental release 2.1.7.16 (cvs) (Perry)

2004-10-24 Perry
 PATCH: [ 1053282 ] Korean translation
 Src/Languages/Korean: MergeKorean.rc

2004-10-24 Kimmo
 PATCH: [ 1048288 ] Fixes to Organization.txt
  Submitted by Perry
  Docs/Developers/Organisation.txt

2004-10-24 Perry
 BUG: [ 1048439 ] UNICODE build calling IsDBCSLeadByte (shouldn't)
  Src: stringdiffs.cpp
  Src/editlib: ccrystaltextview.cpp

2004-10-23 Kimmo
 BUG: [ 1052283 ] after edit, asks TWICE for rewriting the original file (-e switch)
  Src: MergeDoc.cpp
 Clarify comment about closing app in CMainFrame::PreTranslateMessage()
  Src: MainFrm.cpp

2004-10-22 Perry
 PATCH: [ 966908 ] find byte difference in line
 Src: Merge.rc MergeDiffDetailView.cpp MergeDiffDetailView.h
  MergeDoc.h MergeDocLineDiffs.cpp MergeEditView.cpp
  MergeEditView.h resource.h stringdiffs.cpp stringdiffs.h

2004-10-19 Perry
 PATCH: [ 1049688 ] Fix caret handling of displayable whitespace
 Src/editlib: ccrystaltextview.cpp

2004-10-18 Kimmo
 PATCH: [ 1048838 ] German translation updated for RC
  Submitted by Tim Gerundt
  Src/Languages/German: MergeGerman.rc

2004-10-18 Perry
 PATCH: [ 1048412 ] Log font info in configuration
  Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
 PATCH: [ 1036683 ] unicoder.cpp always use GetACP codepage
  Src/Common: unicoder.cpp

2004-10-17 Perry
 PATCH: [ 1048405 ] Delete old, commented out line in ConfigLog.cpp
  Src: ConfigLog.cpp

2004-10-17 Jochen
 PATCH: [ 1043909 ] Add support for 7-Zip 4.09, plus DSPs for 4.07 and 4.08
 Leave decision whether to recurse into folders to enumerator
 Fix leading zero in 7-Zip minor version numbers shown in "archive support disabled" message
  Merge7z: Merge7z.def Merge7z.h Merge7z311.cpp Merge7z407.dsp Merge7z408.dsp Merge7z409.cpp
   Merge7z409.dsp Merge7zCommon.cpp Merge7zCommon.h revision.txt StdAfx.h
  Src: 7zCommon.cpp 7zCommon.h

2004-10-16 Kimmo
 PATCH: [ 1046546 ] Open new manual locally
  Src: MainFrm.cpp

2004-10-15 Kimmo
 PATCH: [ 1046583 ] Improved 48x48 icon
  Submitted by Tim Gerundt
  Src/res: Merge.ico
  Src/Languages/*/res: Merge.ico
 PATCH: [ 1047670 ] Catalan translation update
  Submitted by Jordi Vilar
  Src/Languages/Catalan: MergeCatalan.rc
 BUG: [ 1047812 ] number of differences not recalculated (merging whole files)
  Src: DirActions.cpp

2004-10-15 WinMerge experimental release 2.1.7.15 (cvs) (Perry)

2004-10-14 Kimmo
 PATCH: [ 942447 ] CVS organisation doc
  Docs/Developers new file: Organisation.txt

2004-10-13 Kimmo
 PATCH: [ 1045473 ] Disable Ctrl+Arrow merging in Mergemode
  Src: MergeEditView.cpp
 Additional change for patch [ 1045473 ]
  Src: MergeEditView.cpp

2004-10-12 Perry
 PATCH: [ 1043819 ] Fix recent compiler warnings in src/util.c
  diffutils: src/util.c

2004-10-11 Perry
 PATCH: [ 1040016 ] patch for BUG[1039615] caret splitting wide characters
  Src/editlib: ccrystaltextview.cpp

2004-10-09 Kimmo
 BUG: [ 1035227 ] Selected font change won't be applied... when not needed
  Src: MainFrm.cpp
 PATCH: [ 1043246 ] Fix problem selecting <none> as filefilter
  Src: FileFilterHelper.cpp FileFiltersDlg.cpp
 PATCH: [ 1043367 ] Change brace indentation automation for C/C++
  Src/editlib: ccrystaltextview.cpp

2004-10-06 Kimmo
 PATCH: [ 1040041 ] [ 1039640 ] reproducible tooltip ASSERT in debug
  Submitted by Takashi Sawanaka
  Src: MergeEditView.cpp

2004-10-05 Kimmo
 PATCH: [ 1039552 ] Italian translation updated for RC
  Submitted by Andrea Decorte
  Src/Languages/Italian: MergeItalian.rc
 PATCH: [ 1034854 ] Use "Terminal" font instead of "Courier" as default font.
  Submitted by Takashi Sawanaka
  Src: MainFrm.cpp

2004-10-04 Kimmo
 BUG: [ 1037587 ] XML Syntax highlighting: Problems with numbers
  Src/editLib: xml.cpp
 PATCH: [ 1039552 ] Italian translation updated for RC
  Submitted by Andrea Decorte
  Src/Languages/Italian: MergeItalian.rc
 PATCH: [ 1039495 ] Trap diffutils errors with SEH
  Src: DiffWrapper.cpp DiffWrapper.h
  Src/diffutils/src: UTIL.C
 PATCH: [ 1003107 ] Remove unused CMergeDoc::CountPrevBlanks()
  Src: MergeDoc.cpp MergeDoc.h

2004-10-04 Perry
 PATCH: [ 1039300 ] Factor listviewex code so it can be used with a CListCtrlEx.
  Src/Common: listvwex.cpp listvwex.h

2004-10-03 Perry
 PATCH:[ 1037449 ] Fix char width computation for displayable whitespace
  Src/editlib: ccrystaltextview.cpp ccrystaltextview.h

2004-10-03 Kimmo
 PATCH: [ 1039096 ] Save ignore EOL option when changed during file loading
  Src: MergeDoc.cpp
 PATCH: [ 1039372 ] Save mixed EOL option when changed during file loading
  Src: MergeDoc.cpp
 PATCH: [ 1039552 ] Italian translation updated for RC
  Submitted by Andrea Decorte
  Src/Languages/Italian: MergeItalian.rc

2004-10-02 Kimmo
 PATCH: [ 1039001 ] Swedish translation update
  Submitted by Hans Eriksson
  Src/Languages/Swedish: MergeSwedish.rc

2004-10-01 Perry
 PATCH: [ 1038749 ] Fix whitespace display
  Src/editlib: ccrystaltextview.cpp
 PATCH: [ 1036558 ] Cosmetic cleanup in CMergeApp::DoMessageBox
  Src: Merge.cpp

2004-10-01 Kimmo
 PATCH: [ 1038091 ] Various Updates in German Translation
  Submitted by Tim Gerundt
  Src/Languages/German: MergeGerman.rc
 PATCH: [ 1038361 ] Left/Right read-only cmdline arguments wrong way around
  Submitted by markanthony
  Src: MainFrm.cpp

2004-09-30 2.2RC (2.1.8.0) released

2004-09-30 Perry
 Fix bracketing mistake in PATCH: [ 1034810 ]
  Src/editlib: ccrystaltextview.cpp
 PATCH: [ 1034754 ] Fix demoGuessEncoding's default
  Src: codepage.cpp codepage.h DiffWrapper.cpp
 PATCH: [ 1037418 ] Fix whitespace for Unicode non-1252
 PATCH: [ 1037424 ] fix non-unicode initialization loop in ViewableWhitespace
  Src: ViewableWhitespace.cpp

2004-09-29 Perry
 PATCH: [ 1034810 ] fix whitespace for other encodings
  Src: Merge.dsp ViewableWhitespace.cpp ViewableWhitespace.h
  Src/editlib: ccrystaltextview.cpp

2004-09-29 Kimmo
 PATCH: [ 1036134 ] Show error about invalid linefilter regexps
  Src: MainFrm.cpp MainFrm.h Merge.rc resource.h
  Src/diffutils/lib: REGEX.C REGEX.H
  Src/Languages: *.rc resource.h

2004-09-28 Kimmo
 PATCH: [ 1034719 ] IDS_SUGGEST_IGNORECODEPAGE change?
  Submitted by Perry
  Src: Merge.rc
  Src/Languages: *.rc (except MergeCatalan.rc, MergeItalian.rc & MergeSwedish.rc)
 PATCH: [ 1002247 ] Remove unneeded CDirView::OnCustomDraw()
  Src: DirView.cpp DirView.h

2004-09-27 Kimmo
 Add links to DocBook DSSL customisation
  Docs/Developers: readme-developers.html

2004-09-27 Perry
 PATCH: [ 968285 ] DBCS fixes from Sawanaka
  The crystaltextview.cpp portion of patch, with a new method (GetCharWidthFromChar) to reduce ifdefs.
  Src/EditLib: ccrystaltextview.cpp

2004-09-25 Kimmo
 PATCH: [ 1034550 ] Catalan translation update
  Submitted by Jordi Vilar
  Src/Languages/Catalan: MergeCatalan.rc
 PATCH: [ 1034557 ] Swedish translation update
  Submitted by Hans Eriksson
  Src/Languages/Swedish: MergeSwedish.rc
 PATCH: [ 1034642 ] Updated Japanese Translation
  Submitted by Takashi Sawanaka
  Src/Languages/Japanese: MergeJapanese.rc

2004-09-24 Kimmo
 PATCH: [ 1033678 ] Better description for 'Reset messageboxes'
  Src: Merge.rc
  Src/Languages: *.rc
 Open WinMerge manual from http://winmerge.org/2.2/manual/index.html
  Src: MainFrm.cpp
 BUG: [ 1034019 ] Italian: language list unsorted
  Src/Languages/Italian: MergeItalian.rc

2004-09-23 Kimmo
 PATCH: [ 1032841 ] Add 'DiffEngine' filegroup to project file
  Src: Merge.dsp

2004-09-22 Kimmo
 BUG: [ 1029646 ] (Norwegian) Options/Editor text chopped off
  Fix all languages
  Src: Merge.rc
  Src/Languages: *.rc
 BUG: [ 1029637 ] (Italian) Options/Codepage detect codepage label cut-off
  Fix all languages
  Src: Merge.rc
  Src/Languages: *.rc

2004-09-21 Kimmo
 Widen space for text in language change dialog
  Src: Merge.rc
  Src/Languages: *.rc

2004-09-20 Kimmo
 PATCH: [ 1030752 ] Set focus to file view when goto line in location pane
  Src: LocationView.cpp
 BUG: [ 1026833 ] WinMergeU.exe build to dir MergeUnicodeReleaseMinsize
  Build WinMergeU.exe to Build\MergeUnicodeRelease\
  Src: Merge.dsp

2004-09-19 Kimmo
 PATCH: [ 1030490 ] Updated Swedish Translation
  Submitted by Hans Eriksson
  Src/Languages/Swedish: MergeSwedish.rc
 BUG: [ 1029644 ] (English) Options/System wording fix
  Src: Merge.rc
 More space for texts in Options/System
  Src: Merge.rc
  Src/Languages: *.rc

2004-09-17 Kimmo
 PATCH: [ 1029538 ] Reverse 'Ignore carriage return differences' when resetting
  Src: PropCompare.cpp
 BUG: [ 1029647 ] (English) Options/General text cut-off
  Fixed other languages also
  Src: Merge.rc
  Src/Languages: *.rc (except MergeCatalan.rc)

2004-09-16 Perry
 Fix Italian editor property page (tabs section) & widen corresponding English controls
  Src: Merge.rc
  Src/Languages: Italian/MergeItalian.rc

2004-09-15 WinMerge experimental release 2.1.7.14 (cvs)

2004-09-15 Kimmo
 PATCH: [ 1027936 ] Fix statusbar display for ghost lines
  Src: MergeEditView.cpp
 PATCH: [ 1027994 ] Use current filename and path as defaults for SaveAs dialog
  Src: MergeDoc.cpp
 BUG: [ 1027605 ] Esc (as indicated by File Exit) doesn't quit app
  Remove ESC from menuitem. Also fix merge-mode shortcut to F9.
  Src: Merge.rc
  Src/Languages: *.rc
 PATCH: [ 1026619 ] Fix bug [ 1017264 ] Location pane contextmenu items...
  Submitted by Jochen (jtuc)
  Src: LocationView.cpp

2004-09-14 Kimmo
 PATCH: [ 1027118 ] Separate items for Copy Path in dircompare context menu
  Src: DirView.cpp DirView.h Merge.rc resource.h
  Src/Languages: *.rc resource.h
 PATCH: [ 1027382 ] Customised Save As dialog captions
  Src: Merge.rc MergeDoc.cpp resource.h
  Src/Languages: *.rc resource.h
 Add Lee Jae-Hong as Korean translator contributor
  Docs/Users: Contributors.txt
 Remove declaration of non-existent function DeleteFileOrError()
  Src: MainFrm.h
 Remove declaration of non-existent function CleanupFileBufs()
  Src: MainFrm.h
 Don't hide rescan result for binary file compare
  Src: MergeDoc.cpp

2004-09-13 Kimmo
 PATCH: [ 1026894 ] More space for translations in Goto-dialog
  Src: Merge.rc
  Src/Languages: *.rc
 PATCH: [ 1027086 ] Catalan translation Update
  Submitted by Jordi Vilar
  Src/Languages/Catalan: MergeCatalan.rc
 Add note about changed commandline when using docbook2html in SF.net
  Docs/Developers: readme-developers.html
 PATCH: [ 1027183 ] Swedish Translation Update
  Submitted by Hans Eriksson
  Src/Languages/Swedish: MergeSwedish.rc
 Fix couple of lang names in Swedish translation
  Submitted by Hans Eriksson
  Src/Languages/Swedish: MergeSwedish.rc

2004-09-12 Kimmo
 Fix Italian lang file build error and remove unneeded \n
  Src/Languages/Italian: MergeItalian.rc

2004-09-10 Kimmo
 PATCH: [ 1025411 ] Cleanup PropVSS.cpp
  Src: PropVss.cpp
 PATCH: [ 1025443 ] Add '1 Difference Found' text
  Src: Merge.rc MergeDoc.cpp resource.h
  Src/Languages: *.rc resource.h
 Add instructions for compiling lang files (using MakeResDll.exe)
  Docs/Developers: readme-developers.html

2004-09-09 Kimmo
 PATCH: [ 1025052 ] Italian translation updated for latest experimental version
  Submitted by Andrea Decorte
  Src/Languages/Italian: MergeItalian.rc
 PATCH: [ 1023074 ] Fix and cleanup version control options dialog
  Src: Merge.rc
  Src/Languages: *.rc

2004-09-08 Kimmo
 PATCH: [ 1023917 ] Don't close dirview when mergedocs closed by reusing code
  Fixes bug #1023412 Crash in WinMerge.exe 2.1.7.13
  Src: DirDoc.cpp DirDoc.h

2004-09-03 WinMerge experimental release 2.1.7.13 (cvs)

2004-09-03 Kimmo
 PATCH: [ 1021153 ] Fix ansi files EOL detection in unicode builds
  Src/Common: UniFile.cpp
 BUG: [ 986708 ] Wrong EOL character
  DOS EOL was inserted when editing unix or mac files
  Src/editlib: ccrystaleditview.cpp
 PATCH: [ 1021478 ] Korean Resource file update
  Submitted by Lee Jae-Hong
  Src/Languages/Korean: MergeKorean.rc

2004-09-02 Kimmo
 PATCH: [ 1020403 ] Allow WinMerge to open files write-locked by another app
  Src/Common: UniFile.cpp
 Fix for patch #1019108: update rescan info also after saving
  Src: MergeDoc.cpp
 BUG: [ 1021003 ] Unicode builds do not read ansi files properly (UniFile.cpp)
  Fix what seems to be invalid #ifdef'ing for unicode build
  Src/Common: UniFile.cpp
 PATCH: [ 1014455 ] more explicit error message if archive support not available
  Submitted by Jochen
  Src: 7zCommon.cpp 7zCommon.h MainFrm.cpp MainFrm.h Merge.rc resource.h
  Src/Languages: *.rc resource.h

2004-09-01 Kimmo
 PATCH: [ 1019759 ] Allow D&D projectfile to main window
  Src: MainFrm.cpp
 PATCH: [ 1019945 ] Don't fail configlog writing silently
  Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
 PATCH: [ 1019393 ] Inform user about missing archive support (Zip* menuitems)
  Src: 7zCommon.cpp 7zCommon.h DirView.cpp Merge.rc resource.h
  Src/Languages: *.rc resource.h

2004-08-31 Kimmo
 PATCH: [ 1019108 ] Warn if file changed on disk between rescans
  Src: Merge.rc MergeDoc.cpp MergeDoc.h resource.h
  Src/Languages: *.rc resource.h
 Add note about overwriting WinMerge executable path for ShellExtension
  Docs/Developers: readme-developers.html

2004-08-27 WinMerge experimental release 2.1.7.12 (cvs)

2004-08-27 Kimmo
 PATCH: [ 1017294 ] When closing file compare close also empty directory compare
  Src: DirDoc.cpp

2004-08-26 Kimmo
 BUG: [ 1016056 ] Panes don't remember settings when new file is opened
  Src: ChildFrm.cpp
 PATCH: [ 1016282 ] Add GetDefault() to COptionsMgr
  Src: PropColors.cpp
  Src/Common: OptionsMgr.cpp OptionsMgr.h
 Convert Compare options dialog for GetDefault()
  Src: PropCompare.cpp

2004-08-25 Kimmo
 PATCH: [ 1008755 ] avoid flickering when diff view opens
  Don't update desktop icon (from Takashi Sawanaka)
  Src: ChildFrm.cpp
 PATCH: [ 1015330 ] Better file saving error message
  Src: Merge.rc MergeDoc.cpp MergeDoc.h
  Src/Common: UniFile.cpp
  Src/Languages: *.rc
 PATCH: [ 1015393 ] Strip whitespaces from paths in Open-dialog
  Src: OpenDlg.cpp OpenDlg.h

2004-08-23 Kimmo
 PATCH: [ 1013715 ] Catalan translation update
  Submitted by Jordi Vilar
  Src/Languages/Catalan: MergeCatalan.rc
 Check path length in VSS integration
  Src: VSSHelper.cpp
 PATCH: [ 1012328 ] Simpler Zip* menuitems
  Src: DirView.cpp Merge.rc
  Src/Languages: *.rc

2004-08-20 Kimmo
 PATCH: [ 1012291 ] Open Find-dialog for F3 if no previous find
  Src/editlib: ccrystaltextview.cpp
 PATCH: [ 1012192 ] Show selected items count in dir compare statusbar
  Src: DirView.cpp DirView.h Merge.rc resource.h
  Src/Languages: resource.h *.rc

2004-08-19 Kimmo
 PATCH: [ 982140 ] Merge7z : compress folders
  Submitted by Laoran
  Merge7z: Merge7z311.cpp Merge7z311.dsp Merge7z312.dsp Merge7z313.dsp
 PATCH: [ 981788 ] modify UI to compress folders
  Submitted by Laoran
  Src: DirView.cpp
 RFE: [ 953630 ] Ctrl+Shift+Z for Redo in file comparison
  Src: Merge.rc
  Src/Languages: *.rc

2004-08-18 Kimmo
 RFE: [ 952959 ] split Are you sure you want to copy into more lines
  Src: Merge.rc
  Src/Languages: *.rc
 PATCH: [ 1011066 ] Better error message for failed file loading
  Src: MergeDoc.cpp MergeDoc.h
  Src/Common: UniFile.cpp
 PATCH: [ 1002432 ] codepage UI version 2
  Patch by Perry and Laoran
  Src: ConfigLog.cpp ConfigLog.h DirDoc.cpp DirScan.cpp MainFrm.cpp Merge.dsp
   Merge.rc OptionsDef.h PropGeneral.cpp PropGeneral.h resource.h
  Src new files: codepage.cpp codepage.h PropCodepage.cpp PropCodepage.h
  Src/Common: LanguageSelect.cpp multiformatText.cpp unicoder.cpp unicoder.h unifile.cpp
  Src/Languages: resource.h *.rc

2004-08-17 WinMerge experimental release 2.1.7.11 (cvs)

2004-08-17 Kimmo
 PATCH: [ 1010387 ] Updated MergeSwedish.rc file
  Submitted by Hans Eriksson
  Src/Languages/Swedish: MergeSwedish.rc
 PATCH: [ 975840 ] Cleanup VCS/VSS code part 2
  Src: MainFrm.cpp MainFrm.h Merge.dsp 
  Src new files: VSSHelper.cpp VSSHelper.h

2004-08-16 Kimmo
 BUG: [ 1002035 ] Crash with locked files (WM v2.1.7.10)
  Src: MainFrm.cpp
 BUG: [ 1002035 ] Crash with locked files (WM v2.1.7.10)
  Src: MergeDoc.cpp
 BUG: [ 1009918 ] Binary files not detected (unicode builds)
  Src/Common: UniFile.cpp

2004-08-14 Kimmo
 PATCH: [ 1008755 ] avoid flickering when diff view opens
  Submitted by Takashi Sawanaka
  Src: ChildFrm.cpp DiffViewBar.cpp
 Don't post ID_FORCE_REDRAW in CCrystalTextView::OnSize()
  Suggested by Takashi Sawanaka in patch item #1008755
  Src/editlib: ccrystaltextview.cpp

2004-08-13 Kimmo
 BUG: [ 1007320 ] VB Syntax highlighting: Wrong masking from "
  Src/editlib: basic.cpp

2004-08-12 Kimmo
 PATCH: [ 1007212 ] Make extension matching in Open-dialog case insensitive
  Src: FileFilterHelper.cpp
 PATCH: [ 1007216 ] Allow '*.' to match files without extension in Open-dialog
  Src: FileFilterHelper.cpp
 PATCH: [ 1007627 ] Filter selection fixes
  Src: FileFilterHelper.cpp FileFilterHelper.h MainFrm.cpp OpenDlg.cpp
   OpenDlg.h OptionsDef.h

2004-08-11 Kimmo
 PATCH: [ 1006475 ] Don't save editor settings to different key in registry
  Src/editlib: editreg.h
 PATCH: [ 1006870 ] Don't add '\' to filenames for regexp filtering
  Src: FileFilterHelper.cpp
 Backout PATCH: [ 999738 ] Gray out moved block menuitems when moved blocks disabled
  Those menuitems didn't work like I expected
  Src: LocationView.cpp

2004-08-10 Kimmo
 BUG: [ 1006164 ] accelerator conflict
  Src: Merge.rc
 PATCH: [ 1003181 ] Move filter options to OptionsManager
  Src: MainFrm.cpp MainFrm.h OptionsDef.h

2004-08-04 Kimmo
 PATCH: [ 1001981 ] Italian translation updated
  Submitted by Andrea Decorte
  Src/Languages/Italian: MergeItalian.rc
 PATCH: [ 1002585 ] Update dir compare statepane counts when reopening
  Src: DirView.cpp
 PATCH: [ 1002887 ] Enable Change Pane menuitem for Diff Pane
  Src: MergeDiffDetailView.cpp MergeDoffDetailView.h
 PATCH: [ 1000020 ] Simple project files (no GUI)
  Src: MainFrm.cpp MainFrm.h Merge.cpp Merge.dsp Merge.h OpenDlg.cpp OpenDlg.h
  Src new files: ProjectFile.cpp ProjectFile.h
 Option OPT_HIDE_BACKUP didn't get removed when UI was removed, remove it now
  Src: ConfigLog.cpp ConfigLog.h DirDoc.cpp MainFrm.cpp OptionsDef.h
 Backout previous 'Option OPT_HIDE_BACKUP didn't get removed..' checkin.
  It caused build with VC6 to crash in dir compare -- really weird why
  Src: ConfigLog.cpp ConfigLog.h DirDoc.cpp MainFrm.cpp OptionsDef.h

  
2004-08-03 Kimmo
 PATCH: [ 1002333 ] Set default filter to *.* when starting WinMerge
  Src: Merge.cpp
 PATCH: [ 1002280 ] Don't show dircompare statepane if no dircompare results
  Src: DirView.cpp
 Remove GPL licence from coretools.cpp/h - that code is mostly freeware, not GPL
  Src/Common: coretools.cpp coretools.h
 PATCH: [ 1001974 ] Allow ESC to stop dir compare
  Src: DirCompStateBar.cpp
 PATCH: [ 1000423 ] Try to fix invisible find result
  Updated patch
  Src/editlib: ccrystaltextview.cpp

2004-08-02 Kimmo
 PATCH: [ 1001111 ] Warn if user selected binary files for patch creating
  Src: MainFrm.cpp Merge.rc PatchTool.cpp resource.h
  Src/Languages: *.rc resource.h
 PATCH: [ 999804 ] Fix setting recursive for Open-dialog
  New patch fixing bug #1001301 recursive not getting remembered
  Src: MainFrm.cpp MainFrm.h Merge.cpp

2004-08-01 Perry
 PATCH: [ 967405 ] Add Japanese satellite dll to MakePatchDirs
  MakePatchDirs: MakePatchDirs.dsp MakePatchDirs.rc
   MakePatchDirsApp.cpp MakePatchDirsDlg.cpp MakePatchDirsDlg.h
   resource.h StdAfx.h
 PATCH: [ 967405 ] Add Japanese satellite dll to MakePatchDirs
 (Adding new files forgotten at first check-in)
  MakePatchDirs: MakePatchDirs_ja.dsp MakePatchDirs_ja.rc 
  MakePatchDirs_sat.cpp Satellites.cpp Satellites.h

2004-07-31 Perry
 PATCH: [ 989288 ] Inno Setup Localization: Italian
  InnoSetup\Languages: Italian.isl
 PATCH: [ 963429 ] Fix language in floating status bar
  Src: DirCompStateBar.cpp DirCompStateBar.h DirDoc.cpp DirFrame.cpp DirFrame.h 
   DirView.cpp

2004-07-31 Kimmo
 PATCH: [ 1000714 ] Don't create difflist or patch file for binary files
  Src: DiffWrapper.cpp
 PATCH: [ 1000772 ] Fix focus in SaveClosing dialog
  Src: SaveClosingDlg.cpp

2004-07-30 Kimmo
 PATCH: [ 999738 ] Gray out moved block menuitems when moved blocks disabled
  Src: LocationView.cpp
 PATCH: [ 1000117 ] Hide only skipped subfolders in non-recursive compare
  Fixes bug #922718 'show different files' off : subdirs not displayed
  Src: DirDoc.cpp DirDoc.h
 PATCH: [ 1000308 ] Add GotoLine() to CMergeEditView and use it
  Src: LocationView.cpp LocationView.h MergeEditView.cpp MergeEditView.h
 Add icons to Find and Replace result messageboxes.
  Src/editlib: ceditreplacedlg.cpp cfindtextdlg.cpp
 PATCH: [ 1000423 ] Try to fix invisible find result
  Bug: #951584 Find: word found not visible or badly placed
  Src: MergeDocLineDiffs.cpp
  Src/editlib: ccrystaltextview.cpp ccrystaltextview.h

2004-07-29 Kimmo
 PATCH: [ 999681 ] Accept filter name from commandline
  Src: FilterHelper.cpp FilterHelper.h Merge.cpp Merge.rc
  Src/Languages: *.rc
 PATCH: [ 999804 ] Fix setting recursive for Open-dialog
  Src: MainFrm.cpp OpenDlg.cpp OpenDlg.h

2004-07-28 Kimmo
 Remove suppressing checkbox from commandline help messagebox
  Src: Merge.cpp

2004-07-23 Perry
 PATCH: [ 988505 ] updated email address for catalan translator
  Update email address for Jordi Vilar (Catalan translator)
   Web\developer\l10n: status.xml
 PATCH: [ 988503 ] Inno Setup Localization: Catalan
  InnoSetup\Languages: Catalan.isl

2004-07-23 WinMerge experimental release 2.7.1.10 (cvs)

2004-07-19 Perry
 BUG: [ 993402 ] Need review of native language names
  Removed asterisks from Nederlands & Svenska (thanks to A. Decorte).
   Src/Common: LanguageSelect.cpp
   
2004-07-18 Perry
 BUG: [ 969933 ] 'discriminated' language names
  Capitalized native language names to make consistent in language selection box
   Src/Common: LanguageSelect.cpp

2004-07-17 Kimmo
 PATCH: [ 992218 ] Add -f commandline switch for filemask
  Usage: WinMerge -f "*.ext1 *.ext2" (like in Open-dialog)
  Src: FileFilterHelper.cpp FileFilterHelper.h MainFrm.cpp Merge.cpp
   Merge.rc OpenDlg.cpp OpenDlg.h
  Src/Languages: *.rc
 
2004-07-16 Kimmo
 PATCH: [ 990976 ] FileFilterHelper (filter code cleanup)
  Src: DiffContext.cpp DiffContext.h DirDoc.cpp DirDoc.h DirScan.cpp
   FileFiltersDlg.cpp FileFilterDlg.h MainFrm.cpp Merge.cpp Merge.dsp
   Merge.h OpenDlg.cpp
  Src new files: FileFilterHelper.cpp FileFilterHelper.h
 PATCH: [ 986393 ] Lose '(debug)' from 'Reload plugins'
  Src: Merge.rc
  Src/Languages: *.rc
 PATCH: [ 941621 ] widen find/replace dialog
  Find-dialog
  Src: Merge.rc
  Src/Languages: *.rc
 PATCH: [ 941621 ] widen find/replace dialog
  Replace-dialog
  Src: Merge.rc
  Src/Languages: *.rc
 PATCH: [ 990901 ] Add Move to DirView Context menu commands.
  Submitted by Vladimir Lukianov
  Src: DirActions.cpp DirView.cpp DirView.h Merge.rc resource.h
  Src/Languages: *.rc resource.h

2004-07-15 Kimmo
 PATCH: [ 991181 ] Disable 'Goto Line' outside reduced locationpane bars
  Src: LocationView.cpp
 PATCH: [ 990365 ] Dialog to ask about saving modified files
  Src: Merge.dsp Merge.rc MergeDoc.cpp resource.h
  Src new files: SaveClosingDlg.cpp SaveClosingDlg.h
  Src/Languages: *.rc resource.h

2004-07-14 Kimmo
 PATCH: [ 988494 ] Catalan translation update
  Submitted by Jordi Vilar
  Src/Languages/Catalan: MergeCatalan.rc 
  Src/Languages/Catalan/res: splash1.bmp

2004-07-08 Kimmo
 PATCH: [ 987122 ] Horizontal scroll for dirview columns dialog listboxes
  Src: DirColsDlg.cpp DirColsDlg.h Merge.dsp Merge.rc
  Src/Common new files: HScrollListBox.cpp HScrollListBox.h
  Src/Languages: *.rc

2004-07-08 Kimmo
 PATCH: [ 986794 ] Hide 'Apply' button from filters dialog
  Src: MainFrm.cpp
 PATCH: [ 986785 ] Improve location pane with short files
  Src: LocationView.cpp LocationView.h
 PATCH: [ 986873 ] Allow recursive compares for archive files
  Src: OpenDlg.cpp

2004-07-07 Kimmo
 PATCH: [ 983265 ] Italian translation updated for latest experimental version
  Src/Languages/Italian: MergeItalian.rc

2004-07-04 WinMerge experimental release 2.1.7.9 (cvs)

2004-07-04 Perry
 Add lost piece of PATCH: [ 982960 ] Rescan when saving to update dir compare status
  Src: DirDoc.cpp

2004-07-03 Kimmo
 PATCH: [ 984520 ] Don't add '...' items as fileaction targets
  Src: DirActions.cpp

2004-07-02 Kimmo
 PATCH: [ 982960 ] Rescan when saving to update dir compare status
  Src: DiffContext.cpp DiffContext.h DirDoc.cpp DirDoc.h MergeDoc.cpp
   MergeDoc.h MergeEditView.cpp
 PATCH: [ 983410 ] Warn that New clears dircompare results
  Src: MainFrm.cpp Merge.rc resource.h
  Src/Languages: *.rc resource.h
 PATCH: [ 983721 ] Remove 'don't show again' checkbox from saving messages
  Src: MergeDoc.cpp
 PATCH: [ 984059 ] Disable merge actions for '...' item in dir compare
  Src: DirView.cpp

2004-07-01 Kimmo
 PATCH: [ 982683 ] Clear results only after user chooses new files or folders
  Src: MainFrm.cpp
 PATCH: [ 982703 ] Open manual when user presses F1
  Src: MainFrm.cpp MainFrm.h Merge.cpp Merge.h Merge.rc
  Src/Languages: *.rc

2004-06-29 Laoran
 BUG: [ 981796 ] Dir compare : rescan clears "auto-prediffer"
  Src: DirView.cpp
 PATCH: [ 981529 ] remove hide .BAK from menu
  Filters: Merge_GnuC_loose.flt Merge_VB_loose.flt Merge_VC_loose.flt
  Src: MainFrm.cpp MainFrm.h Merge.rc resource.h
  Src/Languages: *.rc resource.h

2004-06-29 Kimmo
 PATCH: [ 981468 ] Properly handle different commentstyles for Pascal
  Src/editlib: pascal.cpp
 PATCH: [ 981526 ] Don't ignore one-char lines in syntax highlight
  Src/editlib: asp.cpp basic.cpp batch.cpp cplusplus.cpp csharp.cpp dcl.cpp
   fortran.cpp html.cpp ini.cpp is.cpp java.cpp lisp.cpp pascal.cpp perl.cpp
   php.cpp python.cpp rexx.cpp rsrc.cpp siod.cpp sql.cpp tex.cpp xml.cpp

2004-06-28 Laoran
 PATCH: [ 981290 ] Updated Swedish MergeSwedish.rc file
 Submitted by Hans Eriksson 
  Src/Languages/Swedish: MergeSwedish.rc

2004-06-28 Kimmo
 PATCH: [ 980851 ] Don't save VSS password
  Src: MainFrm.cpp
 PATCH: [ 978987 ] [RFE 976364] Expand Environment Strings in paths
  Submitted by Jordi Vilar - minor tweak by Kimmo
  Src: Paths.cpp

2004-06-23 WinMerge experimental release 2.1.7.8 (cvs)

2004-06-23 Kimmo
 PATCH: [ 977587 ] Fix fileattrib handling and show all attribs in dir compare
  Src: DiffFileInfo.cpp DiffFileInfo.h DirScan.cpp DirView.cpp
 PATCH: [ 977796 ] Make dir compare column cust. dialog usable from keyboard
  Src: DirColsDlg.cpp DirColsDlg.h
 BUG: [ 936525 ] RO not removed in refresh
  Don't set files/dirs with RO fileflag RO in UI - this was bad idea!
  Src: DirView.cpp MainFrm.cpp
 BUG: [ 978062 ] VSS support broken
  Src: MainFrm.cpp
 PATCH: [ 978393 ] Better VSS errormessages
  Src: MainFrm.cpp MainFrm.h Merge.rc resource.h
  Src/Languages: *.rc resource.h

2004-06-22 Kimmo
 PATCH: [ 977475 ] Log DeleteFile() failure in FileTransform.cpp
  Src: FileTransform.cpp
 PATCH: [ 977479 ] Delete non-functional line in CPatchDlg::SaveSettings()
  Src: PatchDlg.cpp

2004-06-21 Kimmo
 BUG: [ 974662 ] Inconsistent menutexts for dircompare column dialog
  Scr: DirView.cpp Merge.rc resource.h
  Src/Languages: *.rc resource.h

2004-06-21 Laoran
 PATCH: [ 975187 ] getDefaultCodepage, use UI language only when UI not english
  Src/common: unicoder.cpp

2004-06-20 Kimmo
 PATCH: [ 972500 ] Italian translation updated
  Submitted by Andrea Decorte
  Src/Languages/Italian: MergeItalian.rc
 PATCH: [ 975025 ] Fix column number in file compare statusbar
  Src: MergeEditView.cpp
 RFE: [ 891123 ] Short format for line info in file compare
  Src: Merge.rc
  Src/Languages: *.rc
 PATCH: [ 976255 ] Add total columns and current char to lineinfo
  Src: ChildFrm.cpp ChildFrm.h Merge.rc MergeEditStatus.h MergeEditView.cpp
  Src/Languages: *.rc

2004-06-19 Kimmo
 PATCH: [ 975432 ] Add codepage detection option to configlog
  Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp

2004-06-19 Laoran
 PATCH: [ 974714 ] detect codepage when open documents directly, small update
  Src: MainFrm.cpp
 PATCH: [ 974714 ] detect codepage when open documents directly
  Src: DiffContext.cpp MainFrm.cpp MainFrm.h
  Src/Common: UniFile.cpp UniFile.h
 PATCH: [ 975213 ] warn when codepages differ
  Src: MainFrm.cpp Merge.rc resource.h
  Src/Languages: *.rc resource.h

2004-06-18 Kimmo
 BUG: [ 930574 ] Remove old and unused undo-code
  Src: MergeDoc.h MergeDoc.cpp

2004-06-17 Kimmo
 Remove commented out functions ExpandTabs() and Tabify()
  Src: MergeDoc.h MergeDoc.cpp

2004-06-17 Laoran
 PATCH: [ 972108 ] use getDefaultCodepage for document with no codepage
  Src: MainFrm.cpp
  Src/Common: UniFile.cpp unicoder.cpp unicoder.h
 PATCH: [ 973029 ] Scroll when more than 65536 characters
  Src/Common: SplitterWndEx.cpp
  Src/editlib: ccrystaltextview.cpp
 widen labels in colors dialog
  Src: Merge.rc
  Src/Languages: *.rc

2004-06-15 Kimmo
 PATCH: [ 972575 ] Goto real line from location pane
  Src: LocationView.cpp LocationView.h
 Add instructions for generating HTML documentation using SF.net shell server
  Docs/Developers: readme-developers.html

2004-06-14 Kimmo
 PATCH: [ 972188 ] Add More Pascal comments styles to syntax highlight
  Src/editlib: pascal.cpp

2004-06-14 Laoran
 PATCH: [ 972290 ] In LoadFromFile, free the handle before deleting temp files
  Src: MergeDoc.cpp
 PATCH: [ 972296 ] GetLineCount in MergeDoc must test validity of buffers
  Src: LocationView.cpp MergeDoc.cpp MergeDoc.h
 declare GetLeftView()/GetRightView()/GetLeftDetailView()/GetRightDetailView() as const
  Src: MergeDoc.h

2004-06-13 Laoran
 PATCH: [ 972007 ] Japanese translation update(2) ; submitted by Takashi Sawanaka
  Src/Languages: UpdateAll_resource_h.bat
  Src/Languages/Japanese: MergeJapanese.rc
 PATCH: [ 971862 ] Various Updates in German Translation ; submitter : Tim Gerundt
  Src/Languages/German: MergeGerman.rc

2004-06-12 WinMerge experimental release 2.1.7.7 (cvs)

2004-06-11 Laoran
 BUG: [ 970936 ] Cannot merge last diff
  Src: MergeDiffDetailView.cpp
 PATCH: [ 970991 ] Force redraw after changing moved block option
  Src: LocationView.cpp
 PATCH: [ 970221 ] Keep overlay mode after Rescan
  Src/editlib: ccrystaltextview.cpp

2004-06-11 Kimmo
 BUG: [ 969922 ] inconsistent 'options' dialog behavior
  Fix enabling/disabling 'Apply to unrecognized side' checkbox in Editor options
  Src: PropEditor.cpp
 BUG: [ 970940 ] Location pane bars not shown if syntax highlight disabled
  Src: LocationView.cpp
 BUG: [ 969922 ] inconsistent 'options' dialog behavior
  Fix enabling/disabling 'Enable advanced menu' checkbox in System options
  Src: PropRegistry.cpp PropRegistry.h

2004-06-10 Kimmo
 BUG: [ 969922 ] inconsistent 'options' dialog behavior
  Remove 'Apply' button from options-dialog
  Src: MainFrm.cpp
 BUG: [ 826560 ] CVssPrompt::OnInitDialog neglects to notice failure in open
  Also inform user if VSS databases not found
  Src: Merge.rc resource.h VssPrompt.cpp
  Src/Languages: *.rc resource.h
 PATCH: [ 970478 ] Cleanup VCS/VSS code part 1
  Src: MainFrm.cpp MainFrm.h Merge.rc resource.h
  Src/Languages: *.rc resource.h

2004-06-10 Laoran
 PATCH: [ 968887 ] UI for codepage detection
  Src: DiffContext.cpp DiffContext.h DiffWrapper.cpp DiffWrapper.h DirDoc.cpp
   MainFrm.cpp Merge.rc OptionsDef.h PropGeneral.cpp PropGeneral.h resource.h
  Src/Languages: *.rc resource.h

2004-06-09 Kimmo
 PATCH: [ 969277 ] Color options for moved blocks
  Src: MainFrm.cpp Merge.rc MergeEditView.cpp MergeEditView.h OptionsDef.h
   PropColors.cpp PropColors.h resource.h
  Src/Languages: *.rc resource.h

2004-06-08 Kimmo
 PATCH: [ 968504 ] Add Goto Line to location pane context menu
  Src: LocationView.cpp LocationView.h Merge.rc resource.h
  Src/Languages: *.rc resource.h
 PATCH: [ 968960 ] Add moved blocks setting to configlog
  Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp

2004-06-08 Perry
 [ 967406 ] Add .clw to filtered out files in MakePatchDirs
 Filter out also clw files in MSVC filter. Bump version to 1.2.2.0.
  MakePatchDirs: MakePatchDirs.rc MakePatchDirsDlg.cpp
 [ 967315 ] Remove needless cast in unicoder.cpp:CrossConvert
  Src/Common: unicoder.cpp

2004-06-07 Kimmo
 BUG: [ 967899 ] Ignore carriage return differences logic backwards
  Src: MainFrm.cpp
 PATCH: [ 968255 ] Rename EOL sensitive in configlog
  Src: ConfigLog.cpp
 PATCH: [ 967700 ] Add Goto-items to location pane context menu
  Src: LocationView.cpp Merge.rc MergeEditView.h resource.h
  Src/Languages: *.rc resource.h

2004-06-07 Laoran
 PATCH: [ 966693 ] set scroll width in diffpane for widest view
  Src: MergeDiffDetailView.cpp MergeDiffDetailView.h
  Src\editlib: ccrystaltextview.h
 PATCH: [ 963124 ] better name for variable for Undo/deleteText
  Src: GhostTextBuffer.cpp GhostTextBuffer.h

2004-06-07 Perry
 Updated Catalan translation from Jordi Vilar
  Src/Languages: Catalan/MergeCatalan.rc

2004-06-06 Kimmo
 BUG: [ 959729 ] View menu show-items disabled in mergeview
  Second try, renumber items in editlib/editcmd.h
  Src/editlib/editcmd.h

2004-06-06 Laoran
 update for MergeSwedish.rc ; contribution from Hans Eriksson
  Language/Swedish: MergeSwedish.rc

2004-06-04 WinMerge experimental release 2.1.7.6 (cvs)

2004-06-04 Kimmo
 PATCH: [ 965950 ] Simplify and fix Open-dialog extension parser
  Src: OpenDlg.cpp

2004-06-03 Laoran
 BUG: [ 964242 ] WinMerge getting slower loading and showing files
  Src/Common: unicoder.cpp

2004-06-03 Kimmo
 PATCH: [ 963814 ] Cosmetic: fix call in OpenDlg to LoadPosition
  Submitted by Perry
  Src: OpenDlg.cpp

2004-06-02 Perry
 PATCH: [ 964665 ] And another unneeded include in DirDoc.h
  Src: DirDoc.h

2004-06-02 Laoran
 PATCH: [ 964497 ] fix display of moved block in detail pane
  Src: MergeDiffDetailView.cpp

2004-06-02 Kimmo
 BUG: [ 964885 ] ColExtGet() returns extension converted to lowercase
  Src: DirViewColItems.cpp

2004-06-02 Perry
 PATCH: [ 964678 ] New MergeJapanese.rc file
  Src/Languages: Japanese/MergeJapanese.rc etc
 Update "18 languages" to "19 languages"
  Docs\Developers: readme-developers.html
 PATCH: [ 964661 ] Remove unneeded include from DirDoc.h
  Src: 7Common.cpp DirDoc.h
 PATCH: [ 964664 ] Remove another unneeded include from DirDoc.h
  Src: 7Common.h DirDoc.h

2004-06-01 Kimmo
 BUG: [ 963820 ] Cutting off trailing chars in opendlg
  Submitted by Perry
  Src/Common: CoreTools.cpp

2004-06-01 Laoran
 PATCH: [ 948368 ] display moved blocks in location bar
  Src: DiffWrapper.cpp DiffWrapper.h LocationView.cpp LocationView.h MainFrm.cpp
   Merge.rc MergeDoc.cpp MergeDoc.h OptionsDef.h resource.h
  Src/Languages: *.rc resource.h
 PATCH: [ 960455 ] Clip text in DrawLineHelperImpl
  Src/editlib: crystaltextview.cpp

2004-05-31 Perry
 PATCH: [ 963804 ] Report also thread codepage in config
  Src: ConfigLog.cpp

2004-05-31 Kimmo
 Backout patch for BUG: [ 959729 ] View menu show-items disabled in mergeview
  It caused bug #963299 Can't execute 2.1.7.5 under Windows 98
  Src/editlib/editcmd.h

2004-05-31 Perry
 PATCH: [ 963092 ] Cannot compile LanguageSelect.cpp using MSVC Japanese Ver.
  Src/Common: LanguageSelect.cpp
  Src/editlib: crystaltextview.cpp cs2cs.cpp
 PATCH: [ 962460 ] Add codepage & locale info to config log
  Src: ConfigLog.cpp
 PATCH: [ 962538 ] In Rescan, set status to binary if caller said so
  Src: MergeDoc.cpp
 PATCH: [ 963438 ] Fix selection of language in dialog
  Src/Common: LanguageSelect.cpp

2004-05-30 Kimmo
 PATCH: [ 963019 ] keyboard shortcuts in replace dialog
  Submitted by Takashi Sawanaka
  Src: Merge.rc
  Src/Languages: *.rc
 PATCH: [ 913743 ] Icons for menuitems (RFE 873697) - 16-color icons, 3 new icons
  Submitted by Tim Gerundt
  Src: MainFrm.cpp Merge.rc
  Src/res: cascade.bmp change_pane.bmp close.bmp error.bmp exit.bmp
   go_to.bmp horizontally.bmp language.bmp replace.bmp select_font.bmp
   unknown.bmp vertically.bmp
  Src/res new files: customize_columns.bmp filters.bmp select_all.bmp
  Src/languages: *.rc resource.h
  Src/languages/res: same changes than in Src/res
 PATCH: [ 962509 ] Copy pathnames and filenames from directory compare
  Src: DirView.cpp DirView.h Merge.rc resource.h
  Src/languages: *.rc resource.h
 BUG: [ 962449 ] Zip* items in dircompare context menu don't have help text
  Src: Merge.rc
  Src/languages: *.rc

2004-05-30 Laoran
 BUG: [ 909779 ] Uninitialised variable in CGhostTextBuffer::DeleteText() ; fix the fix !
  Src: GhostTextBuffer.cpp
 PATCH: [ 963118 ] variable name fix in CGhostTextBuffer::Undo
  Src: GhostTextBuffer.cpp

2004-05-30 Perry
 PATCH: [ 962558 ] Some MBCS fixes from sawanaka
  Src: paths.cpp paths.h StdAfx.cpp StdAfx.h
  Src/Common: coretools.cpp
 PATCH: [ 962539 ] Add ResetInit which handles partly full buffers
  Src: MergeDoc.cpp
  Src/editlib: ccrystaltextbuffer.h

2004-05-29 Kimmo
 PATCH: [ 961810 ] Store path for ShellExtension
  ShellExtension: resource.h ShellExtension.cpp ShellExtension.rc
   WinMergeShell.cpp WinMergeShell.h
 PATCH: [ 961780 ] ShellExtension advanced menu - UI
  Src: Merge.rc PropRegistry.cpp PropRegistry.h resource.h
  Src/Languages: *.rc resource.h
 PATCH: [ 962348 ] Center OpenDialog to MainFrame
  Src: OpenDlg.cpp OpenDlg.h

2004-05-29 Perry
 Updated WinMerge Localized.iss from seier (manifest & plugins.txt changes)
  InnoSetup: WinMerge Localized.iss
 PATCH: [ 945759 ] Move to location when double-click location view
  Src/Common: LocationView.cpp LocationView.h
 BUG: [ 961901 ] Possible overflow bug in SplitFilename
  Src/Common: coretools.cpp
 New InnoSetup/Languages/Japanese.isl from sawanaka
  From url posted in discussion in BUG [ 958805 ] 2 bytes display error
  (I removed the entry for English before checking it in, as there is no English satellite DLL)
  InnoSetup: Languages/Japanese.isl

2004-05-29 WinMerge experimental release 2.1.7.5 (cvs)

2004-05-28 Kimmo
 BUG: [ 959729 ] View menu show-items disabled in mergeview
  Src/editlib: editcmd.h

2004-05-28 Laoran
 PATCH: [ 960771 ] disable .. in dirview if upward move is not reversible
  Src: DirView.cpp DirView.h Merge.rc resource.h
  Src/res Add: folderup.bmp folderup_disable.bmp
  Src/Languages: *.rc resource.h
  Src/Languages/res Add: folderup.bmp folderup_disable.bmp
 PATCH: [ 961304 ] WinDiff-compatible (F7/F8) keybindings for next/prev diff
 submitted by Krzysztof Kowalczyk
  Src: Merge.rc
  Src/Languages: *.rc

2004-05-27 Laoran
 PATCH: [ 960996 ] 'backspace' key in dirview for parent directory
  Src: DirView.cpp DirView.h

2004-05-27 Perry
 PATCH: [ 959843 ] Fix codepage initialization to thread default
  Src: DiffWrapper.cpp DiffWrapper.h DirScan.cpp DirScan.h Merge.cpp
  Src/Common: unicoder.cpp
 Localized some language names into Catalan
  Src/Languages: MergeCatalan.rc

2004-05-26 Perry
 Added a few more native or ASCII language names (Albanian, Arabic, Armenian
  Belarusian, Croatian, Estonian, Farsi, Georgian, Greek, Urdu)
  Src/Common: LanguageSelect.cpp

2004-05-27 Kimmo
 PATCH: [ 960265 ] Don't show size for folder or non-existing file
  Src: DiffFileInfo.cpp DiffFileInfo.h DirScan.cpp DirViewColItems.cpp

2004-05-26 Perry
 PATCH: [ 959468 ] A patch for "Bug [ 958805 ] 2 bytes display error".
  Src: StdAfx.cpp
  Src/editlib: ccrystaltextview.cpp ccrystaltextview.h

2004-05-25 Perry
 (cosmetic) Update edit dates in file headers
  Src/Common: unicoder.cpp unicoder.h
 Localized language names into Russian
  Src/Languages: MergeRussian.rc
 Localized language names into Bulgarian
  Src/Languages: MergeBulgarian.rc

2004-05-25 Kimmo
 PATCH: [ 959627 ] Fix crash when opening context menu for '..' item in dirview
  Src: DirActions.cpp DirView.cpp
 BUG: [ 880104 ] CCCPrompt--does it work at all?
  Disable "Save as..." button since its not used
  Src: Merge.rc
  Src/Languages: *.rc
 RFE [ 950290 ] Use MS Shell Dlg font in dialogs
  Convert Chinese and Korean translations too
  Src/Languages: MergeChineseSimplified.rc MergeChineseTraditional.rc MergeKorean.rc
 PATCH: [ 959503 ] Enable word deletion function(Ctrl+Del)
  Submitted by Takashi Sawanaka
  Src/editlib: editcmd.h editres.rc

2004-05-25 Perry
 PATCH: [ 950243 ] 2 minor updates to developers docs
  Docs/Developers: readme-developers.html
 Localized language names into Italian
  Src/Languages: MergeItalian.rc

2004-05-24 Perry
 PATCH: [ 958973 ] CDiffTextBuffer::LoadFromFile wrong return
  Src: MergeDoc.cpp

2004-05-24 Kimmo
 PATCH: [ 959111 ] Optionally don't disable Open-dialog OK-button
  Src: MainFrm.cpp Merge.rc OpenDlg.cpp OptionsDef.h PropGeneral.cpp
   PropGeneral.h resource.h
  Src/Languages: *.rc resource.h

2004-05-24 Perry
 Fix compilation (trailing comma in CCrystalTextView::m_SourceDefs)
  Src/editlib: ccrystaltextview.cpp

2004-05-24 Kimmo
 PATCH: [ 958938 ] Better way to close WinMerge with ESC (-e switch)
  Src: MainFrm.cpp MainFrm.h Merge.cpp Merge.h
 PATCH: [ 959035 ] Registry value for enabling logging
  Src: MainFrm.cpp OptionsDef.h
 Add note about logging (patch #959035]
  Docs/Developers: readme-developers.html
 RFE: [ 934419 ] Syntax highlighting *.cls with Visual Basic (basic.cpp)
  Submitted by Tim Gerundt
  Src/editlib: ccrystaltextview.cpp

2004-05-24 Perry
 PATCH: [ 893202 ] Bug fixed for DBCS text edit (Attach again)
 Src\editlib: ccrystaleditview.cpp ccrystaltextview.cpp

2004-05-23 WinMerge experimental release 2.1.7.4 (cvs)

2004-05-23 Laoran
 PATCH: [ 957317 ] Broken menu in Winmerge 2.1.7.3
  Src: Merge.cpp
  Src/Common: LanguageSelect.cpp
 typo in russian language : APTION -> CAPTION
  Src/Languages/Russian: MergeRussian.rc

2004-05-23 Kimmo
 PATCH: [ 958478 ] Allow ESC close WinMerge if no open docs
  Src: MainFrm.cpp MainFrm.h

2004-05-23 Perry
 Localized language names into Portuguese
  Src/Languages: MergeBrazilian.rc

2004-05-22 Kimmo
 PATCH: [ 958122 ] Add C# syntax highlight
  Src: Merge.dsp
  Src/editlib: crystaltextview.cpp crystaltextview.h
  Src/editlib new file: csharp.cpp
 RFE: [ 950290 ] Use MS Shell Dlg font in dialogs
  Src: Merge.rc
  Src/Languages: *.rc, except MergeChineseSimplified.rc
   Merge ChineseTraditional.rc, MergeKorean.rc

2004-05-22 Perry
 Localized language names into French
  Src/Languages: MergeFrench.rc
 Updates to Spanish localized language names
  Src/Languages: MergeSpanish.rc
 BUG: [ 898924 ] Lang order in Language selection dialog?
 RFE: [ 953015 ] sort language names
  Mark listbox in language dialog as sorted
  Src: Merge.rc
  Src/Languages: Merge*.rc

2004-05-21 Perry
 Fix PATCH [ 957740] - declare CMergeDoc::CompareBinaries
  Src: MergeDoc.h
 Updated WinMerge Localized.iss from seier (add Swedish Readme after install)
  InnoSetup: WinMerge Localized.iss
 Updated Swedish ReadMe from seier
  Docs/Users/Languages: Read Me-Swedish.rtf
 Updated all non-localized language versions of Read Me*.rtf to current Read Me.rtf
  Docs\Users\Languages: Read Me*.rtf (except Swedish)
 Remove all localization Contributors*.rtf
  Docs\Users\Languages: removed Contributors*.rtf

2004-05-21 Kimmo
 PATCH: [ 957740 ] Tell if two binary files are different/identical
  Src: DiffWrapper.cpp DiffWrapper.h Merge.rc MergeDoc.cpp resource.h
  Src/Languages: *.rc resource.h

2004-05-21 Laoran
 PATCH: [ 947680 ] Organize resource strings, part 2 (IDD and IDB)
  Src: resource.h
  Src/Languages: resource.h

2004-05-21 Kimmo
 PrivateBuild in version resource must be empty string in CVS.
  Src: Merge.rc
  Src/Languages: *.rc

2004-05-21 Perry
 Localized language names into Korean
  Src/Languages: MergeKorean.rc

2004-05-20 Kimmo
 PATCH: [ 956893 ] Fix toolbar problem with XP themes and VC6
  Src: MainFrm.cpp Merge.cpp
 PATCH: [ 954991 ] Add directory compare column descriptions
  Src: DirColsDlg.cpp DirColsDlg.h DirView.h DirViewColHandler.cpp
   DirViewColItems.cpp Merge.rc resource.h
  Src/Languages: *.rc resource.h

2004-05-18 Kimmo
 PATCH: [ 955408 ] Select first item in dir compare
  Src: DirView.cpp
 PATCH: [ 956044 ] Don't select '..' and don't skip unique folders in dirview
  Src: DirView.cpp

2004-05-18 Perry
 PATCH: [ 955573 ] Swedish localization of Read Me.rtf
 Docs/User/Languages: Read Me-Swedish.rtf

2004-05-18 WinMerge experimental release 2.1.7.3 (cvs)

2004-05-18 Perry
 PATCH: (continued) [ 942021 ] Propose translation of language names
  Src/Languages: MergeBrazilian.rc MergeBulgarian.rc MergeCatalan.rc
   MergeChineseSimplified.rc MergeChineseTraditional.rc
   MergeKorean.rc MergeRussian.rc
 BUG: [ 955550 ] Slovak rc file broken (typo)
  Src/Languages: MergeSlovak.rc
 BUG: [ 955553 ] Russian rc file broken
  Src/Languages: MergeRussian.rc
 BUG: [ 955557 ] Chinese traditional rc file broken (cvs)
  Src/Languages: MergeChineseTraditional.rc
  
2004-05-17 Kimmo
 PATCH: [ 955411 ] Remove non-functional firstdiff selection
  Src: DirView.h MainFrm.cpp

2004-05-15 Kimmo
 Fix build error, VC6 doesn't like CList::GetSize()
  Src: DirActions.cpp
 PATCH: [ 952877 ] Return better results from Rescan()
  Src: MergeDoc.cpp MergeDoc.h 

2004-05-14 Kimmo
 PATCH: [ 952825 ] Cleanup VSS dialog layout
  Src: Merge.rc
  Src/Languages: *.rc
 PATCH: [ 952586 ] Improve readonly file and folder handling
  Src: DirActions.cpp MainFrm.cpp MainFrm.h Merge.rc MergeDoc.cpp resource.h
  Src/Languages: *.rc resource.h
 PATCH: [ 948592 ] Open and select filefilter from Open-dialog
  Src: FileFiltersDlg.cpp MainFrm.cpp MainFrm.h Merge.cpp Merge.h
   Merge.rc OpenDlg.cpp OpenDlg.h resource.h
  Src/Languages: *.rc resource.h

2004-05-13 Kimmo
 Backout last change to Merge.rc - restore version 1.187
  Src: Merge.rc
 BUG: [ 953232 ] Some lang-files broken
  Backout last changes to lang files (see bug item for details)
   Src/Languages: MergeBulgarian.rc MergeChineseSimplified.rc
    MergeChineseTraditional.rc MergeKorean.rc MergeRussian.rc
 PATCH: [ 953056 ] Rename 'Sensitive to EOL' option
  Src: Merge.rc
  Src/Languages: *.rc
 PATCH: [ 953515 ] Improve LocationPane drawing code
  Src: LocationView.cpp

2004-05-13 Perry
 PATCH: [ 950530 ] Remove unneeded cast in DirView.cpp
  Src: DirView.cpp
 PATCH: [ 945722 ] Two functions are never called
  Src: DiffContext.cpp DiffContext.h
 PATCH: [ 945152 ] Installer: My last revisions
  InnoSetup: WinMerge Localized.iss
  InnoSetup/Languages: *.isl (except Swedish.isl)
 PATCH: [ 950236 ] Set DIFFCODE::BOTH correctly
  Src: DirScan.cpp
 PATCH: [ 942021 ] Propose translation of language names
  Src: Merge.rc
  Src/Common: LanguageSelect.cpp LanguageSelect.h
  Src/Languages: *.rc
 PATCH: [ 950212 ] wrong language shown in LanguageSelect
  Src/Common: LanguageSelect.cpp
 BUG: [ 876539 ] Wrong textinclude language def in ChineseTraditional
  Src/Languages: ChineseTraditional.rc
 Translate language names into Dutch (follow-up to PATCH#942021)
  Src/Languages: MergeDutch.rc
 Add a few more native language names
  Src/Common: LanguageSelect.cpp

2004-05-12 Kimmo
 PATCH: [ 948448 ] Remove WinMerge.exe path from system options
  Src: Merge.rc PropRegistry.cpp PropRegistry.h resource.h

2004-05-11 Laoran
 PATCH: [ 948528 ] Build BCMenu after select language
  Src: MainFrm.cpp MainFrm.h Merge.cpp
  Src\Common: LanguageSelect.cpp

2004-05-11 Perry
 Fix MakePatchDirs to ignore BuildTmp.
 MakePatchDirs: ChangeLog.txt MakePatchDirs.rc MakePatchDirsDlg.cpp
 
2004-05-11 Kimmo
 PATCH: [ 951404 ] Add statusmessage for dircompare copy/delete ops
  Src: DirActions.cpp Merge.rc resource.h
  Src/Languages: *.rc resource.h

2004-05-10 Christian
 PATCH: [ 945467 ] Remove ReleaseMinsize and UnicodeReleaseMinsize
  Src: Merge.dsp
  Src/Languages: CopyAll.bat

2004-05-10 Kimmo
 PATCH: [ 951234 ] Use resourceIDs in dircompare statebar bitmpaps
  Src: Merge.rc
  Src/Languages: *.rc

2004-05-10 Laoran
 apply again modifications to IDS_QUICKHELP, lost during PATCH: [ 947680 ]
  Src: Merge.rc 
  Src\Languages\Swedish: MergeSwedish.rc

2004-05-07 Laoran
 PATCH: [ 947680 ] Organize resource strings
  Src: CCPrompt.cpp DiffWrapper.cpp DirFrame.cpp MainFrm.cpp Merge.rc MergeDoc.cpp
   PropGeneral.cpp VssPrompt.cpp resource.h  
  Src\editlib: ccrystaltextview.cpp ccrystaltextview.h editcmd.h
  Src\Common: LanguageSelect.h
  Src\Languages: *.rc resource.h

2004-05-08 WinMerge experimental release 2.1.7.2 (cvs)

2004-05-07 Laoran
 update for MergeSwedish.rc ; contribution from Hans Eriksson
  Language/Swedish: MergeSwedish.rc

2004-05-07 Kimmo
 PATCH: [ 949428 ] Show VSS dialogs only once
  Src: DirActions.cpp MainFrm.cpp MainFrm.h Merge.rc resource.h
  Languages: *.rc resource.h
 BUG: [ 947121 ] ShellExtension does not compile with Visual Studio 2003
  ShellExtension: ShellExtension.dsp
 BUG: [ 941335 ] RC file missing strings and errors
  Src: Merge.rc
  Languages: *.rc

2004-05-07 Laoran
 PATCH: [ 948366 ] clear moved blocks before Rescan
  Src: DiffWrapper.cpp DiffWrapper.h MergeDoc.cpp

2004-05-06 Kimmo
 PATCH: [ 948634 ] Commandline switch to open left/right side as readonly
  Src: Merge.cpp Merge.rc
  Languages: *.rc

2004-05-05 Kimmo
 PATCH: [ 947232 ] Add primary path to WinMerge.exe for ShellExtension
  ShellExtension: ShellExtension.rc WinMergeShell.cpp

2004-05-04 Laoran
 PATCH: [ 947599 ] Remove EditFile.cpp EditFile.h
  Src remove: EditFile.cpp EditFile.h
  Src: Merge.dsp Merge.rc resource.h
  Languages: *.rc resource.h

2004-05-03 Kimmo
 PATCH: [ 942565 ] Option for closing windows with ESC
  Src: DirDoc.cpp DirView.cpp DirView.h MainFrm.cpp Merge.rc MergeEditView.cpp
   MergeEditView.h OptionsDef.h PropGeneral.cpp PropGeneral.h resource.h
  Languages: *.rc resource.h
 PATCH: [ 946550 ] [MergeMode] Don't try to merge if diff not selected
  Src: MergeEditView.cpp

2004-05-03 Laoran
 PATCH: [ 946091 ] Fix for GetLineActualLength
  Src/editlib: ccrystaltextview.cpp

2004-05-03 Laoran
 PATCH: [ 936842 ] Custom message when same file in both panels
  Src: Merge.rc MergeDoc.cpp resource.h
  Languages: *.rc resource.h
  
2004-05-02 Kimmo
 PATCH: [ 833180 ] Filters dialog
  Src new files: FileFiltersDlg.cpp FileFiltersDlg.h
  Src: MainFrm.cpp MainFrm.h Merge.dsp Merge.rc
   PropFilter.cpp PropFilter.h resource.h
  Languages: *.rc resource.h

2004-05-01 Laoran
 PATCH: addon to [ 941623 ] Propose moving IDC_COMPARISON_STOP to block with ...CLOSE
  Src: Merge.rc
  Languages: *.rc

2004-05-01 Perry
 PATCH: [ 941979 ] Add cast to suppress VS.NET 2002 warning
  Src: MergeDoc.cpp
 PATCH: [ 927929 ] Reload language menus after resources hooked
  Src: Merge.cpp
 PATCH: [ 941623 ] Propose moving IDC_COMPARISON_STOP to block with ...CLOSE
  Src:
   Merge.rc
  Languages: MergeBrazilian.rc MergeBulgarian.rc MergeCatalan.rc
   MergeChineseSimplified.rc MergeChineseTraditional.rc MergeCzech.rc
   MergeDanish.rc MergeDutch.rc MergeFrench.rc MergeGerman.rc MergeItalian.rc
   MergeKorean.rc MergeNorwegian.rc MergePolish.rc MergeRussian.rc
   MergeSlovak.rc MergeSpanish.rc MergeSwedish.rc
 PATCH: [ 909761 ] Misplaced return in CDirView::ValidateColumnOrdering()?
  Src: DirViewColHandler.cpp

2004-04-30 Christian
 PATCH: [ 941982 ] Fix VS6 compilation
  Src/Common: MessageBoxDialog.cpp MessageBoxDialog.h

2004-04-29 Kimmo
 PATCH: [ 943149 ] Contributors fix
  Src: Merge.cpp Merge.rc
  Languages: *.rc
  Docs/Users/Contributors.txt
  Removed: Docs/Users/Contributors.rtf
 BUG: [ 944290 ] Crash when deleting files
  Src: DirActions.cpp

2004-04-28 Kimmo
 PATCH: [ 937947 ] Open-dialog improvements (no codepage controls)
  Src: Merge.rc OpenDlg.cpp OpenDlg.h resource.h
  Languages: *.rc resource.h

2004-04-27 Kimmo
 RFE: [ 942591 ] Loose filter for Visual Basic
  Submitted by Tim Gerundt
  Filters new file: Merge_VB_loose.flt
 PATCH: [ 930482 ] Add comments to filter: Merge_GnuC_loose.flt
  Submitted by Tim Gerundt
  Filters: Merge_GnuC_loose.flt

2004-04-26 Kimmo
 BUG: [ 940709 ] Dircompare column widths saved only when WinMerge closed
  Fix from Perry
  Src: DirViewColHandler.cpp

2004-04-26 Perry
 PATCH: [ 941986 ] Remove blank lines in popup dirview menu in Merge.rc
  Src: Merge.rc

2004-04-25 WinMerge experimental release 2.1.7.1 (cvs)

2004-04-25 Perry
 More removing obsolete keywords to sync languages to English
  Languages: MergeDutch.rc MergeFrench.rc MergeGerman.rc
   MergeItalian.rc MergeKorean.rc MergeNorwegian.rc

2004-04-25 Kimmo
 PATCH: [ 941524 ] Reset dircompare column widths
  Src: DirColsDlg.cpp DirColsDlg.h DirView.cpp DirView.h DirViewColHandler.cpp
 PATCH: [ 941545 ] Fix Shift-Arrow to select text in merge mode
  Src: MergeEditView.cpp

2004-04-25 Perry
 More removing obsolete keywords to sync languages to English
  Languages: MergeCatalan.rc MergeChineseSimplified.rc
   MergeChineseTraditional.rc MergeCzech.rc MergeDanish.rc
   MergeFrench.rc MergePolish.rc

2004-04-24 Perry
 More removing obsolete keywords to sync languages to English
  Src: Merge.rc
  Languages: MergeBrazilian.rc MergeSpanish.rc MergeSwedish.rc
 More removing obsolete keywords to sync languages to English
  Src: Merge.rc
  Languages: MergeRussian.rc MergeSlovak.rc MergeSpanish.rc
   MergeSwedish.rc
 More removing obsolete keywords to sync languages to English
  Languages: MergeBrazilian.rc MergeSlovak.rc MergeSpanish.rc
   MergeSwedish.rc

2004-04-24 Kimmo
 BUG: [ 939245 ] Location Bar don't show diff in first line
  Src: LocationView.cpp
 PATCH: [ 938822 ] Enable merge items in file compare context menu
  Src: Merge.rc
  Languages: *.rc

2004-04-24 Perry
 PATCH: [ 941014 ] Various Updates in German Translation (Tim Gerundt)
  (Except I didn't remove the synchro comments)
  Languages: MergeGerman.rc
 Added synchro comments to Merge.rc. Synchronized various languages to English.
  Src: Merge.rc
  Languages: MergeBrazilian.rc MergeBulgarian.rc MergeCatalan.rc 
   MergeChineseSimplified.rc MergeChineseTraditional.rc
   MergeCzech.rc MergeDanish.rc MergeFrench.rc MergeGerman.rc
   MergeSpanish.rc

2004-04-23 Kimmo
 PATCH: [ 940713 ] Fix for resetting dirview columns
  Src: DirViewColHandler.cpp
 Remove deprecated keywords from RC file I added in when applying #936682.
  Src: Merge.rc
 PATCH: [ 940089 ] Add Binary column and shorten short result
  Src: DirViewColHandler.cpp DirViewColItems.cpp Merge.rc resource.h
  Languages: *.rc resource.h
 PATCH: [ 940036 ] Add missing dirview column table indexes
  Src DirViewColHandler.cpp

2004-04-22 Kimmo
 PATCH: [ 936682 ] Highlight syntax in unrecognized side
  Src: MainFrm.cpp Merge.rc MergeDoc.cpp OptionsDef.h PropEditor.cpp
   PropEditor.h resource.h
  Languages: *.rc resource.h

2004-04-21 Kimmo
 PATCH: [ 938609 ] Merge mode (simplified)
  Src: MainFrm.cpp Merge.rc MergeDoc.cpp MergeDoc.h MergeEdiView.cpp
   MergeEditView.h OptionsDef.h resource.h
  Languages: *.rc resource.h
 BUG: [ 939548 ] Location bar crash if diff at end missing last line EOL
  Src: LocationView.cpp

2004-04-20 WinMerge experimental release 2.1.7.0 (cvs)

2004-04-20 Laoran
 Syntax correction for Unicode
  Src: DirView.cpp

2004-04-20 Laoran
 BUG:[ 938373 ] Filtering broken - infinite loop when file filtered
  Src: DirScan.cpp

2004-04-20 Laoran
 updated swedish translation
  Submitted by Hans Eriksson <hans.ericson@bredband.net>
  Languages/Swedish: MergeSwedish.rc

2004-04-20 Laoran
 PATCH: [ 929210 ] GUI for prediffer (compare two files)
  Src: DiffWrapper.cpp DirView.cpp MainFrm.cpp MainFrm.h Merge.rc MergeDoc.cpp MergeEditView.cpp 
   MergeEditView.h resource.h
  Languages: *.rc resource.h

2004-04-19 Perry
 Fix English typos in Localization Instructions.txt
 InnoSetup/Languages/Localization Instructions.txt

2004-04-19 Kimmo
 PATCH [ 937535 ] Updated syntax highlighting for resources files (*.rc)
  Submitted by Tim Gerundt
  Src/editlib: rsrc.cpp

2004-04-18 Perry
 BUG: [ 937435 ] cvs doesn't compile -- typo in CMergeDoc::ShowRescanError(
  Src: MergeDoc.cpp
 PATCH: [ 937441 ] CMergeEditView:Avoid calling SelectDiff when no current diff
   Src: MergeEditView.cpp
 BUG: [ 936079 ] castellano options
   Src/Languages/Spanish: MergeSpanish.rc

2004-04-18 Kimmo
 PATCH: [ 934738 ] CopyLeftTo/CopyRightTo Including Common Subdirectories
  Submitted by Ben (?) - some modifications by Kimmo
  Src: DirActions.cpp
 PATCH: [ 930456 ] Allow Copy Left/Right to copy folders too
  Src: DirActions.cpp
 PATCH: [ 934370 ] Log temp file errors and own errormessage
  Src: Merge.rc MergeDoc.cpp MergeDoc.h resource.h
  Languages: *.rc resource.h
  
2004-04-17 Kimmo
 PATCH: [ 910557 ] Location Bar
  Submitted by Vincent Osele
  Src: ChildFrm.cpp ChildFrm.h MainFrm.cpp Merge.dsp Merge.rc
   MergeDoc.cpp MergeDoc.h MergeEditView.h resource.h
  Src new files: LocationBar.cpp LocationBar.h LocationView.h LocationView.cpp
  Languages: *.rc resource.h

2004-04-17 Laoran
 PATCH: [ 929001 ] Delete commented out "diff_dirs2"
  Src: DirDoc.cpp

2004-04-17 Laoran
 BUG: [ 936824 ] Prediffer not initialized when generate patch
  Src: PatchTool.cpp

2004-04-17 Laoran
 BUG: [ 936524 ] Cannot compare/Cancel,Retry,Continue
  Src: DirView.cpp

2004-04-17 Kimmo
 Fix for unicode build after patch #935048 -- add _T() around string
  Src: DirView.cpp

2004-04-16 Laoran
 PATCH: [ 935048 ] Plugin manager and per-file plugin settings V2
  Src: DiffContext.cpp DiffContext.h DiffWrapper.cpp DiffWrapper.h DirActions.cpp DirDoc.cpp DirDoc.h 
   DirScan.cpp DirView.cpp DirView.h MainFrm.cpp Merge.dsp Merge.rc MergeDoc.cpp MergeDoc.h resource.h
  Src Add: PluginManager.cpp PluginManager.h

2004-04-16 Laoran
 updated swedish translation
  Submitted by Hans Eriksson <hans.ericson@bredband.net>
  Languages/Swedish: MergeSwedish.rc

2004-04-16 Kimmo
 RFE: [ 934446 ] Syntax highlighting for XML files
  Submitted by Tim Gerundt
  Src: Merge.dsp
  Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
  Src/editlib new file: xml.cpp

2004-04-14 Kimmo
 BUG: [ 926578 ] Division by zero exception
  Fix tabsize limits in options dialog
  Src: PropEditor.cpp
 PATCH: [ 934344 ] Reset dircompare columns
  Src: DirColsDlg.cpp DirColsDlg.h DirViewColHandler.cpp Merge.rc resource.h
  Languages: *.rc resource.h

2004-04-13 Jochen
 PATCH: [ 889357 ] Attempt to improve DirScan speed -- updated patch from 2004-03-18
  Src: 7zCommon.cpp 7zCommon.h DiffContext.cpp DiffContext.h DiffFileInfo.h
   DiffWrapper.cpp DiffWrapper.h DirDoc.cpp DirScan.cpp DirViewColHandler.cpp DirViewColItems.cpp DirViewColItems.h
   MainFrm.cpp
  Merge7z: Merge7z.def Merge7z.h Merge7z311.cpp Merge7zCommon.cpp Merge7z311.dsp Merge7z312.dsp Merge7z313.dsp

2004-04-13 Kimmo
 PATCH: [ 932086 ] Syntax highlighting of HTML not complete (Bug 930930)
  Submitted by Tim Gerundt
  Src/editlib: ccrystaltextview.cpp html.cpp php.cpp
 Fix typo causing wrong icon for error items in dir compare
  Src: DirView.cpp

2004-04-07 Laoran
 BUG: [ 930995 ] Cursor help text ... ; part two : inversion in menu
  Src: Merge.rc
  Src/Languages: *.rc

2004-04-07 Kimmo
 PATCH: [ 930495 ] Log delete file errors from FileTransform.cpp
  Src: FileTransform.cpp
 PATCH: [ 930512 ] Log delete file errors from multiformatText.cpp
  Src/Common: multiformatText.cpp

2004-04-07 Laoran
 BUG: [ 930995 ] Cursor help text ...
  Src/Languages/German: MergeGerman.rc

2004-04-05 Kimmo
 PATCH: [ 929155 ] Add identical folders to dircompare statepane
  Src: DirCompStateBar.cpp DirCompStateBar.h DirView.cpp Merge.dsp
   Merge.rc resource.h
  Src/res new file: error.bmp
  Languages: Merge.rc resource.h res/error.bmp
 PATCH: [ 929584 ] Reset scratchpad names
  Don't show "Untitled Left/Right" for docs opened after scratchpads
  Src: MainFrm.cpp

2004-04-04 Perry
 PATCH: [ 928976 ] Handle when selected language not in list
  Src/Common: LanguageSelect.cpp

2004-04-04 Kimmo
 PATCH: [ 914513 ] Move message ids to stdafx.h
  DirDoc.h StdAfx.h

2004-04-03 Perry
 Move enum ACT_TYPE, struct action, and typedef DeletedItemList inside of 
  struct ActionList, of which they are part. Add header comment for ActionList.
 Src: DirActions.cpp DirView.h

2004-04-03 Laoran
 PATCH: [ 923044 ] Partial compare large files
  Plugins: list of sources.txt
  Plugins\src_VCPP_WatchBeginningOfLog add: all files
  Plugins\src_VCPP_WatchEndOfLog add: all files

2004-04-02 Laoran
 PATCH [ 925172 ] Check for presence of Windows Script
 Src: ConfigLog.cpp ConfigLog.h Merge.rc MergeEditView.cpp Plugins.cpp Plugins.h resource.h

2004-04-02 Laoran
 Change plugins event title 'CONTEXT_MENU' -> 'EDITOR_SCRIPT'
  Src: FileTransform.cpp FileTransform.h MergeEditView.cpp Plugins.cpp Plugins.h
  Plugins/dlls: editor addin.sct insert datetime.sct list.txt
  Plugins: list of sources.txt readme.txt syntax.txt
  Plugins/src_VB/ToUpper: WinMergeScript.cls

2004-04-01 Perry
 Remove most of obsolete keywords in rc file (a la Merge.rc 1.149, which didn't have them)
  Src: Merge.rc
 PATCH: [ 927000 ] Russian translation update (based on 1.32)
  (Not applied exactly, but updated to match current English Merge.rc (mostly removing obsolete keywords).
  Languages: Russian/MergeRussian.rc
 Merge Portuguese Brazilian to current English Merge.rc (mostly removing obsolete keywords).
  Languages: Brazilian/MergeBrazilian.rc

2004-03-31 Kimmo
 PATCH: [ 924521 ] Add context menu for file compare
  Src: DirView.cpp FilePathEdit.cpp Merge.rc MergeEditView.cpp resource.h
  Languages: resource.h *.rc

2004-03-30 seier
  Fixed Swedish Language had a description of Spanish in the installer.  
  Fixed Swedish was installing along with Spanish rather than the Swedish component description in the installer.  
     Src: InnoSetup/WinMerge.iss
  Release Notes Table template created in response to the table located at http://sourceforge.net/project/shownotes.php?release_id=226701.  
     Src: Docs/Users/Release Notes Template.htm
  Migration of /UsersGuide --> /Docs/Users/UsersGuide --> /Docs/Users/Guide Documented
     Src: Docs/Developers/File Migration Log.htm

2004-03-30 Laoran
 PATCH: [ 922724 ] "Don't display again" option for messageboxes
  Src: DirActions.cpp DirView.cpp MainFrm.cpp Merge.cpp Merge.dsp Merge.rc
       MergeDoc.cpp PatchDlg.cpp PatchTool.cpp PropGeneral.cpp PropGeneral.h StdAfx.h resource.h
  Src/editlib: ceditreplacedlg.cpp
  Src/common add: MessageBoxDialog.cpp MessageBoxDialog.h
  Languages: *.rc resource.h

2004-03-30 Kimmo
 PATCH: [ 925179 ] Remove is_*file() functions from coretools.h/cpp
  Common: coretools.cpp coretools.h

2004-03-30 Laoran
 BUG [ 925202 ] broken feature: after save error, save with another filename
  Src: MergeDoc.cpp

2004-03-28 Kimmo
 PATCH: [ 913743 ] Icons for menuitems (RFE 873697)
  File/Exit and Help/Contents icons from Tim Gerundt
  Src: MainFrm.cpp Merge.rc resource.h
  Src/res new files: exit.bmp help_contents.bmp
  Languages: *.rc resource.h
  Languages/res: exit.bmp help_contents.bmp

2004-03-27 Laoran
 PATCH [ 921788 ] scripts submenu in the main menu
 Src: FileTransform.cpp FileTransform.h MainFrm.cpp MainFrm.h Merge.rc
  MergeEditView.cpp MergeEditView.h Plugins.cpp Plugins.h resource.h
 Src/Languages: *.rc resource.h

2003-03-27 WinMerge beta 2.1.6.0 released

2004-03-26 Perry
 Src/Languages: Bulgarian/MergeBulgarian.rc
  Many cosmetic changes to make MergeBulgarian.rc match Merge.rc (mostly dropping obsolete keywords).

2004-03-26 Laoran
 [ 847155 ] Utf8len_of_string is wrong for 8-bit
  Src/Common: unicoder.cpp unicoder.h

2004-03-26 Perry
 Docs/Users: Contributors.rtf
  Add Bulgarian credit to contributors.rtf. Move Portuguese to alphabetically Portuguese.

2004-03-26 seier
  Fixed Swedish Language had a description of Spanish in the installer.  
  Fixed Swedish was installing along with Spanish rather than the Swedish component description in the installer.  
     Src: InnoSetup/WinMerge.iss
     
2004-03-26 Perry
 Add new Bulgarian translation
  Src/Languages/Bulgarian

2004-03-25 Kimmo
 BUG: [ 918760 ] doxygen.cfg moved
  Update paths for new location of doxygen.cfg in docs/developers
  docs/developers: doxygen.cfg

2004-03-24 Laoran
 HideFirstLetter plugin : fix : open input and output file as binary 
  Plugins/HideFirstLetter: WinMergeScript.cpp

2004-03-24 WinMerge experimental release 2.1.5.16 (cvs)

2004-03-24 Kimmo
 BUG: [ 922716 ] "delete both" broken
  Src: DirActions.cpp

2004-03-23 Perry
 Add simple comments in action list code
 Src: DirActions.cpp

2004-03-23 Kimmo
 PATCH: [ 921440 ] UI option for detecting moved blocks
  Src: DirDoc.cpp MainFrm.cpp Merge.rc MergeDoc.cpp OptionsDef.h
   PropCompare.cpp PropCompare.h resource.h
  Languages: *.rc resource.h

2004-03-22 Seier
 I added /InnoSetup/desktop.ini file to be used as a template for making C:\Program Files\WinMerge, or wherever that might be, have a customized (WinMerge)   folder icon. 
  InnoSetup: desktop.ini
 The DocBook version of the manual was revised to reference GIF versions of all previously referenced BMP images.  Thiw provides better compression and       browser compatiblity.  
  Docs: Users/Manual/screenshots/*.bmp --> *.gif
  Docs: Users/Manual/Compare_dirs.xml
  Docs: Users/Manual/Compare_files.xml
   
2004-03-22 Kimmo
 PATCH: [ 920530 ] Remember Patch-dialog settings
  Src: Merge.rc PatchDlg.cpp PatchDlg.h resource.h
  Languages: *.rc resource.h
 BUG: [ 920965 ] Merging moved block messes up linecolors
  Src: MergeDoc.cpp
 BUG: [ 902915 ] Directory compare statepane button text blinks
  Fix submitted by Jochen in Patch #889357 Attempt to improve DirScan speed.
  Src: DirCompStateBar.cpp
 Change directory compare statepane button to defaultbutton
  Allows stopping directory compare with Enter-key
  Src: Merge.rc
  Languages: *.rc

2004-03-22 Laoran
 PATCH: [ 909672 ] Undo makes marker messy
  Src: MergeEditView.cpp
  Src/editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h

2004-03-21 Seier
  Installer now also installs WinMerge as the merging application in addition being the differencing application.  
  Installer updated to use \ShellExtension\ShellExtension.dll as the new location for that file 
  Installer will now remove the ComCtlupd.exe at the end of the installation.  
  Patch: [ 919134 ] I added the OleAut32.dll necessary for others to compile the WinMerge.iss script.
    Src: /InnoSetup/WinMerge.iss
  I compressed Splash1.bmp using RLE (Run Length Encoding [Lossless compression]) and named it as Splash2.bmp.  I only modified the English version.  Please test it out and send me an e-mail if it works and I'll create the RLE versions of all the other images.  PS: the file size went from 163 --> 111KB.  
     Src: /Src/Res/Splash2.bmp
 
2004-03-21 Kimmo
 PATCH: [ 918545 ] New Splash Screen
  Submitted and graphics by Dean Grimm
  Src: Splash.cpp Splash.h
  Src/res: splash1.bmp

2004-03-19 Christian
 PATCH: [ 919134 ] Paths fixed in installer
  InnoSetup: WinMerge.iss

2004-03-19 Kimmo
 BUG: [ 919090 ] Memory leak in DiffFileData
  Src: DiffWrapper.cpp

2004-03-18 Perry
 BUG: [ 919160 ] Cannot execute notepad.exe
  Fix OpenFileToExternalEditor to prepend space before quoted filename.
   Src/MainFrm.cpp
 PATCH: [ 891498 ] moved block detection
   Src: Diff.cpp DiffWrapper.cpp DiffWrapper.h MergeDoc.cpp MergeDoc.h
    MergeEditView.cpp MergeEditView.h
   Src\diffutils\src: analyze.c DIFF.H

2004-03-17 Seier
 Modified  \ShellExtension\Register.bat to also UnRegister via a /U (case-insensitive) parameter.  
  I also added an UnRegister.bat which does nothing more than call Register.bat with the /u switch.  
 If you're wondering where a particular file or folder went and why please see \Docs\Developers\File Migration Log.htm.  
  Everyone can use this file from now on.

2004-03-17 Kimmo
 PATCH: [ 913743 ] Icons for menuitems (RFE 873697)
  More nice icons from Tim Gerundt (Edit/Goto, Edit/Replace, View/Language, View/Font, Window/Change Pane)
  Src: MainFrm.cpp Merge.rc resource.h
  Src/res new files: change_pane.bmp go_to.bmp language.bmp replace.bmp select_font.bmp
  Languages: *.rc resource.h
  Languages/res new files: change_pane.bmp go_to.bmp language.bmp replace.bmp select_font.bmp
 PATCH: [ 915790 ] Open Contributors.rtf from About dialog
  Handle errors if wordpad or associated app couldn't be run.
  Src: Merge.cpp

2004-03-16 Seier
  [Patch 917142] for Installer:
    -Now detects whether or not the user requires an updated ComCtl32.dll and if needed updates it.  
    -Corrupt Shell Extension folder association removed from the registry (no more errors in Windows Explorer)
    -Explorer "WinMerge" context menu support added
    -The View Start Menu folder option at the end of the install no longer appears if the user chose not to create a start menu group
    -Portugese is now listed amongst the other selectable languages in alpahbetic order
    -Catalan, Norwegian, Polish, Russian, and Swedish translations have been added to the installer for a total of 17 languages! Way to go 
      Translators!  Eventually we'll all just get lazy and speak Mergish :).  
    -WinMerge's "User's Guide" and "Read Me" files installed and added to the user's start menu
      Program Files\Docs\ created containing:
        * Read Me.rtf
        * Contributors.rtf
        * \User's Guide\	
    -The Read Me.rtf was divided into two files: Read Me.rtf and Contributors.rtf 
      (since this information is non-technical ands considerable bloat to the main Read Me file)
    -Obsolete registry settings LeftMax and DirViewMax are now deleted rather than reset 
      (note: all registry deletions in Inno Setup must have Type set to "None")  
    -Whether or not TortoiseCVS is installed support for it is added to the registry.  That way if a user ever installs it our application with start working       with it automatically :) (don't worry this only causes two possibly unecessary registry values and one key to be created)	
    -Since all three of the core WinMerge application files WinMerge*.exe, Merge7z*.dll, and ShellExtension.dll all use Ole Automation, I've included the 	      necessary runtime: OleAut32.dll (VS6 Service Pack 5)

2004-03-16 Kimmo
 RFE [ 917196 ] Directory Comparison Results baloon annoyance
  Don't show infotip for filename when whole filename is already shown
  Src: DirView.cpp
 PATCH: [ 915790 ] Open Contributors.rtf from About dialog
  Src: Merge.cpp Merge.rc resource.h

2004-03-15 Perry
 Fix Bulgarian (Cyrillic) spelling of Bulgarian.
 Src/Common: LanguageSelect.cpp

2004-03-15 Kimmo
 RFE: [ 874366 ] Add goto line-number
  Scroll line searched to center of view, as suggested by harry mckame
  Src: MergeEditView.cpp
 Change URLs to point http://winmerge.org 
  (As discussed in BUG #916674 Hardcoded url to help and website from help-menu)
  MainFrm.cpp Merge.cpp

2004-03-14 Kimmo
 RFE [ 897975 ] Syntax highlighting for INI files
  Color "[...]"
  Src/editlib: ini.cpp
 Apply icon change (2004-03-13 Seier) to languages
  Languages/res: Merge.ico
 PATCH: [ 913743 ] Icons for menuitems (RFE 873697)
  Submitted by Tim Gerundt
  Src: MainFrm.cpp Merge.rc resource.h
  Src/res: Toolbar.bmp
  Src/res new files: close.bmp
  Languages: *.rc resource.h
   res/bmp files
 BUG: [ 916028 ] Deleting unique file does not remove it from view
  Src: DirActions.cpp

2004-03-13 Seier
 Add 48*48 icon version (256 & 16 color)
  Src: /res/Merge.ico

2004-03-13 Kimmo
 Add User Manual draft to CVS
  Docs/Users/Manual: *.*
 PATCH: [ 915145 ] Delay automatic close of compare pane
  Src: DirView.cpp

2004-03-13 WinMerge experimental release 2.1.5.15 (cvs)

2004-03-11 Kimmo
 PATCH: [ 902191 ] Uninline CDiffTextBuffer functions
  Src: GhostTextBuffer.cpp MergeDoc.cpp MergeDoc.h
 BUG: [ 906467 ] Link error with Visual Studio 2003
  Fix submitted by hberni
  Merge7z: Merge7z.h
  Src: DirActions.cpp
 PATCH: [ 911442 ] Sort folders first when sorting by name
  Also fixing grouping doxygen comments for functions
  Src: DirViewColItems.cpp

2004-03-11 WinMerge experimental release 2.1.5.14 (installer test)

2004-03-11 Kimmo
 PATCH: [ 913792 ] Cache color options for MergeView
  Src: MergeDoc.cpp MergeEditView.cpp MergeEditView.h
 BUG: [ 872882 ] Some selected menu items looks to small
  Adds missing handler functions BCMenu needs
  Also added code to implement document menus (commented out for now)
  Src: MainFrm.cpp MainFrm.h Merge.rc
 PATCH: [ 913743 ] Icons for menuitems (RFE 873697)
  Submitted by Tim Gerundt
  Src: MainFrm.cpp Merge.rc resource.h
  Src/res new files: cascade.bmp cut.bmp cut.bmp horizontally.bmp
   paste.bmp search.bmp vertically.bmp
  Languages: *.rc resource.h
   res/bmp files

2004-03-10 Kimmo
 Fix for OptionsMgr bugs when loading string options from registry
  UNICODE strings were not handled correctly, incorrect buffer lengths
  Src/Common: OptionsMgr.cpp OptionsMgr.h
 PATCH: [ 912754 ] Close open MergeDoc before opening new from DirDoc
  Src: DirDoc.cpp DirDoc.h DirView.cpp
 RFE: [ 874366 ] Add goto line-number
  Show few lines of context above line scrolled to
  Src: MergeEditView.cpp
 PATCH: [ 913073 ] Option to automatically close compare pane
  Src: DirView.cpp DirView.h MainFrm.cpp Merge.rc OptionsDef.h
   PropGeneral.cpp PropGeneral.cpp resource.h
  Languages: *.rc resource.h

2004-03-09 Kimmo
 PATCH: [ 912297 ] Splashscreen and syntax highlight options
  Src: MainFrm.cpp Merge.cpp Merge.h MergeDiffDetailView.cpp
   MergeEditView.cpp OptionsDef.h
 Fix compile of CShellFileOp with Visual Studio 2003
  Fix from original author Michael Dunn
  Common: CShellFileOp.cpp

2004-03-08 Kimmo
 PATCH: [ 911350 ] Restore default compare options
  Src: MainFrm.cpp Merge.rc PropCompare.cpp PropCompare.h resource.h
  Languages: *.rc resource.h
 PATCH: [ 892397 ] Distinguish prediffer from unpacker
  Submitted by Laoran
  Src: DiffWrapper.cpp DirScan.cpp FileTransform.cpp FileTransform.h
   MainFrm.cpp MergeDoc.cpp SelectUnpackerDlg.cpp
 BUG: [ 909779 ] Uninitialised variable in CGhostTextBuffer::DeleteText()
  Fix submitted by Laoran
  Src: GhostTextBuffer.cpp
 BUG: [ 909796 ] Uninitialised variable on OnSelchangeUnpackerName()
  Fix submitted by Laoran
  Src: SelectUnpackerDlg.cpp
 BUG: [ 909090 ] MainFrm::m_CheckOutMulti not initialized
  Also m_bVCProjSync was unitilialised.
  Src: MainFrm.cpp

2004-03-07 Kimmo
 PATCH: [ 911114 ] DiffOptions to new system
  Src: ConfigLog.cpp ConfigLog.h DiffWrapper.cpp DiffWrapper.h DirDoc.cpp
   DirDoc.h MainFrm.cpp MainFrm.h MergeDoc.cpp MergeDoc.h OptionsDef.h
 PATCH: [ 906872 ] Change ShellExtension to open directories non-recursive
  ShellExtension: ShellExtension.rc WinMergeShell.cpp WinMergeShell.h
 RFE: [ 874366 ] Add goto line-number
  Improvement: Show file's current line in Goto-dialog as selected
  Src: MergeEditView.cpp
 Add contributors.txt
  Docs: contributors.txt

2004-03-06 WinMerge experimental release 2.1.5.13 (cvs)

2004-03-05 Kimmo
 PATCH: [ 909980 ] Fix buffer types and descriptions
  Src: MergeDoc.cpp MergeDoc.h
 Two unrelated lines got removed by checkin of #909980
  Src: MergeDoc.cpp

2004-03-04 Kimmo
 Fix invalid return in paths_IsPathAbsolute()
  paths.cpp
 PATCH: [ 907898 ] Detect filechange by another app before saving
  Src: DiffContext.cpp DiffContext.h Merge.dsp Merge.rc MergeDoc.cpp
   MergeDoc.h resource.h
  Src new files: DiffFileInfo.cpp DiffFileInfo.h
  Languages: *.rc resource.h

2004-03-03 Perry
 fix BUG: [ 902430 ] copy&paste comment bug
  Src: DirView.cpp

2004-03-03 Kimmo
 PATCH: [ 908606 ] Restore default colors
  Add "Defaults" button to Color options page
  Src/Common: OptionsMgr.cpp OptionsMgr.cpp
  Src: Merge.rc PropColor.cpp PropColors.h resource.h
  Languages: recource.h *.rc
 PATCH: [ 908211 ] DiffContext.h should not include RegExp.h
  Submitted by Perry
  Src: DiffContext.h DirDoc.h
 BUG: [ 908217 ] MergeDoc has incorrect include
  Submitted by Perry
  Src: MergeDoc.h
  
2004-03-02 Kimmo
 PATCH: [ 907087 ] Allow commandline switches for external editor
  Src/Common: coretools.cpp coretools.h
  Src: MainFrm.cpp
 PATCH: [ 907641 ] Convert color options to new system
  Src: ColorButton.cpp ColorButton.h MainFrm.cpp Merge.cpp Merge.h
   MergeDiffDetailView.cpp MergeEditView.cpp OptionsDef.h
   PropColors.cpp PropColors.h

2004-03-01 Kimmo
 PATCH: [ 906180 ] Use SHBrowseForFolder() to select folder
  Src: Merge.cpp Merge.h
 FIX wrong checkin comments and wrong patch number and description
  in previous checkin.
 PATCH: [ 906934 ] Fix filenames in patch-files
  Src: DiffWrapper.cpp

2004-02-28 WinMerge experimental release 2.1.5.12 (cvs)

2004-02-28 Kimmo
 PATCH: [ 906120 ] Improve error handling for dircompare fileoperations
  Src: DirActions.cpp
 PATCH: [ 906224 ] Convert more options to new system
  Src: MainFrm.cpp MainFrm.h MergeDiffDetailView.cpp MergeDoc.cpp
   MergeDoc.h MergeEditView.cpp OptionsDef.h

2004-02-27 Kimmo
 PATCH: [ 905115 ] Put deleted files to Recycle Bin
  Also added option to disable it in "System" options
  DirActions.cpp MainFrm.cpp Merge.rc OptionsDef.h PropRegistry.cpp
  PropRegistry.h resource.h
 Fix copy/paste error
  Src: DirActions.cpp
 Better absolute path check (I thought I already applied this)
  Src: paths.cpp

2004-02-26 Kimmo
 PATCH: [ 903670 ] Copy Folder (and convert to CShellFileOp)
  Src: DirActions.cpp DirView.h MainFrm.cpp MainFrm.h

2004-02-23 Kimmo
 PATCH: [ 902738 ] Two errors in resource (Whitespaces and Hilight)
  Also RFE [ 837773 ] fix all about boxes
  Src: Merge.rc
  Languages: *.rc

2004-02-21 Kimmo
 PATCH: [ 896153 ] OptionsManager
  Src/Common: new files OptionsMgr.cpp OptionsMgr.h
  Src: DirDoc.cpp DirView.cpp MainFrm.cpp MainFrm.h Merge.dsp MergeDoc.cpp
   MergeEditView.cpp 
  Src: new file OptionsDef.h
 PATCH: [ 900718 ] Updated German translation
  Submitted by Tim Gerundt
  Languages/German: MergeGerman.rc

2004-02-20 Perry
 Fix CopyAll.bat for new directory structure.
  Src: Languages\CopyAll.bat
 Add GetClipTcharTextFormat (needed by coretools now) to StdAfx.*
  MakeResDll: StdAfx.cpp StdAfx.h
 Fix MakeResDll.dsp to compile (new directory structure).
  MakeResDll\MakeResDll.dsp

2004-02-20 WinMerge experimental release 2.1.5.11 (cvs)

2004-02-20 Kimmo
 PATCH: [ 899926 ] Write LogErrorString()s to logfile
  Src: DiffWrapper.cpp MainFrm.cpp MergeDoc.cpp StdAfx.cpp

2004-02-19 Jochen
 BUG: [ 888992 ] 7zip integration: Error deleting file when closing WinMerge
  Src: 7zCommon.cpp

2004-02-19 Kimmo
 PATCH: [ 899145 ] Check if patch path is absolute
  Src: Merge.rc PatchDlg.cpp paths.cpp paths.h resource.h
  Languages: *.rc resource.h (incl. changes from #889357)
 BUG: [ 893410 ] Typo in IDS_DIFF_FILEOVERWRITE
  Src: Merge.rc
  Languages: *.rc
 RFE: [ 897975 ] Syntax highlighting for INI files
   Patch submitted by Tim Gerundt
   Src: Merge.dsp
   editlib: ccrystaltextview.cpp ccrystaltextview.h
   editlib new file: ini.cpp

2004-02-18 Jochen
 PATCH: [ 889357 ] Attempt to improve DirScan speed
  The VERIFY(::DeleteFile... ) in prepAndCompareTwoFiles() won't fire as long as
  the gLog.m_nMaskLevel's LOGLEVEL::LSILENTVERIFY bit is set, which is the case
  by default.
  Common: logfile.cpp logfile.h
  Src: stdafx.cpp stdafx.h Merge.rc resource.h Diff.cpp DiffContext.cpp
   DiffContext.h DiffWrapper.cpp DiffWrapper.h DirCompStateBar.cpp
   DirCompStateBar.h DirScan.cpp DirView.h DirViewColHandler.cpp
   DirViewColItems.cpp DirViewColItems.h files.cpp FileTransform.h
   stringdiffs.cpp

2004-02-18 Kimmo
 BUG: [ 898745 ] Wrong result for folders (non-recursive compare)
  Src: DirViewColHandler.cpp

2004-02-17 Kimmo
 BUG: [ 887280 ] Swap toolbar icon (usability)
  Swaps 'Last Diff' and 'First diff' buttons + adds separator before
  Src: Merge.rc
  Src/res: Toolbar.bmp
  Languages: *.rc
  Languages/res: Toolbar.bmp 

2004-02-16 Kimmo
 PATCH: [ 873151 ] Attempt to fix Help/Configuration
  Submitted by Perry
  Src: paths.cpp
 PATCH: [ 891364 ] Enumerated doctype (scratchpads)
  Src: MergeDoc.cpp MergeDoc.h

2004-02-09 Kimmo
 BUG: [ 893287 ] Assign wrong file property when storing changes.
  Src: MainFrm.cpp

2004-02-08 Perry
 Add header comments to functions lacking such in StdAfx.cpp
  Src: StdAfx.cpp

2004-02-08 Kimmo
 PATCH: [ 892509 ] Reset dircompare statuspane before new compare
  Src: DirCompStateBar.cpp DirCompStateBar.h DirFrame.cpp
 PATCH: [ 890758 ] Fix and tune doxy config file
  Docs: doxygen.cfg
 BUG: [ 887271 ] Weird context menu position if opened from keyboard
  Src: MergeEditView.cpp

2004-02-07 Laoran
 BUG: [ 892158 ] Empty lines added to end of file
  Src: MergeDoc.cpp

2004-02-07 WinMerge experimental release 2.1.5.9 (cvs)

2004-02-07 Kimmo
 BUG: [ 892115 ] Directory compare always recursive
  Src: DirScan.cpp

2004-02-05 Kimmo
 Remove doubled entrys from MessageMap
  Src: MergeEditView.cpp

2004-02-05 Perry
 BUG: [ 876500 ] OlecharToUTF8 doesn't distinguish UCS-2BE?
 Add function header comment to OlecharToUTF8 in multiformatText.cpp
  Common: multiformatText.cpp

2004-02-04 Kimmo
 PATCH: [ 888662 ] Add Editor options page
  Src: MainFrm.cpp Merge.dsp Merge.rc PropGeneral.cpp PropGeneral.h resource.g
  Src new files: PropEditor.cpp PropEditor.h
  Src removed files: PropSyntax.cpp PropSyntax.h
  Lanuages: *.rc resource.h

2004-02-04 Laoran
 Correcting the path for the original resource.h
  Languages: UpdateAll_resource_h.bat

2004-02-03 Perry
 PATCH: [ 882683 ] Combine transform code in DirScan.cpp
  Src: DirScan.cpp FileTransform.cpp FileTransform.h MergeDoc.cpp
 PATCH: [ 890019 ] Fix diff_flag to bin_flag in CDiffWrapper::RunFileDiff
  Src: DiffWrapper.cpp

2004-02-03 Kimmo
 Fix "Copy Right to.." (copy/paste error)
  Src: DirActions.cpp
 PATCH: [ 889115 ] Delete transformed temp files in file compare
  Src: DiffWrapper.cpp
 PATCH: [ 889334 ] Improve and enable logging
  Logging is now enabled for debug builds, written to $temp/WinMerge.log
  Common: LogFile.cpp LogFile.h
  Src: DiffWrapper.cpp DirActions.cpp DirDoc.cpp DirScan.cpp
   MainFrm.cpp MergeDoc.cpp StdAfx.cpp
 PATCH: [ 887800 ] Add frames around items in dircompare statusbar
  Src: DirCompStateBar.cpp DirCompStateBar.h Merge.rc
  Languages: *.rc

2004-02-01 Perry
 Cosmetic: fix copy&paste error in UniFile.cpp comment.
 Src/Common: UniFile.cpp

2004-02-01 Kimmo
 PATCH: [ 885496 ] Move compare options to Compare-page
  src: MainFrm.cpp Merge.rc PropCompare.cpp PropCompare.h
   PropGeneral.cpp PropGeneral.h
  Languages: *.rc
 PATCH: [ 887085 ] CMergeDoc::TrySaveAs() cleanup
  src: MergeDoc.cpp MergeDoc.h
 Remove some unused variables
  src: DiffWrapper.cpp MergeDoc.cpp PatchDlg.cpp StringDiffs.cpp
  src/common: multiformatText.cpp
 Initialise all PackingInfo members
  src: FileTransform.h

2004-01-31 Laoran
 BUG: [ 885018 ] Crash when trying to save scratchpad
  src: MergeDoc.cpp

2004-01-31 Kimmo
 PATCH: [ 887283 ] Menu cleanup
  scr: Merge.rc
  Languages: *.rc

2004-01-31 Perry
 BUG: [ 887957 ] Some builds of ShellExtension need include dir fixed
  ShellExtension: ShellExtension.dsp
 PATCH: [ 882650 ] Move temp build files out of Build into BuildTmp (more)
  ShellExtension: ShellExtension.dsp
 [ 879536 ] Add MakePatchDirs source to repository
  MakePatchDirs: AppVersion.cpp AppVersion.h CDirDialog.cpp CDirDialog.h
   CMoveConstraint.cpp CMoveConstraint.h CSubclass.cpp CSubclass.h
   ChangeLog.txt DropEdit.cpp DropEdit.h MakeDirs.cpp MakeDirs.h
   MakePatchDirs.dsp MakePatchDirs.ico MakePatchDirs.rc MakePatchDirs.rc2
   MakePatchDirsApp.cpp MakePatchDirsApp.h MakePatchDirsDlg.cpp 
   MakePatchDirsDlg.h ReadMe.txt StdAfx.cpp StdAfx.h dist.txt exc.cpp
   exc.h resource.h

2004-01-30 WinMerge experimental release 2.1.5.8 (cvs)

2004-01-30 Kimmo
 BUG: [ 887543 ] Word-diff (No difference) messagebox has Cancel-button
  src: MergeDocLineDiffs.cpp

2004-01-29 Kimmo
 PATCH: [ 885092 ] CMergeDoc::DoSave() cleanup
  src: MergeDoc.h MergeDoc.cpp

2004-01-27 Kimmo
 PATCH: [ 884301 ] Modified Visual Basic syntax highlighting
  Submitted by Tim Gerundt
  src/editlib: basic.cpp

2004-01-26 Christian
 PATCH: [ 883303 ] Upgrade WinMerge Home Page
  Web: index.php winmerge.css WinMergePAD.xml images/redswirl.gif

2004-01-26 Kimmo
 BUG: [ 846034 ] drag and drop files does not set extension
  src: OpenDlg.cpp

2004-01-26 Jochen
 Avoid copying DIFFITEMs
  This badly slowed down DirView sorting and navigation.
  src: DirViewColHandler.cpp DirView.cpp DirView.h 7zCommon.cpp 7zCommon.h
 Fix ASSERT in vc98/mfc/src/olevar.cpp when sorting DirView by date
  src: DirViewColItems.cpp

2004-01-25 Jochen
 Fix bad default for OPENFILENAME::nFilterIndex
  src: 7zCommon.cpp

2004-01-24 Perry
 [ 882650 ] Move temp build files out of Build into BuildTmp
  Src: Merge.dsp
  MakeResDll: MakeResDll.dsp

2004-01-23 Kimmo
 PATCH: [ 881602 ] Don't allow canceling saving when its pointless
  src: MainFrm.cpp MergeDiffDetailView.cpp MergeDoc.cpp MergeDoc.h MergeEditView.cpp
 PATCH: [ 880769 ] Select all in Dir compare
  src: DirView.h DirView.cpp Merge.rc
  Languages: *.rc
 Minor update to 2.2 plan - couple of items completed, two new items (25, 26)

2004-01-23 Perry
 PATCH: [ 880006 ] Code cleanup--old commented out lines in DirView.h
  src: DirView.h
 Cleanup stdafx.h; comment includes & declarations, remove unneeded include of afxsock.h
  src: StdAfx.cpp StdAfx.h
 PATCH: [ 802113 ] strip out spurious tests: _MSC_VER >= 1000 { part #2/2 }
  src: CCPrompt.h ColorButton.h DiffViewBar.h DirCompStateBar.h MergeEditView.h
   OutputDlg.h PatchDlg.h PropColors.h PropCompare.h PropFilter.h PropRegistry.h
   PropSyntax.h SelectUnpackerDlg.h WMGotoDlg.h
  src/Common: SplitterWndEx.h

2004-01-23 Kimmo
 PATCH: [ 848159 ] RFE 826652 : Compare by modified date
  Submitted by Tim Musschoot - some modifications by Kimmo
  src: DirScan.cpp MainFrm.h MainFrm.cpp Merge.dsp Merge.rc resource.h
  src new files: PropCompare.h PropCompare.cpp
  Languages: *.rc resource.h

2004-01-22 Perry
 Add some comments before initialization of g_cols
  src: DirViewColItems.cpp

2004-01-21 Perry
 PATCH: [ 878631 ] Add generic named properties to DiffContext
  src: Diff.cpp DiffContext.cpp DiffContext.h DirDoc.cpp DirScan.cpp
   DirView.h DirViewColHandler.cpp DirViewColItems.cpp Merge.dsp
   Merge.rc resource.h
  src/Common: varprop.cpp varprop.h

2004-01-21 Kimmo
 PATCH: [ 880898 ] BCMenu update to v3.034
  src: BCMenu.h BCMenu.cpp

2004-01-20 WinMerge experimental release 2.1.5.7 (cvs)

2004-01-20 Jochen
 Fix bug 880320
  New class CSilentException to be thrown on subsequent failures in proxy linking to merge7z*.dll.
  src: 7zCommon.cpp 7zCommon.h MainFrm.cpp
  
2004-01-19 Jochen
 Finish Merge7z integration
  src: Merge.rc resource.h DirView.cpp DirView.h DirDoc.cpp MainFrm.cpp Merge.dsp
  Merge7z: Merge7z311.dsp Merge7z312.dsp Merge7z313.dsp

2004-01-19 Perry
 PATCH: [ 880046 ] Save every line including last one in SaveToFile
  src: MergeDoc.cpp
 UniStdioFile::OpenCreateUtf8 (shortcut for creating UTF-8 file)
  src/Common: UniFile.cpp UnFile.h

2004-01-19 Kimmo
 PATCH: 876875 Go To -Dialog
  Fix crash in GotoDlg. This was in latest patch, but I merged part of older patch :(
  MergeEditView.h MergeEditView.cpp

2004-01-19 Perry
 PATCH: [ 878625 ] Simplify and unify file operations calling diff_2_files.
  src: Diff.cpp DiffWrapper.cpp DiffWrapper.h
 PATCH: [ 847121 ] Code cleanup (remove unneeded AssertValid & Dump implementations)
  src: ChildFrm.cpp ChildFrm.h DirDoc.cpp DirDoc.h DirFrame.cpp DirFrame.h
   DirView.cpp DirView.h MainFrm.cpp MainFrm.h MergeDiffDetailView.cpp 
   MergeDiffDetailView.h MergeEditView.cpp MergeEditView.h
 PATCH: [ 802113 ] strip out spurious tests: _MSC_VER >= 1000 { part#1/2 }
  src: ChildFrm.h DirFrame.h DirView.h EditFile.h FilepathEdit.h
   GhostTextBuffer.h GhostTextView.h MainFrm.h Merge.h MergeDoc.h
   PropGeneral.h PropVss.h StdAfx.h VssPrompt.h
 PATCH: [ 880046 ] Save every line including last one in SaveToFile
  src: MergeDoc.cpp

2004-01-18 Kimmo
 PATCH: 876875 Go To -Dialog
  src new files: WMGotoDlg.h WMGotoDlg.cpp
  src: Merge.dsp Merge.rc MergeEditView.h MergeEditView.cpp resource.h
  src/Languages: *.rc resource.h
 PATCH: [ 872413 ] UnpackDFM TestStreamFormat
  Submitted by Michael Richter
  Plugins/Delphi/UnpackFDM: UnpackFDM.dpr UnpackFDMLib_TLB.pas
   WinMergeUnit.pas
  Plugins/dlls: UnpackFDM.dll

2004-01-17 Kimmo
 PATCH: [ 871789 ] Add "Copy to..." items to dirview context menu
  src/Common: new files CShellOp.h CShellOp.cpp
  src: DirActions.cpp DirView.h DirView.cpp Merge.cpp Merge.dsp
   Merge.h Merge.rc resource.h
  src/Languages: *.rc resource.h
 PATCH: [ 876556 ] (Minor) code cleanup for SaveToFile
  Submitted by Perry
  src: MergeDoc.cpp

2004-01-16 Perry
 Fix bug in UniFile::WriteString counting of written bytes.
  Src/Common/UniFile.cpp

2004-01-16 WinMerge experimental release 2.1.5.6 (cvs)

2004-01-15 Kimmo
 PATCH: [ 873940 ] Diff navigation code cleanups
  src: MergeEditView.cpp
 Remove _T()'s from _RPTF() macros (forgot to do before last checkin)
  src: MergeEditView.cpp

2004-01-15 Perry
 Remove rcs/cvs ID line from unicoder.* (because I share these elsewhere)
  src/WinMerge/Common: unicoder.cpp unicoder.h
 Fix bug in unicoder.cpp: WideCharToMultiByte: lpDefaultChar & lpUsedDefaultChar must be NULL when using UTF-8.
  src/WinMerge/Common: unicoder.cpp

2004-01-13 Perry
 PATCH: [ 876546 ] Fix CMergeDoc::CDiffTextBuffer::SaveToFile ghost line detect
  src/WinMerge: MergeDoc.cpp

2004-01-13 Jochen
 Start Merge7z integration (to be continued)
  src: 7zCommon.cpp 7zCommon.h DirView.h
 
2004-01-13 Kimmo
 PATCH: [ 875567 ] Compile after reorg
  Submitted by Christian to make WinMerge compile again!
  Src: Merge.dsp

2004-01-12 Kimmo
 PATCH: [ 874451 ] Update lineposition offpane when navigating diffs
 Fixes wrong linenumber and cursor position in inactive file
  WinMerge: MergeEditView.cpp

2004-01-11 Perry
 PATCH: [ 875237 ] Fix fwrite call in UniStdioFile::WriteString
 Fix byte count and argument order when UniStdioFile::WriteString calls fwrite.
  common: UniFile.cpp
 PATCH: [ 875215 ] Fix UnicodeFileToOlechar obtaining BOM
  common: multiformatText.cpp

2004-01-11 WinMerge experimental release 2.1.5.5 (cvs)

2004-01-11 Perry
 PATCH: [ 860054 ] Reimplement SaveToFile using stream output
  common: multiformatText.cpp unicoder.cpp unicoder.h UniFile.cpp UniFile.h
  WinMerge: DiffContext.cpp MergeDoc.cpp

2004-01-11 Kimmo
 Minor update to 2.2 plan
  Docs: Planning_2_2.txt

2004-01-11 WinMerge experimental release 2.1.5.4 (cvs)

2004-01-11 Perry
 Update Merge7z project files to build to ../Build directories
 in same fashion as WinMerge project
  Merge7z: Merge7z311.dsp Merge7z312.dsp Merge7z313.dsp

2004-01-09 Perry
 PATCH: [ 872762 ] Stricter error handling for Plugins
  WinMerge: Plugins.cpp

2004-01-09 Kimmo
 Fix parameter type, CMergeDoc::TrySaveAs() second param is int.
  WinMerge: CMergeDoc.cpp

2004-01-08 Perry
 PATCH: [ 872727 ] Fix function comment on lwdisp.c: ReportError
  common: lwdisp.c
 PATCH: [ 862040 ] CAssureScriptsForThread like WaitCursor
  WinMerge: DiffThread.cpp FileTransform.cpp Merge.cpp Merge.h
   MergeEditView.cpp Plugins.cpp Plugins.h SelectUnpackerDlg.cpp
 PATCH: [ 860072 ] Allow singlethreaded diffs
  WinMerge: DiffThread.cpp


2004-01-08 Kimmo
 Updated Russian translation from Dmitriy Aleshkowskiy
  Languages/Russian: MergeRussian.rc

2004-01-08 Perry
 PATCH: [ 872032 ] Add SEH around calls to load plugins
  WinMerge: Plugins.cpp

2004-01-07 jtuc
 Added new module Merge7z
  Merge7z: Merge7z.h Merge7z311.cpp Merge7z311.dsp Merge7z312.dsp
   Merge7z313.dsp Merge7zCommon.cpp Merge7zCommon.h StdAfx.cpp
   StdAfx.h tools.cpp tools.h

2004-01-07 Kimmo
 PATCH: [ 856396 ] Browse folders in non-recursive directory compare
  WinMerge: DirDoc.h DirDoc.cpp DirScan.cpp DirView.h DirView.cpp
   DirViewColHandler.cpp Merge.dsp Merge.rc Paths.h Paths.cpp resource.h
  WinMerge/res: new file folder.bmp
  Languages: *.rc resource.h
  Languages/res: new file folder.bmp

2004-01-06 Kimmo
 Add Polish translation contributed by Pawel Wawrzyszko
 Languages/Polish/*
 Languages: BuildAll.bat UpdateAll_resource_h.bat

2004-01-06 WinMerge experimental release 2.1.5.3 (cvs)

2004-01-06 Perry
 PATCH: [ 869575 ] UniMemFile needs to init charsize to 1
  common: UniFile.cpp
 PATCH: [ 869518 ] Fix IO.C to count non-UNIX prefix lines correctly
  WinMerge: IO.C

2004-01-04 Kimmo
 BUG: [ 869289 ] Typo in XML_html.flt excludes gif files
  Filters: XML_html.flt

2004-01-02 Kimmo
 PATCH: [ 868584 ] Move DIRSEL_TAG to string resource
  WinMerge: Merge.rc OpenDlg.cpp resource.h
  Languages: *.rc resource.h
 Adding missing line in patch [ 868584 ] and fixing one tab
  WinMerge: OpenDlg.cpp

2003-12-28 Perry
 PATCH: [ 863738 ] Various Updates in German Translation
  Updates to German translation by Tim Gerundt (gerundt), based on 1.73 MergeGerman.rc
  Languages: German/MergeGerman.rc
 PATCH: [ 860472 ] Fix SuperComboBox to handle its own OLE requirements
  common: SuperComboBox.cpp SuperComboBox.h
 New Russian translation by Dmitriy Aleshkowskiy
  Languages\Russian\*

2003-12-22 Perry
 Put ID_POPUP_COPYALLDIFFSFROMOTHERSIDE back into rc file so it parses
  Winmerge: Merge.rc

2003-12-22 Laoran
 BUG: [ 860043 ] binary file detection broken
  WinMerge: DiffWrapper.cpp DirScan.cpp

2003-12-19 Kimmo
 PATCH: [ 861099 ] Dirview context menu cleanup
  WinMerge: DirView.cpp Merge.rc resource.h
  Languages: *.rc resource.h

2003-12-18 Kimmo
 PATCH: [ 860988 ] Change File from menu (Adds Window/Change Pane)
  WinMerge: Merge.rc MergeEditView.h MergeEditView.cpp resource.h
  Languages: *.rc resource.h
 PATCH: [ 861813 ] Optimise dircompare statuspane updating
  Fixes bug [ 860204 ] Dir compare statuspane flickers on slower machine
  WinMerge: DirCompStateBar.h DirCompStateBar.cpp
  
2003-12-18 Laoran
 adapt plugins syntax check, consequence of patch #853147 
  WinMerge: Plugins.cpp

2003-12-17 Kimmo
 PATCH: [ 858283 ] Add isResultDiff() to DiffItem
  Fix bug in patch (DirDoc.cpp)
  WinMerge: DirDoc.cpp

2003-12-17 Laoran
 update plugin docs and examples, consequence of patch #853147 
  plugins: list of sources.txt readme.txt syntax.txt
  plugins\dlls: RCLocalizationHelper.dll list.txt
  plugins\src_VB\IgnoreTwoFirstCharsOrder: WinMergeScript.cls
  plugins\src_VCPP\RCLocalizationHelper: RCLocalizationHelper.idl WinMergeScript.cpp WinMergeScript.h

2003-12-16 Perry
 PATCH: [ 860072 ] Allow singlethreaded diffs
  Add unused code to trigger diffs in main thread (for developer to trigger via breakpoint).
  WinMerge: DiffThread.cpp
 unpatch: Reverse (back out) patch [ 860072 ] Allow singlethreaded diffs
  WinMerge: DiffThread.cpp

2003-12-16 Kimmo
 PATCH: [ 858283 ] Add isResultDiff() to DiffItem
  Fixes BUG [ 852998 ] Left Only being filtered out if not view different
  WinMerge: DiffContext.h DirDoc.cpp

2003-12-14 Kimmo
 BUG: [ 833096 ] Left/right-only status overwrites skipped-status
  Apply fix for long result too
  WinMerge: DirViewColItems.cpp
 PATCH: [ 851586 ] Improve Patch generate dialog
  Also implements RFE #849890 Disable first line in patch-file
  WinMerge: DiffWrapper.h DiffWrapper.cpp Merge.rc PatchDlg.h PatchDlg.cpp
   PatchTool.cpp resource.h
  Languages: *.rc resource.h

2003-12-11 Kimmo
 Adding 2.2 plan
  Docs: Planning_2_2.txt

2003-12-11 Laoran
 remove files UnicodeUtf8, consequence of patch #853147 
  WinMerge: FileTransform.cpp Merge.dsp
  WinMerge delete: UnicodeUtf8.cpp UnicodeUtf8.h
 PATCH: [ 853147 ] New class for text conversion in plugins
  common: unicoder.cpp unicoder.h
  common add: multiformatText.cpp multiformatText.h
  WinMerge: DiffWrapper.cpp DirScan.cpp FileTransform.cpp FileTransform.h Merge.dsp MergeDoc.cpp 
   Plugins.cpp Plugins.h SelectUnpackerDlg.cpp

2003-12-10 Perry
 Add comment inside CMergeDoc::CDiffTextBuffer::SaveToFile about existing buggy code.
  WinMerge: MergeDoc.cpp

2003-12-10 Kimmo
 PATCH: [ 857003 ] Move linediff messagebox text into resource
  WinMerge: Merge.rc MergeDocLineDiffs.cpp resource.h
  Languages: *.rc resource.h
 PATCH: [ 856974 ] More space for numbers in dir compare statuswindow
  WinMerge: Merge.rc
  Languages: *.rc

2003-12-09 Laoran
 BUG: [ 842812 ] Some extension filtering happening by default (fix for *.*)
  WinMerge: DirDoc.cpp 
 Don't preprend a backslash to filename if there is already one (test for filter)
  WinMerge: DirDoc.cpp

2003-12-04 Laoran
 BUG: [ 836868 ] Search and replace field size limited (apply to languages)
  Languages : *.rc
 PATCH: [ 848476 ] Wrap end of file in replace dialog
  WinMerge: Merge.rc resource.h
  editlib: ccrystaleditview.cpp ccrystaltextview.h ceditreplacedlg.cpp ceditreplacedlg.h cfindtextdlg.h
  Languages : *.rc resource.h

2003-12-03 WinMerge experimental release 2.1.5.1 (cvs)

2003-12-01 Laoran
 reclassing strings in resource.h in same order as in Merge.rc
  WinMerge: resource.h
  Languages: resource.h

2003-12-01 Kimmo
 PATCH: [ 852062 ] XML/HTML file filter
 Filters: new file XML_html.flt

2003-11-30 Perry
  Added comment giving Unicode for hanguko (Korean in Hangul alphabet)
  common: LanguageSelect.cpp: Korean/MergeKorean.rc

2003-11-29 Laoran
 PATCH: [ 847884 ] Remove obsolete registry keys
  WinMerge: PropRegistry.cpp PropRegistry.h
  InnoSetup: WinMerge.iss

2003-11-29 Kimmo
 Rename folder1.bmp to lfolder.bmp (suggested in PATCH [ 841039 ] Green "binary.bmp")
  WinMerge: Merge.dsp Merge.rc
  Added WinMerge/res/lfolder.bmp
  Removed WinMerge/res/folder1.bmp
  Updated languages

2003-11-28 Laoran
 Add header and RCS ID
  common: lwdisp.h unicoder.cpp unicoder.h FileTransform.h Plugins.h SelectUnpackerDlg.h

2003-11-28 Kimmo
 BUG: [ 848725 ] Crash trying to generate report
  Fix submitted by Perry
  WinMerge: DirView.cpp

2003-11-27 Perry
 PATCH: [ 849424 ] Fix worddiffs for whitespace
 Handle Sensitive to whitespace in stringdiffs.
  WinMerge: MergeDocLineDiffs.cpp stringdiffs.cpp
 PATCH: [ 842914 ] Add codepage guessing, and codepage column
 Optional codepage column in dirview. Code to check RC & HTML files for codepage
  WinMerge: DiffContext.cpp DiffContext.h DirViewColItems.cpp Merge.rc resource.h
  Languages: All resource.h and *.rc files.

2003-11-26 Perry
 PATCH: [ 842534 ] Move copy & delete ops to submenus in dirview popup
 First part of patch; moved menu items into popup submenus.
  WinMerge: DirActions.cpp DirView.cpp DirView.h Merge.rc resource.h
  Languages: All resource.h and *.rc files.

2003-11-26 Kimmo
 PATCH: [ 848955 ] Don't ask about saving after user selects 'Cancel'
  WinMerge: MergeDoc.cpp

2003-11-25 Perry
 PATCH: [ 849138 ] Fix stringdiffs for diff in first word
  (Code was trying to access word#-1 when diff hit in first word)
  WinMerge: stringdiffs.cpp stringdiffs.h

2003-11-25 Kimmo
 Missed one diff in PATCH: [ 847697 ] Move desc texts into doc classes
 WinMerge: MergeDoc.cpp

2003-11-25 WinMerge experimental release 2.1.5.0 (cvs)

2003-11-24 Perry
 PATCH: [ 847134 ] More commenting for DirScan (doxygenize function comments)
  WinMerge: DirScan.cpp DirScan.h
 [ 846405 ] Highlight individual word diffs in line
  (Enhance F4 to compute individual differences, and toggle through them in a cycle)
  WinMerge: Merge.dsp MergeDoc.cpp MergeDoc.h MergeDocLineDiffs.cpp
   stringdiffs.cpp stringdiffs.h stringdiffsi.h

2003-11-24 Laoran
 BUG: [ 848461 ] Toggle 'show different files' is broken (thanks to Kimmo)
  WinMerge: DirDoc.cpp

2003-11-24 Perry
 Improvements to language names in LanguageSelect.cpp (and reference URLs), from Laurent.
 common: LanguageSelect.cpp

2003-11-24 Kimmo
 PATCH: [ 847137 ] Report from dir compare results
  Submitted by Vikrant
  common: coretools.h coretools.cpp
  WinMerge: DirView.h DirView.cpp Merge.rc resource.h
  Languages: *.rc resource.h
 Within PATCH: [ 847137 ] - add space to New File item tooltip
 PATCH: [ 847137 ] Report from dir compare results
  Missed one diff from DirView.cpp
  WinMerge: DirView.cpp
 PATCH: [ 847697 ] Move desc texts into doc classes
  Fixes bug [ 847635 ] filenames after scratchpad
  WinMerge: DirDoc.h DirDoc.cpp MainFrm.h MainFrm.cpp  MergeDoc.h MergeDoc.cpp

2003-11-23 Perry
 Fix Exceptions.h for Unicode build
  WinMerge: Exceptions.h

2003-11-23 Laoran
 PATCH: [ 846237 ] Fix for the maximized/restored state (dirframe, docframe)
  WinMerge: ChildFrm.cpp DirFrame.cpp
 PATCH: [ 843124 ] Initialize COM in secondary threads
  WinMerge: Plugins.cpp Plugins.h
 BUG: [ 846622 ] rc files wrongly displayed as identical (fix : no automatic prediffing)
  WinMerge: FileTransform.cpp FileTransform.h MainFrm.cpp
 cosmetic: replace bUnpackerMode with m_bUnpackerMode
  WinMerge: FileTransform.cpp FileTransform.h MainFrm.cpp
 PATCH: [ 846523 ] error description for plugins error handler
  WinMerge: Merge.dsp Merge.rc Plugins.cpp
  WinMerge add: Exceptions.h

2003-11-23 Kimmo
 PATCH: [ 847638 ] Unused member variables in MainFrm.h
  WinMerge: MainFrm.h

2003-11-23 Laoran
 typo in TrySaveAs and merge error in DoSave
  WinMerge: MergeDoc.cpp

2003-11-23 Perry
 PATCH: [ 842906 ] Hardcode native language names into LanguageSelection.cpp
  Now Merge.rc holds all ASCII language names, and non-ASCII versions (if different)
   are in LanguageSelection.cpp, as Unicode strings.
  WinMerge: Merge.rc
  common: LanguageSelection.cpp LanguageSelection.h

2003-11-22 Kimmo
 PATCH: [ 820676 ] Scratchpad
  WinMerge: MainFrm.h MainFrm.cpp Merge.rc MergeDoc.h MergeDoc.cpp resource.h
  WinMerge/res: Toolbar.bmp
  Languages:  *.rc resource.h
  Languages/res: Toolbar.bmp

2003-11-22 Perry
 PATCH: [ 844780 ] MergeDoc code cleanup
 (removed AssertValid, Dump, and unused Serialize body)
  WinMerge: MergeDoc.cpp MergeDoc.h
 PATCH: [ 847126 ] Split large function in DirScan into 2 pieces
  WinMerge: DirScan.cpp
 PATCH: [ 847138 ] Initialize some variables in Plugins functions
  WinMerge: Plugins.cpp
 PATCH: [ 847149 ] Fix typo in DirScan (i->j)
  WinMerge: DirScan.cpp

2003-11-21 Laoran
 BUG: [ 846450 ] "Winmerge executable:" label missing from registry options
  WinMerge: Merge.rc
  Languages: *.rc
 cosmetic in Dirscan : FilterAdd -> StoreDiffResult
  WinMerge: DirScan.cpp
 SaveToFile : returned value (BOOL -> int)
 cosmetic changes in TrySaveAs/DoSave/OnFileSaveAsLeft/OnFileSaveAsRight
  WinMerge: MergeDoc.cpp MergeDoc.h

2003-11-19 WinMerge beta 2.1.4.0 released

2003-11-19 Laoran
 BUG: [ 845196 ] UTF-8 files not correctly compared
  WinMerge: MergeDoc.cpp MergeDoc.h 
 BUG: [ 845012 ] SaveToFile does not write BOM
  WinMerge: MergeDoc.cpp

2003-11-18 Laoran
 PATCH: [ 842817 ] Initialize OpenDlg extension filter to blank
 fix proposed by Perry
  WinMerge: OpenDlg.cpp
 BUG: [ 840759 ] Failed to load library UnpackDFM.dll
 fix proposed by Jochen
  common: lwdisp.c

2003-11-17 Perry
 [ 843526 ] cosmetic changes from the archives patch
  WinMerge: DirDoc.cpp DirDoc.h MainFrm.cpp

2003-11-16 Perry
 PATCH: [ 841897 ] Bail out of LoadFromFile if see embedded zeros
  WinMerge: MergeDoc.cpp

2003-11-16 Kimmo
 BUG: [ 818416 ] is stat population missing from RunFileDiff ?
  WinMerge: DiffWrapper.cpp

2003-11-16 Laoran 
 BUG: [ 842746 ] Highlight diff tool button lacks tooltip
  WinMerge: Merge.rc
  Languages: *.rc
  
2003-11-15 Perry
 PATCH: [ 838290 ] Move inf creation down in RunFileDiff (cosmetic)
  WinMerge: DiffWrapper.cpp
 PATCH: [ 841878 ] Fix wchar to char conversions at save
  WinMerge: MergeDoc.cpp MergeDoc.h
  common: unicoder.cpp unicoder.h UniFile.cpp UniFile.h

2003-11-15 WinMerge experimental release 2.1.3.9 (cvs)

2003-11-14 Laoran 
 PATCH: [ 840296 ] Informative messageboxes when loading files
  WinMerge: files.h MainFrm.cpp MainFrm.h Merge.rc MergeDoc.cpp resource.h
  Languages: *.rc resource.h
 PATCH: [ 841062 ] Alternative icons for PATCH [ 840273 ] (for hilight line diff)
 Submitted by Tim Gerundt
  WinMerge: Merge.rc
  res: Toolbar.bmp
  Languages: *.rc
  Languages/res: Toolbar.bmp

2003-11-14 Kimmo
 PATCH: [ 841767 ] Store unique item path
  Fixes bug: #840547 Copying unique file does not update date and size
  WinMerge: DirScan.cpp
 PATCH: [ 841889 ] Make long path in CConfigLog::WriteLogFile
  Submitted by Perry
  WinMerge: ConfigLog.cpp
 PATCH: [ 841039 ] Green "binary.bmp"?New binary item icons for dir compare)
  Submitted by Tim Gerundt
  WinMerge/res: binary.bmp binarydiff.bmp
  Languages/res: binary.bmp binarydiff.bmp

2003-11-14 Laoran 
 BUG: [ 838272 ] corrupt string operations in lwdisp.c
  common: lwdisp.c lwdisp.h

2003-11-13 Laoran 
 BUG: [ 841428 ] WinMerge executable path is deleted
  WinMerge: MainFrm.cpp PropRegistry.h

2003-11-13 Kimmo
 PATCH: [ 838084 ] Add * to newer file's date field in dir compare
  WinMerge: DirView.cpp DirViewColHandler.cpp
 BUG: [ 840785 ] Menu: Plugins | Automatic/Manual inconsistent
  WinMerge: MainFrm.cpp
 Code cleanup: use SetDiffCompare() and SetDiffSide()
  (I think those functions were designed to be used instead of SetDiffStatus())
  WinMerge: DirActions.cpp
 Don't update filedata multiple times + comment changes/updates
  (In journey to solve BUG: 840547 Copying unique file does not update date and size
  WinMerge: DirActions.cpp DirDoc.cpp DirView.cpp
 Removing one unneeded function + code cleanups + comment changes/updates
  (Hunting reason for BUG: 840547 Copying unique file does not update date and size)
  WinMerge: DiffContext.cpp DirDoc.h DirDoc.h 

2003-11-13 Laoran 
 modify the assert in GetText/GetTextWithoutEmptys (see patch #837480)
 submitted by Jochen
  WinMerge: GhostTextBuffer.cpp
  editlib: ccrystaltextbuffer.cpp
 Merging lwdisp.c with Jochen's changes (see patch #837480)
  common: lwdisp.c lwdisp.h Plugins.cpp
 PATCH: [ 838354 ] Revisit Speedup Speed up display of large differences
 submitted by Hern Chen (hern_chen)
  WinMerge: GhostTextBuffer.cpp MergeDoc.cpp
  editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h

2003-11-11 Laoran
 avoid double message "no line difference"
  WinMerge: MergeDoc.cpp
 PATCH: [ 838530 ] Simplify GhostTextBuffer for Undo
  WinMerge: GhostTextBuffer.cpp GhostTextBuffer.h MergeDoc.cpp MergeDoc.h
 PATCH: [ 839970 ] Moving from LoadFromFile to OpenDocs all view functions
  WinMerge: MergeDoc.cpp

2003-11-11 Kimmo
 PATCH: [ 838545 ] Fix osversion stuff in ConfigLog.cpp
  Submitted by Perry
  WinMerge: ConfigLog.cpp
  WinMerge new file: winnt_supp.h
 PATCH: [ 838898 ] Cleanup Registry -optionpage
  WinMerge: MainFrm.cpp Merge.rc PropRegistry.h PropRegistry.cpp
  Languages: *.rc

2003-11-11 Laoran
 PATCH: [ 839243 ] F4 should hilight diff in both files
  WinMerge: MergeDoc.cpp MergeDoc.h
 fix for syntax highlight in left pane view
  WinMerge: MergeDoc.cpp
 update global options dialog : 'Allow mixing EOL' -> 'preserve original EOL chars'
 update global options dialog : 'ignore EOL' like in 2.0 
  WinMerge: Merge.rc PropGeneral.cpp PropGeneral.h
  Languages : *.rc
 PATCH: [ 831308 ] File filter selection text "<None>" hardcoded
  WinMerge: FileTransform.h Merge.cpp Merge.rc PropFilter.cpp SelectUnpackerDlg.cpp
   resource.h
  Languages : resource.h

2003-11-09 Laoran
 PATCH: [ 838574 ] SplitterWndEx OnHScroll
  common: SplitterWndEx.cpp SplitterWndEx.h
 fixing text alignment in dialogs (right aligned on screen->RTEXT, centered->CTEXT)
  WinMerge: Merge.rc
  Languages : *.rc

2003-11-09 Kimmo
 PATCH: [ 835198 ] Command line path arguments handling
  Submitted by Hern Chen
  WinMerge: Merge.cpp Paths.h Paths.cpp

2003-11-09 Laoran
 comments for invoke helpers (see BUG[ 838275 ])
  WinMerge: Plugins.cpp
  common: lwdisp.h

2003-11-08 Perry
 PATCH: [ 838283 ] Simplify OnFileSave
  WinMerge: MergeDoc.cpp

2003-11-08 WinMerge experimental release 2.1.3.8 (patch demo)

2003-11-08 WinMerge experimental release 2.1.3.7 (cvs)

2003-11-08 Laoran
 BUG: [ 838248 ] possible typo in plugin code (cosmetic)
  WinMerge: Plugins.cpp

2003-11-07 Perry
 PATCH: [ 836931 ] Move QueryRegMachine into RegKey
  common: RegKey.cpp RegKey.h
  WinMerge: MainFrm.cpp VssPrompt.cpp

2003-11-07 Laoran
 BUG: [ 837980 ] bug in save right as
  WinMerge: MergeDoc.cpp

2003-11-07 Kimmo
 BUG: [ 837760 ] regression since 2.1.3.6 (diff array)
  WinMerge: MergeDoc.cpp
 PATCH: [ 836927 ] Improved platform detection in ConfigLog
  Submitted by Perry
  WinMerge: ConfigLog.cpp

2003-11-07 Perry
 Updated Catalan translation (from Jordi Vilar, the translation author)
  Languages: Catalan/MergeCatalan.rc

2003-11-06 Laoran
 [ 836870 ] Scrollbar "bounces back" in diff pane.
  editlib: ccrystaltextview.cpp

2003-11-06 Kimmo
 BUG: [ 836781 ] File not found: notepad.exe
  WinMerge: MainFrm.cpp
 PATCH: [ 836714 ] Separate counts of normal and trivial diffs
  WinMerge: MergeDoc.h MergeDoc.cpp
 Backout PATCH: [ 834230 ] Use PostMessage() to update dir compare status
  It caused bug [ 837366 ] Dir compare status panel not drawn correctly
  WinMerge: DiffContext.cpp

2003-11-06 Laoran
 BUG: [ 836868 ] Search and replace field size limited
  WinMerge : Merge.rc
 BUG: [ 836384 ] File extension wildcards does not work. 
  WinMerge: OpenDlg.cpp

2003-11-05 Perry
 Typofix: "Wiew Whitespaces" -> "View Whitespace"
  WinMerge: ConfigLog.cpp
 Update language count mentioned in readme-developers.html
  Docs: readme-developers.html

2003-11-05 Kimmo
 BUG: [ 829435 ] Fix character classification routines for UNICODE
  common: RegExp.cpp

2003-11-05 Perry
 Added doxygen config file. (Subsequently fixed cvs log messages.)
  Docs: doxygen.cfg

2003-11-05 Kimmo
 BUG: [ 829435 ] Fix character classification routines for UNICODE
  WinMerge: paths.cpp stdafx.cpp
  editlib: cregexp.cpp

2003-11-05 WinMerge experimental release 2.1.3.6 (cvs)

2003-11-05 Laoran
 change directory name 'Plugins' to 'MergePlugins' (see BUG [ 832090 ])
  WinMerge: Plugins.cpp

2003-11-05 Perry
 deleted unused function files_loadLines per Laurent's suggestion 
  (in PATCH: [ 826250 ] New UniMemFile class for memory-mapping)
 WinMerge: files.cpp files.h

2003-11-04 Perry
 PATCH: [ 836186 ] Unicode fix for lwdisp.co
  common: lwdisp.c

2003-11-05 Laoran
 PATCH: [ 831384 ] dir comparison : state bar & stop button
  WinMerge: DiffContext.cpp DiffContext.h DiffThread.cpp DirDoc.cpp DirFrame.cpp DirFrame.h
   MainFrm.cpp MainFrm.h Merge.dsp Merge.rc resource.h
  WinMerge(addition): DirCompStateBar.cpp DirCompStateBar.h
  Languages : *.rc and resource.h
 
2003-11-04 Laoran
 adapt plugins filters to the syntax of regular expressions
  Plugins\dlls: RCLocalizationHelper.dll
  Plugins\src\HideFirstLetter: WinMergeScript.cpp
  Plugins\src\HideLastLetter: WinMergeScript.cls
  Plugins\src\IgnoreTwoFirstCharsOrder: WinMergeScript.cls
  Plugins\src\RCLocalizationHelper: WinMergeScript.cpp
 fix to test plugin filter with left & right filenames (instead of just right one)
  WinMerge: Plugins.cpp
 PATCH: [ 833961 ] Swedish translation 2.1
 Submitted by Göran Hĺkansson
  Languages: BuildAll.bat
  Languages\Swedish: MergeSwedish.rc MergeSwedish_LastTranslation.rc resource.h
  Languages\Swedish\res : all files

2003-11-04 Kimmo
 PATCH: [ 831052 ] Write version and configuration info
  WinMerge: MainFrm.h MainFrm.cpp Merge.dsp Merge.rc resource.h
  WinMerge new files: ConfigLog.h ConfigLog.cpp
  Languages: *.rc resource.h
 PATCH: [ 835220 ] Update default colors
  WinMerge: Merge.cpp

2003-11-03 Laoran
 PATCH: [ 834122 ] Add Error Handling around calls to plug-ins
  WinMerge: Merge.rc MergeDoc.cpp Plugins.cpp Plugins.h files.h resource.h
  common: lwdisp.c lwdisp.h
 PATCH: [ 833188 ] clever and explicit error report in TypeLib
  common: lwdisp.c

2003-11-03 Kimmo
 PATCH: [ 834526 ] Check that file exist before executing in ShellExtension
  ShellExtension: ShellExtension.dsp WinMergeShell.h WinMergeShell.cpp

2003-11-02 Kimmo
 BUG: (part of) [ 829435 ] Fix character classification routines for UNICODE
  WinMerge: MainFrm.cpp MergeDoc.cpp Paths.h Paths.cpp
 PATCH: [ 834230 ] Use PostMessage() to update dir compare status
  WinMerge: DiffContext.cpp

2003-11-02 Laoran
 Creation of directory Docs
  WinMerge(moved to Docs): readme-developers.html readme-developers-MakePatchDirs.html
 BUG: [ 834490 ] Ignore blank lines disabled when ignore EOL
  WinMerge: UTIL.C

2003-11-01 Kimmo
 BUG: [ 833096 ] Left/right-only status overwrites skipped-status
  WinMerge: DirViewColItems.cpp
 Fix signed/unsigned clashes
  WinMerge: MergeDiffDetailView.cpp MergeDoc.cpp MergeEditView.cpp
  editlib: ccrystaltextview.cpp

2003-10-31 Kimmo
 Remove whitespaces from begin and end of ShellExtension.dll path
  WinMerge: PropRegistry.cpp
 PATCH: [ 833681 ] Fix default editor for external editor
  WinMerge: MainFrm.h MainFrm.cpp
 Change action.code type to match DIFFITEM.code
  WinMerge: DirView.h
 Removing unused variables
  WinMerge: DiffWrapper.cpp DirActions.cpp DirDoc.cpp DirScan.cpp
   DirViewColHandler.cpp MainFrm.cpp Merge.cpp MergeDoc.cpp
 BUG: [ 830258 ] Problem compiling with visual .net C++
  Submitted with fixes by Steve Beaudoin
  common: UniFile.h
  WinMerge: ChildFrm.cpp files.cpp

2003-10-31 Laoran
 fix Plugins PACK_UNPACK when nothing changes (+ update functions name)
  WinMerge: FileTransform.cpp Plugins.cpp Plugins.h

2003-10-30 Laoran
 BUG: [ 830911 ] trailing whitespaces not ignored
  WinMerge: UTIL.C
 PATCH: [ 830132 ] open empty file
  common: UniFile.cpp
  WinMerge: MergeDoc.cpp files.cpp

2003-10-30 Kimmo
 Remove SillyTestCrap() from Merge.cpp
  WinMerge: Merge.cpp
 Compare filename extensions as lowercase (before calling external editor)
  WinMerge: MainFrm.cpp
 Comment out GetIP() to fix compiling by including coretools.h
  common: coretools.h coretools.cpp

2003-10-29 Laoran
 change events PHYSICAL_PREPROCESS and SYNTAX_PREPROCESS to PREDIFFING
  WinMerge: FileTransform.cpp FileTransform.h Plugins.cpp Plugins.h

2003-10-28 Kimmo
 PATCH: [ 830553 ] Finetune scroll to diff
  WinMerge: MergeEditView.h MergeEditView.cpp

2003-10-27 Laoran
 BUG: [ 830917 ] Rescan effects when validate changes in options
  WinMerge: MainFrm.cpp

2003-10-26 Laoran
 PATCH: [ 827332 ] detach buffer during load and rescan
  WinMerge: GhostTextView.cpp GhostTextView.h MergeDiffDetailView.cpp MergeDiffDetailView.h
   MergeDoc.cpp MergeEditView.cpp MergeEditView.h
  editlib: ccrystaltextview.cpp ccrystaltextview.h
 PATCH: [ 829895 ] Fixed German translation
 Submitted by Tim Gerundt
  Languages: MergeGerman.rc

2003-10-26 Kimmo
 PATCH: [ 829570 ] Open patches after creation
  WinMerge: DirActions.cpp MainFrm.h MainFrm.cpp Merge.rc PatchDlg.c
   PatchDlg.cpp PatchTool.h PatchTool.cpp resource.h
  Languages: *.rc resource.h

2003-10-25 Laoran
 BUG: [ 830121 ] drag&drop changes ghost lines to real lines
  WinMerge: GhostTextView.cpp GhostTextView.h
 fix for context menu when the selection is empty
  WinMerge: MergeEditView.cpp
 fix in PopCursors for ptLastChange
  WinMerge: GhostTextView.cpp
 BUG: [ 830076 ] Context menu plugins change ghost lines to real lines
  WinMerge: GhostTextView.cpp GhostTextView.h MergeEditView.cpp
 BUG: [ 830072 ] "Unload script" does not work
  WinMerge: FileTransform.cpp MergeEditView.cpp

2003-10-25 Perry
 Fix spelling of "delimiter" in comments.
  WinMerge: MainFrm.cpp

2003-10-25 WinMerge experimental release 2.1.3.5 (cvs)

2003-10-25 Perry
 PATCH: [ 828633 ] Abort running scan
  WinMerge: DiffThread.cpp DiffThread.h DirDoc.cpp DirDoc.h
   DirScan.cpp DirScan.h
 PATCH: [ 823924 ] Update about box and copyright year
  WinMerge: Merge.rc

2003-10-24 Perry
 PATCH: [ 814832 ] Timing traces for loading file
  WinMerge: MergeDoc.cpp
 Add byte counts, and remove doubled line returns for load timing traces.
  WinMerge: MergeDoc.cpp
  common: UniMemFile.h
 PATCH: [ 826584 ] User-specified codepage conversions
  WinMerge: DiffContext.h DirView.cpp MainFrm.cpp MainFrm.h
   MergeDoc.cpp MergeDoc.h

2003-10-24 Kimmo
 PATCH: [ 828283 ] Open Read-only files as such
  WinMerge: DirView.cpp files.h files.cpp MainFrm.cpp

2003-10-24 Perry
 BUG: [ 829437 ] Can't compare two files with unicode filenames
  WinMerge: Diff.cpp
 Fix typo & mistake, both in comments.
  common: SuperComboBox.cpp
  WinMerge: DirScan.cpp

2003-10-24 Laoran
 PATCH: [ 829266 ] commandline help
  WinMerge: Merge.cpp Merge.rc resource.h
  Languages: *.rc resource.h
 enabling filters in unicode build
  WinMerge: Dirdoc.cpp
 BUG: [ 829453 ] dropping file in a SuperComboBox, Unicode build
  common: SuperComboBox.cpp
 Fix unifile code to initialize txtstats.nlosses (see comments in BUG [ 828924 ])
  common: UniFile.h

2003-10-23 Perry
 PATCH: [ 828619 ] Prevent closing dir doc whilst scanning
  WinMerge: DirDoc.cpp DirDoc.h
 PATCH: [ 829306 ] Fix unifile code to append last line
  WinMerge: MergeDoc.cpp
 Handle lib & includes for MakeResDll (& rearrange globals). 
 Bump version from 1.0.1.0 to 1.0.2.0.
  MakeResDll: MakeResDll.cpp MakeResDll.rc readme.txt
 Handle lib & includes for .NET and .NET 2003 in MakeResDll.
 Fix location of RegKey.h in MakeResDll.
  MakeResDll: MakeResDll.cpp MakeResDll.dsp readme.txt
 BUG: [ 827996 ] isspace uses (-> _istspace)
  WinMerge: MergeDoc.cpp
  WinMerge\editlib:
   asp.cpp basic.cpp batch.cpp ccrystaleditview.cpp ccrystaltextview2.cpp
   cplusplus.cpp dcl.cpp fortran.cpp html.cpp is.cpp java.cpp lisp.cpp
   pascal.cpp perl.cpp php.cpp python.cpp rexx.cpp rsrc.cpp sgml.cpp
   sh.cpp siod.cpp sql.cpp tcl.cpp tex.cpp

2003-10-23 Kimmo
 BUG: [ 815147 ] Scrollwheel scrolls too far at end of file
  editlib: ccrystaltextview.cpp
 BUG: [ 826834 ] Text selection startpoint not updated when navigating diffs
  WinMerge: MergeEditView.cpp

2003-10-23 Laoran
 PATCH: [ 827615 ] Speed up display of large differences - attachment
  Submitted by Hern Chen
  WinMerge: GhostTextBuffer.cpp MergeDoc.cpp MergeDoc.h
  editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h
 BUG: [ 828802 ] plugins interface problem
  WinMerge: Plugins.cpp
 recovering Czech and Slovak custom characters (they were changed to '?')
  Languages: Czech.rc Slovak.rc

2003-10-23 Perry
 PATCH: [ 826250 ] New UniMemFile class for memory-mapping
  WinMerge: Merge.dsp MergeDoc.cpp
  common: unicoder.cpp unicoder.h UniFile.cpp UniFile.h

2003-10-22 Perry
 Fix compile for MakeResDll
  common: coretools.cpp
 Ran "cvs admin -kb *.bmp *.ico" to fix incorrectly typed resources
  Languages: Czech/res Dutch/res French/res German/res 
   Italian/res Spanish/res
 Fix MakeResDll for MSVC.NET & MSVC.NET 2003.
 Bump MakeResDll version from 1.0.0.1 to 1.0.1.0.
  MakeResDll: MakeResDll.cpp MakeResDll.rc
 Add readme.txt to MakeResDll.
  MakeResDll: MakeResDll.dsp readme.txt
 Fix MakeResDll to not create keys not found.
  MakeResDll: MakeResDll.cpp

2003-10-22 WinMerge experimental release 2.1.3.4 (cvs)

2003-10-22 Kimmo
 BUG: [ 826969 ] Wrong Open-dialog icon
  Load WinMerge icon to Open-dialog too
  WinMerge: OpenDlg.cpp

2003-10-21 Perry
 Make icons and bitmaps in WinMerge\res directory cvs file type binary (cvs admin -kb)
 WinMerge: res\*.bmp res\*.ico

2003-10-21 Laoran
 BUG: [ 827064 ] Move "Window" menu after "Plugins" menu
  WinMerge : Merge.rc
  Languages: *.rc 
 Add a backslash in front of relative path used to test for filter (as in 2.0)
 Undo the previous change (it disturbed the display) and make a new one
  WinMerge: DirScan.cpp DirDoc.cpp
 PATCH: [ 826048 ] headerbar improvements
  WinMerge: ChildFrm.cpp ChildFrm.h DirDoc.cpp DirDoc.h DirFrame.cpp DirFrame.h EditorFilepathBar.cpp
   EditorFilepathBar.h FilepathEdit.cpp FilepathEdit.h MergeDoc.cpp MergeDoc.h MergeEditView.cpp

2003-10-21 Kimmo
 PATCH: [ 826149 ] Improved "Merge.ico" and "MergeDoc.ico"
  From Tim Gerundt
  WinMerge/res: Merge.ico MergeDoc.ico
  All Languages/res: Merge.ico MergeDoc.ico
 PATCH: [ 824987 ] Change binary-file detection (look only for zeros)
  WinMerge: files.cpp

2003-10-20 Kimmo
 BUG: [ 826645 ] Scrolling to diff does not move cursor to diff
  WinMerge: MergeEditView.cpp
 Fix Patch Generate dialog's comboboxes to really change files
  WinMerge: PatchDlg.h PatchDlg.cpp
 PATCH: [ 809320 ] Open files with external editor
  WinMerge: DirActions.cpp DirView.h DirView.cpp MainFrm.h MainFrm.cpp
   Merge.rc PropRegistry.h PropRegistry.cpp resource.h
  Languages: *.rc resource.h

2003-10-20 Laoran
 Changing unidiff.cpp for DiffThread.cpp as doxygen example
  WinMerge: readme-developers.html 
 'Comparison Summary' not updated after saving (lost in plugin patch)
  WinMerge: MergeDoc.cpp
 Format for (eol type) must set the asterisk (sign for modified file)
  WinMerge: MergeEditView.cpp

2003-10-20 WinMerge experimental release 2.1.3.3 (patch demo)

2003-10-20 Laoran
 BUG: [ 826233 ] plugins or unicode bug
  WinMerge: UnicodeUtf8.cpp

2003-10-19 Perry
 Add writeup for MakePatchDirs to readme-developers info. Add section on 
  minor patches and bugfixes. Also make minor grammar fixes. Also update 
 language count (to 14).
  WinMerge: readme-developers.html readme-developers-MakePatchDirs.html

2003-10-19 Laoran
 Rearranging strings in .rc (all languages) by growing identifier values
  Languages : *.rc
  WinMerge: Merge.rc
 Rearranging strings in English .rc
  WinMerge: Merge.rc

2003-10-19 Perry
 Added Catalan translation (pre-plugin version)
  Languages: BuildAll.bat Catalan/*
 Update Catalan.rc for plugins (without stringtable rearrangement)
  Languages: Catalan/MergeCatalan.rc resource.h
 {Catalan} PATCH: [ 819188 ] Show column number in statusbar
  Languages: Catalan/MergeCatalan.rc
 PATCH: [ 818427 ] Fix hashing for mac lines and "ignore EOLs"
  WinMerge: IO.C MergeDoc.cpp UTIL.C
 Reapply PATCH: [ 818865 ] Exponentially grow text line array
  I lost it applying PATCH: [ 820364 ] Fix handling of non-ASCII 8-bit files
  from files.cpp cvs version 1.13 to 1.14.
  WinMerge: files.cpp
 PATCH: [ 822451 ] unicoder.cpp update
  common: unicoder.cpp unicoder.h

2003-10-18 Laoran
 Add a backslash in front of relative path used to test for filter (as in 2.0)
  WinMerge: DirScan.cpp

2003-10-17 Christian
 New readme-developers.html added
 PATCH: [ 825035 ] Updated German translation
  Languages: MergeGerman.rc

2003-10-17 WinMerge experimental release 2.1.3.1 (cvs)

2003-10-17 Kimmo
 RFE: [ 784695 ] Smarter scroll to diff
  WinMerge: MergeEditView.cpp

2003-10-17 Laoran
 fix for unicode conversion in unicode build
  WinMerge: UnicodeUtf8.cpp
 fix to delete useless temporary files
  WinMerge: FileTransform.cpp
 PATCH: [ 807263 ] Preprocessing patch
  common: dllproxy.c dllproxy.h lwdisp.c lwdisp.h
  Languages: resource.h *.rc
  WinMerge: DiffThread.cpp DiffWrapper.cpp DiffWrapper.h DirScan.cpp DirView.cpp DirView.h FileFilterMgr.cpp
   FileFilterMgr.h MainFrm.cpp MainFrm.h Merge.cpp Merge.dsp Merge.h Merge.rc MergeDoc.cpp MergeDoc.h
   MergeEditView.cpp OpenDlg.cpp OpenDlg.h resource.h
  WinMerge Add: FileTransform.cpp FileTransform.h Plugins.cpp Plugins.h SelectUnpackerDlg.cpp 
   SelectUnpackerDlg.h UnicodeUtf8.cpp UnicodeUtf8.h
  WinMerge Remove: unidiff.cpp unidiff.h
 PATCH: [ 823556 ] CF_UNICODETEXT format for OLE in unicode build
  WinMerge: FilepathEdit.cpp StdAfx.cpp StdAfx.h 
  editlib: ccrystaleditview.cpp ccrystaltextview2.cpp
 PATCH: [ 823074 ] DiffContext not updated
  WinMerge: DirDoc.cpp

2003-10-16 Kimmo
 Get first selected file from directory compare to
  Patch Generate dialog
  WinMerge: MainFrm.cpp
 BUG: [ 813557 ] Selection not visible after find
  editlib: cfindtextdlg.cpp
 Fix bug: Commandline params for diff were missing from
  generated patch-file in unicode build. (Missing conversion)
  WinMerge: DiffWrapper.cpp

2003-10-15 Kimmo
 PATCH: [ 823382 ] Save As should update filename
  WinMerge: MergeDoc.h MergeDoc.cpp
 BUG: [ 823099 ] RO status not fully implemented when lossy conversions
  WinMerge: ChildFrm.cpp
 Removed unneeded unlocalisable string from SelectFile() ("Directory selection")
  WinMerge: Merge.cpp
 Use SelectFile() from Merge.cpp in Patch Generate dialog
  also fixes bug Result-file asked with "Open" dialog
  WinMerge: PatchDlg.h PatchDlg.cpp
 Use ComboBox with history in Patch Generate -dialog
  WinMerge: Merge.rc PatchDlg.h PatchDlg.cpp
  Languages: *.rc
 Fix bug: File timestamps wrong in patch files
  WinMerge: DiffWrapper.cpp

2003-10-14 Laoran
 PATCH: [ 819123 ] Half-wait cursor during rescan (new try)
  WinMerge: DirDoc.cpp DirDoc.h MainFrm.cpp MainFrm.h WaitStatusCursor.cpp WaitStatusCursor.h
 BUG: correcting memory allocation for Unicode build in FilepathEdit.cpp
  editlib: FilepathEdit.cpp
 BUG: [ 822844 ] Drag & Drop crashes on Unicode build (correcting memory allocation)
  editlib: ccrystaltextview.cpp

2003-10-13 Laoran
 PATCH: [ 821821 ] Merge multiple diffs 
  WinMerge: Merge.rc MergeDoc.cpp MergeDoc.h MergeEditView.cpp MergeEditView.h resource.h
  editlib: ccrystaltextview.cpp ccrystaltextview.h

2003-10-13 Kimmo
 PATCH: [ 797502 ] Bugfix and new options for SourceSafe
  Submitted by Marvin Gouw
  WinMerge: DirActions.cpp MainFrm.h MainFrm.cpp Merge.rc resource.h
   VssPrompt.h VssPrompt.cpp
  Languages: resource.h *.rc

2003-10-12 Kimmo
 PATCH: [ 817079 ] New Copy to Left/Right icons
  WinMerge/res: Toolbar.bmp
  Languages/res: Toolbar.bmp

2003-10-11 WinMerge experimental release 2.1.3.0 (cvs)

2003-10-11 Perry
 PATCH: [ 821532 ] Fix CmpResults After Delete
  WinMerge: DiffContext.h DirActions.cpp
 PATCH: [ 817875 ] Resizable open dialog
  common: CSubclass.h CMoveConstraint.h CSubclass.cpp CMoveConstraint.cpp
  Languages: UpdateAll_resource_h.bat *.rc
  WinMerge: Merge.rc OpenDlg.cpp OpenDlg.h resource.h

2003-10-11 Laoran
 PATCH: [ 820742 ] use extension filter during Rescan in 2.1
  DiffContext.cpp DiffContext.h DirDoc.cpp DirDoc.h DirScan.cpp MainFrm.cpp

2003-10-10 Perry
 PATCH: [ 791487 ] Norwegian (bokmĺl) translation
 (Enlarge label in color dialog to avoid clipping text.)
  Languages: MergeNorwegian.rc
 PATCH: [ 820364 ] Fix handling of non-ASCII 8-bit files
  common: unicoder.cpp unicoder.h
  WinMerge: files.cpp
 PATCH: [ 821431 ] Update SideFlag When Copy file
  WinMerge: DirActions.cpp

2003-10-10 Laoran
 cosmetic change because I want to use BeSweet with source (delete one space !)
  editlib: ccrystaleditview.cpp
 PATCH: [ 818198 ] Colors for "ignore blank lines"
  Languages: *.rc (except not Brazilian or ChineseSimplified)

2003-10-09 Perry
 PATCH: [ 818865 ] Exponentially grow text line array
  WinMerge: files.cpp

2003-10-09 Laoran
 PATCH: [ 819219 ] Show only simple EOL char when no mixing EOL modes allowed
  WinMerge: MainFrm.cpp MainFrm.h MergeDoc.cpp ccrystaltextview.cpp ccrystaltextview.h

2003-10-09 Perry
 Fix duplicate copy of IDS_LINE_STATUS_INFO (to IDS_LINE_STATUS_INFO_EOL) in most
  language files. Fix missing id ID_POPUP_COPYFROMOTHERSIDE in German file
  Languages: *.rc (except not Brazilian or ChineseSimplified)

2003-10-08 Laoran
 BUG: [ 819793 ] Assert when saving after a Dirdoc session
  WinMerge: DirDoc.cpp
 PATCH: [ 818198 ] Colors for "ignore blank lines"
  WinMerge: MainFrm.cpp Merge.cpp Merge.h Merge.rc MergeDoc.cpp MergeEditView.cpp PropColors.cpp 
   PropColors.h resource.h

2003-10-08 Kimmo
 PATCH: [ 819188 ] Show column number in statusbar
  WinMerge: ChildFrm.h ChildFrm.cpp Merge.rc MergeEditStatus.h MergeEditView.cpp
  Languages: *.rc

2003-10-07 Perry
 PATCH: [ 817502 ] Fix "ignore blank lines"
  WinMerge: analyze.c Diff.cpp DIFF.H DiffWrapper.cpp DiffWrapper.h
   MergeDiffDetailView.cpp MergeDoc.cpp MergeEditView.cpp MergeEditView.h
   UTIL.C
 PATCH: [ 806277 ] Patch output fix (803299) alternate approach
  WinMerge: UTIL.C
 PATCH: 819633	Fix bug in my "fix ignore blank lines" patch
  WinMerge: analyze.c

2003-10-07 Kimmo
 BUG: [ 803330 ] DirView updated too many times after compare
  WinMerge: DiffThread.cpp DirDoc.h DirDoc.cpp
 RFE: [ 817859 ] Generate patch from modified files
  WinMerge: MainFrm.cpp
 Fix Refresh-crash I introduced when fixing BUG [ 803330 ]
  WinMerge: DirDoc.cpp
 Properly clear display before new dir compare (don't use Redisplay())
  WinMerge: DirDoc.cpp

2003-10-05 Kimmo
 Show text "Identical" on diffnumber panel when files are identical

2003-10-05 Laoran
 BUG: [ 817766 ] Dir compare speed drop after 2.0
  WinMerge: DiffContext.cpp

2003-10-05 Kimmo
 PATCH: [ 817269 ] Fix navigation in directory compare
  WinMerge: DirView.cpp
 PATCH: [ 817394 ] Implement Copy diff and advance to next
  WinMerge: Merge.rc MergeEditView.h MergeEditView.cpp resource.h
  WinMerge/res: Toolbar.bmp
  Languages: resource.h *.rc
  Languages/res: Toolbar.bmp

2003-10-04 Perry
 Update dll copy batch file for 4 new build targets
 Languages/CopyAll.bat

2003-10-04 Laoran
 Undo last changes related to PATCH: [ 813794 ] Fix "ignore blank lines"
 Back as of 2003-10-02 23:59

2003-10-04 Perry
 Restore trivial colors originally included in PATCH: [ 813794 ] Fix "ignore blank lines"
  WinMerge: MainFrm.cpp Merge.h MergeEditView.cpp PropColors.h

2003-10-03 Perry
 Bugfix for PATCH: [ 813794 ] Fix "ignore blank lines"
 (Prevent crashes on identical files dereferencing null script).
  WinMerge: analyze.c

2003-10-03 Laoran
 two minor changes for PATCH: [ 813794 ] Fix "ignore blank lines"
  WinMerge: MergeDiffDetailView.cpp MergeDoc.cpp

2003-10-03 Perry
 PATCH: [ 813794 ] Fix "ignore blank lines"
  WinMerge: analyze.c ColorButton.h Diff.cpp DIFF.H DiffWrapper.cpp 
   DiffWrapper.h MainFrm.cpp Merge.cpp Merge.h MergeDiffDetailView.cpp
   MergeDoc.cpp MergeEditView.cpp MergeEditView.h PropColors.cpp
   PropColors.h

2003-10-02 Kimmo
 PATCH: [ 815138 ] Commandline filedescriptors
  Usage: -dl "description" for left and -dr "description" for right
  WinMerge: MainFrm.h Merge.h Merge.cpp MergeDoc.cpp

2003-10-02 Perry
 PATCH: [ 815483 ] Fix file stat structure (lost in dirscan patch)
  WinMerge: Diff.cpp DirScan.cpp
 PATCH: [ 815523 ] Fix utf8len_of_string
  common: unicoder.cpp

2003-09-30 Perry
 PATCH: [ 814829 ] Fix handle bad utf8
  WinMerge: files.cpp
 PATCH: [ 813847 ] Fix Unicode double copy
  WinMerge: MergeDoc.cpp

2003-09-30 Kimmo
 PATCH: [ 814830 ] Prevent rescan of scanning dirdoc
  Submitted by Perry
  WinMerge: DirDoc.cpp
 PATCH: [ 812581 ] Prevent second scan during first scan
  Submitted by Perry
  WinMerge: MainFrm.cpp

2003-09-29 Kimmo
 PATCH: [ 814098 ] More edit-events for delayed rescan
  WinMerge: MergeEditView.cpp

2003-09-29 Laoran
 BUG In DrawSingleLine, Draw EOL only if there is an EOL in the line
  WinMerge: ccrystaltextview.cpp ccrystaltextview.h
 BUG [ 814214 ] ASSERT failure with diff at eof
  WinMerge: files.cpp

2003-09-27 Laoran
 delete NDEBUG from ReleaseMinsize preprocessor definitions
  WinMerge: Merge.dsp

2003-09-27 Perry
 PATCH: [ 809149 ] Handle Unicode files
  common: unicoder.cpp unicoder.h
  WinMerge: DiffContext.cpp DiffContext.h DirScan.cpp FileFilterMgr.cpp files.cpp
   files.h GhostTextBuffer.cpp GhostTextBuffer.cpp.bak GhostTextBuffer.h Merge.dsp
   MergeDoc.cpp MergeDoc.h unidiff.cpp unidiff.h
  WinMerge/editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h ccrystaltextview2.cpp

2003-09-26 Perry
 PATCH: [ 811039 ] Identify filters by path to solve problems with reused names
  common: coretools.cpp coretools.h
  WinMerge: FileFilterMgr.cpp FileFilterMgr.h MainFrm.cpp Merge.cpp Merge.h
   PropFilter.cpp PropFilter.h

2003-09-26 WinMerge beta 2.1.2.0 released

2003-09-26 WinMerge experimental release 2.1.1.9 (Unicode handling patch)

2003-09-26 Perry
 PATCH: [ 812820 ] Fix regexp for Unicode
  common: RegExp.cpp RegExp.h
 PATCH: [ 812851 ] Another Unicode fix for PutToClipboard
  WinMerge/editlib/ccrystaltextview2.cpp
 Fix GetFromClipboard for Unicode (variation on PATCH: [ 812853 ])
  WinMerge/editlib/ccrystaltextview2.cpp

2003-09-26 Laoran
 PATCH: [ 811371 ] Replace lines when pasting text to ghost lines
  WinMerge: GhostTextBuffer.cpp GhostTextBuffer.h
  editlib: ccrystaltextbuffer.cpp

2003-09-25 Perry
 fix BUG: [ 812547 ] copy to clipboard crash in WinMergeU.exe
  WinMerge/editlib: ccrystaltextview2.cpp

2003-09-25 Kimmo
 PATCH: [ 811307 ] Open dirview column dialog from menu
  WinMerge: DirView.h DirView.cpp Merge.rc resource.h
  Languages: resource.h *.rc

2003-09-24 Perry
 fix BUG: [ 811750 ] typo in DirScan.cpp
  WinMerge: DirScan.cpp
 fix BUG: [ 811747 ] VersionInfo clipping in Unicode ?
  common: version.cpp

2003-09-24 Kimmo
 BUG: [ 811748 ] Brazilian RC compile failure
  Languages/Brasilian: MergeBrasilian.rc
 Patch Generate improvements and fixes
  WinMerge: DiffWrapper.cpp PatchDlg.h PatchDlg.cpp PatchTool.h
   PatchTool.cpp

2003-09-23 Kimmo
 Don't show [0 files selected] in Patch Generate -dialog
  WinMerge: PatchDlg.cpp

2003-09-23 Perry
 PATCH: [ 810998 ] Unicode fix for ghosttextbuffer
  WinMerge: GhostTextBuffer.cpp

2003-09-22 Kimmo
 PATCH: [ 809902 ] Show if file is changed
  WinMerge: MergeDoc.h MergeDoc.cpp MergeEditView.cpp
 PATCH: [ 810066 ] Add Save Left (as...) and Save Right (as...)
  WinMerge: Merge.rc MergeDoc.h MergeDoc.cpp MergeEditView.h
   MergeEditView.cpp resource.h
  Languages: resource.h *.rc

2003-09-21 Kimmo
 BUG: [ 807766 ] File filter rules not applied to unique items (2.1)
  WinMerge: DirScan.cpp
 Optimise CFilePathEdit to not change text when same text given again
  By Laoran (PATCH "#809902 Show if file is changed" comments)
  WinMerge: FilePathEdit.cpp
 Remove unused function GetPathOnly() from DirDoc.cpp -
  its really defined in coretools.cpp and
  WinMerge: DirDoc.cpp

2003-09-20 WinMerge experimental release 2.1.1.7 (Unicode handling patch)

2003-09-20 Kimmo
 Make directory compare Window to remember maximized state
  WinMerge: DirFrame.h DirFrame.cpp

2003-09-20 Laoran
 Actualizing the GnuC filter *.o -> \.o
  filter: Merge_GnuC_loose.flt

2003-09-19 Laoran
 PATCH: [ 809253 ] New release minsize mode
  WinMerge: Merge.dsp
 Modifications in patch-dialog to compile in Unicode
  WinMerge: PatchDlg.cpp 

2003-09-19 Kimmo
 Select compared files when opening Generate patch-dialog
  WinMerge: MainFrm.cpp PatchDlg.cpp 

2003-09-18 Kimmo
 PATCH: [ 803904 ] Create patches
  WinMerge: DiffWrapper.h DiffWrapper.cpp MainFrm.h MainFrm.cpp Merge.dsp
   Merge.rc resource.h util.cpp
  WinMerge new files: PatchDlg.h PatchDlg.cpp PatchTool.h PatchTool.cpp
  Languages: *.rc resource.h
 BUG: [ 800256 ] Hilight line diff does not scroll to difference
  WinMerge: MergeDoc.cpp

2003-09-17 WinMerge experimental release 2.1.1.6 (Preprocessing patch)

2003-09-16 Perry
 fix BUG: [ 807420 ] assert when saving a modified doc
  WinMerge: DiffContext.cpp

2003-09-16 Laoran
 BUG: [ 807402 ] ListCopy problem for Unix Files
  WinMerge: MergeDoc.cpp

2003-09-16 Kimmo
 PATCH: [ 781013 ] 256 Color icon
  Applying to languages
  Languages/res: Merge.ico
 PATCH: [ 806785 ] Add menuitem to show/hide skipped files
  WinMerge: MainFrm.h MainFrm.cpp Merge.rc resource.h
  Languages: *.rc resource.h

2003-09-15 Kimmo
 BUG: [ 806552 ] DirView icons missing?
  Adding icons for skipped files and folders
  WinMerge: DirView.cpp Merge.rc resource.h
  WinMerge/res: new files fileskip.bmp folderskip.bmp
  Languages: resource.h *.rc new files /res fileskip.bmp folderskip.bmp
 Don't color skipped items filenames in directory compare
  WinMerge: DirView.cpp
 PATCH: [ 804493 ] Read filter files from users profile directory
  NOTE: Filters are read from %profiledir%/Application Data/WinMerge/Filters
  common: coretools.h coretools.cpp
  WinMerge: FileFilterMgr.cpp Merge.cpp

2003-09-14 Perry
 PATCH: [ 805875 ] Switch to diffcode flags
  WinMerge: DiffContext.cpp DiffContext.h DirActions.cpp DirDoc.cpp DirDoc.h
   DirScan.cpp DirView.cpp DirView.h DirViewColHandler.cpp DirViewColItems.cpp
   MainFrm.cpp MainFrm.h
 PATCH: [ 805427 ] Delete unused CStdioFile variable in PrimeTextBuffers
  WinMerge: MergeDoc.cpp
 PATCH: [ 805888 ] Unicode compile of WinMerge
  common: coretools.cpp dllproxy.c LanguageSelect.cpp LanguageSelect.h
   LogFile.cpp lwdisp.c lwdisp.h RegExp.cpp RegExp.h StatLink.cpp
   SuperComboBox.cpp SuperComboBox.h
  WinMerge: ChildFrm.cpp Diff.cpp DiffWrapper.cpp DirDoc.cpp DIRENT.C DirFrame.cpp
   DirView.cpp DirViewColHandler.cpp EditorFilepathBar.cpp FilepathEdit.cpp
   MainFrm.cpp MainFrm.h Merge.cpp Merge.dsp MergeDoc.cpp MergeEditView.cpp
   OpenDlg.cpp paths.cpp PropColors.cpp

2003-09-13 Perry
 Widen label IDC_PRIVATEBUILD on about box.
  WinMerge: Merge.rc
  Languages: *.rc
 PATCH: [ 802120 ] Fix for VC.NET
  WinMerge: DiffContext.cpp DiffContext.h DirScan.cpp DirView.cpp
   DirView.h DirViewColItems.cpp EditorFilepathBar.cpp MainFrm.cpp 
   MainFrm.h MergeEditView.cpp
  editlib: ccrystaleditview.cpp ccrystaleditview.h

2003-09-13 WinMerge experimental release 2.1.1.5 (patch demos)
2003-09-13 WinMerge experimental release 2.1.1.4 (cvs)

2003-09-13 Laoran
 effects of patch [ 797821 ]
  WinMerge: Merge.rc resource.h 
  Languages: resource.h *.rc

2003-09-11 Laoran
 PATCH: [ 804408 ] Fixes to help compile release version
  WinMerge: Merge.dsp 
 PATCH: [ 797821 ] GUI for the file EOL option
  WinMerge: ChildFrm.cpp GhostTextBuffer.cpp MainFrm.cpp MainFrm.h Merge.rc MergeDoc.cpp 
   MergeDoc.h MergeEditView.cpp MergeEditView.h PropGeneral.cpp PropGeneral.h resource.h
  editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h

2003-09-10 Kimmo
 PATCH: [ 802762 ] Optimise printc() in diffutils
  WinMerge: cmp.c

2003-09-09 Laoran
 FIX ASSERT in GetAllViews during a merge session
  WinMerge: MainFrm.cpp MainFrm.h
 
2003-09-08 Laoran
 PATCH: [ 799633 ] context menu with scriptlet, from Jochen Tucht
  WinMerge: Merge.dsp MergeEditView.cpp MergeEditView.h
  common new files: dllproxy.c dllproxy.h lwdisp.c lwdisp.h
 PATCH: [ 802373 ] undo/redo/onEditOperation when RO (2.1)
  WinMerge: MergeEditView.cpp
 PATCH: [ 802359 ] display in diff pane when no diff (2.1)
  WinMerge: MergeDiffDetailView.cpp

2003-09-08 Kimmo
 PATCH: [ 802096 ] Fix diff navigation when first/last diff selected
  WinMerge: MergeEditView.cpp

2003-09-08 Laoran
 PATCH: [ 802066 ] diff pane when OnDisplayDiff(-1) (2.1)
  WinMerge: MergeDiffDetailView.cpp

2003-09-07 Perry
 PATCH: [ 802132 ] Resort dir columns after redisplay
  WinMerge: DirView.h DirView.cpp DirDoc.cpp
 Fix bug [ 798404 ] Reordering dirview columns does not preserve sorting column
  WinMerge: DirView.cpp

2003-09-07 Laoran
 PATCH: [ 799464 ] preserve positions during Rescan (2.1)
  WinMerge: GhostTextBuffer.cpp GhostTextView.cpp GhostTextView.h MergeDoc.cpp
  editlib: ccrystaleditview.cpp ccrystaleditview.h ccrystaltextbuffer.cpp ccrystaltextbuffer.h
   ccrystaltextview.cpp ccrystaltextview.h

2003-09-07 Kimmo
 BUG: [ 802063 ] files_analyzeFile bug for UNIX file (2.1)
  WinMerge: files.cpp

2003-09-07 WinMerge experimental release 2.1.1.3 (cvs)

2003-09-07 Kimmo
 PATCH: [ 800420 ] Fix recursive compare and cleanup recursive usage
  WinMerge: DiffThread.h DiffThread.cpp DirDoc.h DirDoc.cpp MainFrm.cpp
 Use constant values for whitespace compare setting
  WinMerge: DiffWrapper.h DiffWrapper.cpp
 Change default diff colors to more eye friendly ones (not so bright ones)
  WinMerge: Merge.cpp
 Tweak more yellow diff color
  WinMerge: Merge.cpp

2003-09-06 Perry
 PATCH: [ 795082 ] Display Private Build version in about box
 WinMerge: Merge.cpp Merge.rc resource.h
 Languages: resource.h *.rc

2003-09-06 Kimmo
 PATCH: [ 793900 ] Editable file filters
 Submitted by Perry
 WinMerge: FileFilterMgr.h FileFilterMgr.cpp Merge.h Merge.cpp Merge.rc
  PropFilter.h PropFilter.cpp Resource.h
 Languages: resource.h *.rc

2003-09-06 Perry
 PATCH: [ 800175 ] skip custom draw if comctl32.dll < 4.71
  WinMerge: DirView.cpp

2003-09-07 WinMerge experimental release 2.1.1.2 (cvs)

2003-09-02 Laoran
 PATCH: [ 797957 ] correct line number for last real line (in statusbar)
  WinMerge: MergeEditView.cpp

2003-09-01 Laoran
 PATCH: [ 798272 ] save settings for the dockable diff bar
  WinMerge: ChildFrm.cpp ChildFrm.h MainFrm.cpp

2003-09-01 Kimmo
 Improve 256-color icon
  WinMerge/res: Merge.ico

2003-08-31 Laoran
 correction for the patch [797741] in CMergeDoc::CDiffTextBuffer::LoadFromFile
  WinMerge: MergeDoc.cpp

2003-08-31 Kimmo
 PATCH: [ 797741 ] Faster file loading
  WinMerge: files.h files.cpp MergeDoc.h MergeDoc.cpp
 PATCH: [ 784302 ] Implement Read-only for files and dirs
  UI changes
  WinMerge: ChildFrm.cpp DirFrame.cpp DirView.h DirView.cpp Merge.rc
   MergeEditView.h MergeEditView.cpp Resource.h
  Languages: resource.h *.rc
 Fix ASSERT when opening files for merging.
  Submitted by laoran (PATCH [ 784302 ] comments)
  WinMerge: ChildFrm.cpp

2003-08-30 Kimmo
 PATCH: [ 797797 ] OnOptions must exchange diffOptions with the registry
  Submitted by Laoran.
  WinMerge: MainFrm.cpp

2003-08-30 Laoran
 PATCH: [ 784109 ] layout with two new horizontal panels
  common new files: sizecbar.cpp sizecbar.h sizecbarg.cpp sizecbarg.h 
  common: SplitterWndEx.cpp SplitterWndEx.h
  WinMerge: ChildFrm.cpp ChildFrm.h MainFrm.cpp Merge.dsp Merge.rc MergeDoc.cpp
   MergeDoc.h MergeEditView.cpp resource.h
  Winmerge new files: DiffViewBar.cpp DiffViewBar.h MergeDiffDetailView.cpp MergeDiffDetailView.h
  editlib: ccrystaltextview.h

2003-08-29 Perry
 PATCH: [ 779818 ] Fix number display to be locale & user-pref aware
  (extended to handle larger numbers than 32 bit, for size)
 WinMerge: DirView.cpp DirViewColItems.cpp locality.cpp locality.h Merge.dsp

2003-08-29 Kimmo
 PATCH: [ 796756 ] Diff API
  WinMerge: DiffWrapper.h DiffWrapper.cpp DirDoc.h DirDoc.cpp DirView.cpp
   MainFrm.h MainFrm.cpp MergeDoc.h MergeDoc.cpp 

2003-08-28 Laoran
 PATCH: [ 794345 ] make visible the changed text when undo/redo
  WinMerge: MergeEditView.cpp

2003-08-27 Perry
 i18n effects of patch#781529: new popup menu, new dialog, alter existing col header strings
  Languages: Czech, Danish, Dutch
 i18n effects of patch#781529: new popup menu, new dialog, alter existing col header strings
  Languages: French, German, Italian, Korean, Norwegian, Slovak, Spanish

2003-08-27 Kimmo
 PATCH: [ 784302 ] Implement Read-only for files and dirs
  Only background changes, no UI changes
  WinMerge: DirDoc.h DirDoc.cpp DirView.cpp MainFrm.h MainFrm.cpp
   MergeDoc.h MergeDoc.cpp MergeEditView.h MergeEditView.cpp

2003-08-27 Perry
 Add new colhdrs from patch#781529 to Brazilian.
 Reorder ChineseSimplified string tables to match English, and add missing entries.
 Reorder ChineseTraditional string tables to match English, and add missing entries.
  Languages: Brazilian, ChineseSimplified, ChineseTraditional

2003-08-26 Perry
 Implement fix for BUG#794514: 'Comparison Summary' not updated properly
  WinMerge: DirDoc.cpp
 i18n effects of patch#781529: new popup menu, new dialog, alter existing col header strings
  Languages: Brazilian, ChineseSimplified, ChineseTraditional
  
2003-08-25 Laoran
 [ 783507 ] normalize replaceSelection and ListCopy
  WinMerge: GhostTextBuffer.cpp GhostTextBuffer.h MergeDoc.cpp MergeDoc.h
  editlib : ccrystaleditview.cpp ccrystaltextbuffer.cpp ccrystaltextbuffer.h

2003-08-25 Laoran
 [ 794081 ] Error when dropping a column out of WinMerge
  WinMerge: DirView.cpp
  
2003-08-24 Perry
 Fix paths_GetLongPath to handle trailing . or ..
  (BUGFIX: [ 792074 ] Directory mnemonics . and .. are not honored properly)
  WinMerge: paths.cpp
 Fix DIFFITEM::getLeftFilepath & DIFFITEM::getRightFilepath
  (BUGFIX: [ 794319 ] Assert when save after merging)
  WinMerge: DiffContext.cpp

2003-08-24 Kimmo
 PATCH: [ 792668 ] Move file load code to CMergeDoc
  WinMerge: MainFrm.cpp MergeDoc.h MergeDoc.cpp

2003-08-23 Perry
 PATCH: [ 791487 ] Norwegian (bokmĺl) translation
  Corrections#2 Avbrytt->Avbryt and #3 Opdater->Oppdater
  Languages\Norwegian: MergeNorwegian.rc
  Correction#0 Bokmal->Bokmĺl
  WinMerge\Merge.rc
  Correction#1 vćrktřylinje(n)->verktřylinje(n)
  Languages\Norwegian: MergeNorwegian.rc
 PATCH: [ 781529 ] Make column info array, and add new columns
  common: version.cpp version.h
  WinMerge: DiffContext.cpp DiffContext.h DirActions.cpp DirDoc.cpp DirDoc.h
   DirScan.cpp DirView.cpp DirView.h MainFrm.cpp Merge.dsp Merge.rc
   MergeDoc.cpp resource.h
  WinMerge new files: DirColsDlg.cpp DirColsDlg.h DirViewColHandler.cpp
   DirViewColItems.cpp DirViewColItems.h
 Bugfix: CDiffContext::AddDiff was not setting diff context subdir from argument.
  WinMerge:: DiffContext.cpp
 Bugfix: Don't prefix subdirectories with dot in ColPathGet.
  WinMerge: DirViewColItems.cpp
 Bugfix: FILE_SKIP & DIR_SKIP are being labelled as errors
  WinMerge: DirViewColItems.cpp Merge.rc resource.h
 Bugfix: Fix CDirView::GetItemFileNames to get path properly (as before 2003-08-07).
  WinMerge: DirActions.cpp
 Bugfix: Remove several memsets of structures whose size varies with common control versions
  WinMerge: DirView.cpp DirViewColHandler.cpp

2003-08-22 Kimmo
 PATCH: [ 787495 ] Create diffutils class (CDiffWrapper)
  WinMerge: Merge.dsp MergeDoc.h MergeDoc.cpp
   Added: DiffWrapper.h DiffWrapper.cpp
 Adding licence text and comments
  WinMerge: files.h files.cpp
 Adding licence text and comments
  WinMerge: DiffThread.h DiffThread.cpp DiffWrapper.h

2003-08-20 Perry
 PATCH: [ 791924 ] Fix sorting when columns are reordered
  WinMerge: DirView.cpp
 Fix color dialog in Norwegian (Earlier today I forgot to move down the previous labels).
  Languages\Norwegian: Norwegian/MergeNorwegian.rc
 Updated color property page in Korean (patch#768740).
  Languages\Korean: MergeKorean.rc

2003-08-20 Kimmo
 PATCH: [ 791263 ] Remove CStringEx from OpenDlg (and from WinMerge?)
  WinMerge: Merge.dsp OpenDlg.cpp
  Common: removed StringEx.h StringEx.cpp

2003-08-20 Perry
 Added Norwegian to batch build file
  Languages: BuildAll.bat
 Updated two property pages in Norwegian
  IDD_PROPPAGE_REGISTRY (patch#789504) and IDD_PROPPAGE_COLORS (patch#768740).
  Languages\Norwegian: resource.h Norwegian/MergeNorwegian.rc
 Updated color property page in Brazilian (patch#768740).
  Languages\Brazilian: MergeBrazilian.rc
 Updated color property page in Simplified Chinese (patch#768740 not quite complete).
  Languages\ChineseSimplified: MergeChineseSimplified.rc
 Updated color property page in ChineseTraditional (patch#768740).
  Languages\ChineseTraditional: MergeChineseTraditional.rc

2003-08-20 Christian
 PATCH: [ 791487 ] Norwegian (bokmĺl) translation
  Languages: Norwegian added

2003-08-19 WinMerge beta 2.1.0.1 released

2003-08-19 Perry
 Change versions in Merge.rc to "000.000.000.000" as recommended by stampver
  (http://www.elphin.com/products/stampver.html).
  WinMerge: Merge.rc

2003-08-17 Kimmo
 Updated comments for ShellExtension: added comment about used registry values etc
  ShellExtension:
   ShellExtension.cpp WinMergeShell.h WinMergeShell.cpp
 Removed two generated files from CVS (Christian spotted those)
  ShellExtension: 
   ShellExtension.h DllData.cp

2003-08-16 Kimmo
 PATCH: [ 789204 ] Color dir compare based on left/right newer
  WinMerge: DirView.h DirView.cpp
 PATCH: [ 789504 ] Remove unneeded old dir shell assoc
  WinMerge: Merge.rc PropRegistry.h PropRegistry.cpp resource.h
  Languages: resource.h *.rc

2003-08-12 Christian
 PATCH: [ 786618 ] Brazilian Portuguese translation
  Languages: BuilAll.bat and resurrected directory Brazilian
 PATCH: [ 782820 ] Updated Traditional Chinese for 2.0
  Languages\ChineseTraditional: MergeChineseTraditional.rc
 PATCH: [ 782824 ] Add languages to installer
  InnoSetup: WinMerge.iss Info.txt

2003-08-12 Kimmo
 PATCH: [ 785288 ] Overwrite Read-Only file
  WinMerge: MainFrm.h MainFrm.cpp Merge.rc MergeDoc.cpp
  Languages: *.rc

2003-08-07 Kimmo
 PATCH: [ 781013 ] 256 Color icon
  editlib/res: Merge.ico
 PATCH: [ 783593 ] Add Merge-menu
  WinMerge: Merge.rc
  Languages: *.rc

2003-08-07 Perry
 Fix GetItemFileNames to not pull its data from listview (b/c columns may be reordered).
 (Various const fixes needed.)
 WinMerge: DiffContext.cpp DiffContext.h DirActions.cpp DirView.cpp DirView.h

2003-08-05 Laoran
 PATCH: [ 781582 ] Timer for FlushAndRescan
  WinMerge: MergeDoc.cpp MergeDoc.h MergeEditView.cpp MergeEditView.h

2003-08-04 Laoran
 PATCH: [ 782866 ] round off in CMergeDoc::RescanIfNeeded
  WinMerge: MergeDoc.cpp

2003-08-04 Kimmo
 PATCH: [ 780359 ] Open identical files
  WinMerge: DirView.cpp MainFrm.cpp

2003-08-03 WinMerge release 2.0

2003-07-31 Laoran
 PATCH: [ 780827 ] Tooltips for DirView
  Submitted by Kimmo
  WinMerge: DirView.cpp DirView.h

2003-07-31 Laoran
 PATCH: [ 780508 ] Convert Line Length array to CArray
  WinMerge: ccrystaltextview.cpp ccrystaltextview.h 

2003-07-31 Laoran
 PATCH: [ 780067 ] SUndoRecord::SetText must free previous text
  WinMerge: ccrystaltextbuffer.cpp ccrystaltextbuffer.h 

2003-07-30 Laoran
 PATCH: [ 779470 ] disable unwanted options in PropGeneral
  WinMerge: PropGeneral.cpp PropGeneral.h 

2003-07-30 Laoran
 PATCH: [ 777871 ] New headerbar for the file paths 
  WinMerge: ChildFrm.cpp ChildFrm.h dllver.cpp dllver.h Merge.dsp Merge.rc resource.h
  WinMerge new files : EditorFilepathBar.cpp EditorFilepathBar.h FilepathEdit.cpp FilepathEdit.h

2003-07-30 Perry
 PATCH: [ 778379 ] Drag&drop reordering columns
  WinMerge: DirDoc.cpp DirView.cpp DirView.h Merge.dsp dllver.cpp dllver.h
 Annotate UpdateResources methods
  WinMerge: DirDoc.cpp MainFrm.cpp MergeEditView.cpp

2003-07-29 Perry
 PATCH: [ 779224 ] Fix sort bug in right date
  WinMerge: DirView.cpp
 bugfix for PATCH: [ 765225]
  editlib: ccrystaltextview.cpp ccrystaltextview.h

2003-07-29 Kimmo
 PATCH: [ 779172 ] Saving fix for 2.0 and 2.1
  WinMerge: MergeDoc.cpp
 PATCH: [ 779005 ] No temp files when saving local temp files
  WinMerge: MergeDoc.cpp
 Fix Register.bat comments. Batch files use ":" for comments...
  ShellExtension: Register.bat
  
2003-07-29 Perry
 Some fixes to MergeChineseTraditional.rc from Koko
  Languages\ChineseTraditional\MergeChineseTraditional.rc

2003-07-28 Perry
 PATCH: [ 778234 ] Fix DirScan ASSERT when run out of right list
  WinMerge: DirScan.cpp
 PATCH: [ 765225 ] Convert parse cookie array to be CArray
  editlib: ccrystaltextview.cpp ccrystaltextview.h

2003-07-27 Kimmo
 PATCH: [ 778144 ] Use CopyFile instead of DeleteFile() and MoveFile()
  WinMerge: MainFrm.cpp
 PATCH: [ 778384 ] Sync OnDropFiles() from MainFrame to SuperComboBox
  common: SuperComboBox.cpp
 PATCH: [ 778403 ] Fix accel keys in lang files
  Languages: ChineseSimplified, ChineseTraditional 

2003-07-27 Perry
 PATCH: [ 778290 ] Typo in comment
  WinMerge: MergeDoc.cpp

2003-07-26 Kimmo
 BUG: [ 778166 ] Shell integration missing quotes (2.1)
  ShellExtension: WinMergeShell.cpp

2003-07-25 Laoran
 [ 776114 ] french keyboard shortcut
  Languages: french.rc

2003-07-25 Kimmo
 PATCH: [ 773296 ] Add shell integration
  Added new module ShellExtension
  WinMerge: Merge.rc PropRegistry.h PropRegistry.cpp resource.h
  Languages: all *.rc and resource.h files

2003-07-24 Kimmo
 PATCH: [ 776106 ] Fix for TEMP dir error
  Submitted by Laoran
  WinMerge: MergeDoc.cpp

2003-07-24 Perry
 PATCH: [ 766287 ] Use our own dir traversal (instead of diff's)
  WinMerge: Diff.cpp DiffContext.h DiffThread.cpp DirDoc.cpp Merge.dsp 
   DirScan.h DirScan.cpp
 PATCH: [ 773981 ] Modify language build process to eliminate msgboxes
  (also added a version resource to MakeResDll, as it lacked one)
  Languages: BuildAll.bat BuildDll.bat
  MakeResDll: MakeResDll.cpp MakeResDll.rc
 Added F4 accelerator to all languages besides English
  Languages: all *.rc files

2003-07-24 Kimmo
 PATCH: [ 776525 ] Close doc after failed load
  WinMerge: MainFrm.cpp

2003-07-23 Perry
 PATCH: [ 776046 ] Fixes for <Highlight Line Diff> menu item
  WinMerge: Merge.rc MergeEditView.cpp
  Languages: All Merge*.rc files and resource.h files
 PATCH: [ 771666 ] Fix for English descriptions of Chinese
  common: LanguageSelect.rc
  WinMerge: Merge.rc

2003-07-21 Perry
 Added ChineseTraditional, ChineseSimplified, Korean, translations.
 PATCH: [ 775000 ] Improve const correctness in crystaltextbuffer
  editlib: crystaltextbuffer.cpp crystaltextbuffer.h

2003-07-18 Perry
 PATCH: [ 767147 ] Don't clear existing dirdoc until user saves
  WinMerge: DirDoc.cpp
 PATCH: [ 763616 ] New menu item: Highlight line diff
  WinMerge: Merge.rc MergeDoc.cpp MergeDoc.h MergeEditView.cpp MergeEditView.h resource.h
  editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h ccrystaltextview.cpp ccrystaltextview.h

2003-07-18 Kimmo
 PATCH: [ 772843 ] Remember custom colors
  WinMerge: PropColors.h PropColors.cpp

2003-07-18 Laoran
 PATCH : [ 771587 ] Undo/Redo functions 
  WinMerge: MainFrm.cpp MergeDoc.cpp MergeDoc.h MergeEditView.cpp
  editlib: ccrystaleditview.cpp ccrystaleditview.h ccrystaltextbuffer.cpp ccrystaltextbuffer.h 

2003-07-17 Laoran
 PATCH : [ 772908 ] ResetView must reset m_nTopSubLine
  editlib: ccrystaltextview.cpp

2003-07-17 Laoran
 PATCH : [ 769535 ] Preserve cursor during Rescan
  WinMerge: MergeDoc.cpp 
  editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h ccrystaltextview.cpp ccrystaltextview.h

2003-07-17 Laoran
 PATCH: [ 767878 ] Better handling of ghost flag and EOL
  WinMerge: MergeDoc.cpp MergeEditView.cpp
  editlib: ccrystaleditview.cpp ccrystaltextbuffer.cpp ccrystaltextbuffer.h

2003-07-17 Kimmo
 PATCH: [ 772228 ] Quick bin check for 2.0
  WinMerge: files.h files.cpp MainFrm.cpp MergeDoc.cpp

2003-07-16 Laoran
 PATCH: [ 765926 ] Merge empty last line to the last diffrange (change)
 new version
  WinMerge: MergeDoc.cpp

2003-07-16 Laoran
 PATCH: [ 771525 ] Updating cursor in ListCopy
  WinMerge: MergeDoc.cpp MergeDoc.h
  editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h

2003-07-16 Laoran
 PATCH: [ 771503 ] correct UpdateView context in internalInsertText
  editlib: ccrystaltextbuffer.cpp

2003-07-16 Kimmo
 PATCH: [ 768740 ] Additional color options
  Submitted by Gilbert Wellisch
  WinMerge: MainFrm.cpp Merge.cpp Merge.h Merge.rc MergeEditView.cpp
   PropColors.cpp PropColors.h resource.h
  Updated other languages

2003-07-15 Laoran
 PATCH: [ 771625 ] regression for patch [765399]
  WinMerge: MergeEditView.cpp 

2003-07-15 Perry
 PATCH: [ 770361 ] Slovak translation
  Languages: New Slovak subdirectory

2003-07-12 Laoran
 PATCH: [ 765399 ] Careful view initialization in PrimeListWithFile
  WinMerge: MergeDoc.cpp MergeEditView.cpp 
  editlib: ccrystaltextview.cpp

2003-07-12 Laoran
 PATCH: [ 769122 ] Keep top screen line within the shorter panel
  WinMerge: MergeEditView.cpp 

2003-07-11 Perry
 PATCH: [ 765150 ] Fix char count in edit view bottom status line
  WinMerge: ChildFrm.cpp ChildFrm.h Merge.rc MergeEditStatus.h 
   MergeEditView.cpp resource.h
  editlib: ccrystaltextview.cpp ccrystaltextview.h
  Languages: Updated all resource.h and rc files to include two new strings

2003-07-11 Kimmo
 PATCH: [ 769295 ] Fix for threaded dir compare crash
  WinMerge: DiffThread.h DiffThread.cpp DirDoc.h DirDoc.cpp DirView.h DirView.cpp

2003-07-10 Kimmo
 PATCH: [ 766727 ] Threaded dir compare
  WinMerge: DiffContext.h DiffContext.cpp DirDoc.h DirDoc.cpp
   DirView.h DirView.cpp MainFrm.h MainFrm.cpp Merge.dsp
   New files: DiffThread.h DiffThread.cpp

2003-07-10 Laoran
 PATCH: [ 768378 ] use Rescan Timer for Replace All 
  WinMerge: MergeEditView.cpp

2003-07-09 Kimmo
 PATCH: [ 765768 ] Only one Rescan on AllToLeft
  Submitted by Perry
  WinMerge: MergeDoc.h MergeDoc.cpp MergeEditView.cpp

2003-07-08 Kimmo
 PATCH: [ 766473 ] Update identical files
  WinMerge: MergeDoc.cpp

2003-07-08 Laoran
 PATCH: [ 767159 ] merge LF_RIGHT_ONLY and LF_LEFT_ONLY -> LF_GHOST 
  WinMerge: MergeDoc.cpp MergeEditView.cpp
  editlib: ccrystaltextbuffer.h ccrystaltextview.cpp

2003-07-08 Laoran
 PATCH: [ 767051 ] code cleanup for GetTextWithoutEmptys 
  WinMerge: MergeDoc.cpp  MergeDoc.h MergeEditView.cpp
  editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h

2003-07-08 Perry
 PATCH: [ 765165 ] Log error string if CreateFile fails (to debug window)
  WinMerge: files.cpp MainFrm.cpp MainFrm.h MergeDoc.cpp StdAfx.cpp StdAfx.h

2003-07-07 Kimmo
 PATCH: [ 767204 ] Fix for assert when rescanning with selection
  Submitted by Gilbert Wellisch
  editlib: ccrystaltextview.cpp

2003-07-05 Laoran
 PATCH: [ 765399 ] resize m_pdwParseCookies before GoToLine
  WinMerge: MergeDoc.cpp  MergeEditView.cpp

2003-07-05 Laoran
 PATCH: [ 765926 ] Merge empty last line to the last diffrange (change)
  WinMerge: MergeDoc.cpp

2003-07-04 Laoran
 PATCH: [ 766038 ] stay in the viewing area during OnFirstdiff
  WinMerge: MergeEditView.cpp

2003-07-04 Kimmo
 PATCH: [ 765463 ] Simplify temp path handling a little
  WinMerge: MergeDoc.h MergeDoc.cpp

2003-07-03 Kimmo
 PATCH: [ 764571 ] Ask about saving when closing with esc
  WinMerge: MainFrm.cpp MergeDoc.cpp MergeEditView.cpp
 PATCH: [ 763499 ] update french language
  Submitted by Laoran
  Lang/MergeFrench.rc

2003-07-03 Perry
 PATCH: [ 763265 ] Fix handling of .. and . components
  WinMerge: paths.cpp

2003-07-02 Perry
 PATCH: [ 764789 ] Fix Private Build string in rc file
  WinMerge: Merge.rc

2003-07-02 Kimmo
 PATCH: [ 763817 ] Hilight diffs when syntax hilight is off
  WinMerge: MergeEditView.cpp
 PATCH: [ 762531 ] Inproper globals in editlib/cs2cs.cpp
  Submitted by jtuc
  editlib: cs2cs.cpp
 PATCH: [ 762529 ] Dirframe trying to clear non-existing pane
  Submitted by jtuc
  WinMerge: DirFrame.cpp
  
2003-06-30 WinMerge beta 2.1.0.0 released

2003-06-30 Laoran
 [ 762394 ] update german language
  Languages: German\MergeGerman.rc

2003-06-30 Perry
 PATCH: [ 762835 ] Display line number etc beneath editor
  WinMerge: ChildFrm.cpp ChildFrm.h DirFrame.cpp Merge.cpp Merge.dsp 
    MergeEditStatus.h MergeEditView.cpp MergeEditView.h
  editlib: ccrystaltextbuffer.h ccrystaltextview.cpp ccrystaltextview.h

2003-06-29 Perry
 PATCH: [ 758912 ] Combine duplicated code in CMergeEditView::OnEditCopy
  WinMerge: MergeEditView.cpp
 PATCH: [ 762533 ] Stdafx.h has dublicated and unneeded includes
  WinMerge: StdAfx.h
 PATCH: [ 762271 ] Alter ListCopy to copy eol chars
  WinMerge: MergeDoc.cpp MergeDoc.h
  editlib: ccrystaltextbuffer.h ccrystaltextbuffer.cpp

2003-06-29 Kimmo
 PATCH: [ 762749 ] Forced rescan after options changed
  WinMerge: MainFrm.cpp

2003-06-28 Kimmo
 PATCH: [ 761874 ] Fix unlocalisable acceskeys
  WinMerge: Merge.rc
  editlib: editres.rc
  Updated language files too
 PATCH: [ 761827 ] Current diff item to select inactive diff
  WinMerge: MergeDoc.h MergeDoc.cpp MergeEditView.cpp
 PATCH: [ 762098 ] Code cleanups from Jochen
  Submitted by jtuc
  WinMerge: MainFrm.h MainFrm.cpp MergeDoc.cpp MergeEditView.cpp

2003-06-28 Perry
 PATCH: [ 758930 ] Display EOL chars with View Whitespace
  WinMerge: MainFrm.cpp
  editlib: ccrystaltextview.h ccrystaltextview.cpp
 PATCH: [ 762268 ] Fix typo in comment (wenn -> when)
  editlib: ccrystaltextview.cpp

2003-06-27 Kimmo
 PATCH: [ 761951 ] Fix scrolling corruption
  Submitted by Jochen
  editlib: ccrystaltextview.cpp

2003-06-27 Laoran
 PATCH: [ 760745 ] Fix empty search field detection and better history in FindDlg and EditReplaceDlg
  editlib : ccrystaleditview.cpp ccrystaltextview.cpp ceditreplacedlg.cpp ceditreplacedlg.h
    cfindtextdlg.cpp cfindtextdlg.h memcombo.cpp memcombo.h
  
2003-06-26 Christian
 PATCH: [ 754001 ] 2.0 doc link points to 1.7 docs
  WinMerge: MainFrm.cpp

2003-06-26 Kimmo
 PATCH: [ 755918 ] Fix typo in CCrystalTextView extension list
  Added more filename extensions
  editlib: ccrystaltextview.cpp
 PATCH: [ 757180 ] Update Open OK on dropped file
  Submitted by Perry
  common: SuperComboBox.cpp

2003-06-25 Kimmo
 PATCH: [ 759755 ] Better rescan error reporting
  WinMerge: MainFrm.cpp MergeDoc.h MergeDoc.cpp
 PATCH: [ 760441 ] Fix recursive d&d compare
  WinMerge: MainFrm.cpp

2003-06-24 Perry
 PATCH: [ 759778 ] Minor cleanup of crystaltextbuffer.cpp
  editlib: ccrystaltextbuffer.cpp
 PATCH: [ 760077 ] Omit final ghostline if last line unterminated
  WinMerge: MergeDoc.cpp
 PATCH: [ 760129 ] Wipe Undo stack if Undo fails, and fix Undo check
  editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h

2003-06-23 Perry
 PATCH: [ 759533 ] Fix InternalInsertText & InternalDeleteText
  editlib: ccrystaltextbuffer.cpp
 PATCH: [ 759569 ] Fix Undo/Redo & line mappings
  editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h ccrystaleditview.cpp

2003-06-23 Kimmo
 PATCH: [ 759344 ] Add Copy, Cut & Paste to Edit menu
  WinMerge: Merge.rc
  Updated other languages too - translations from Perry and Christian

2003-06-22 Perry
 PATCH: [ 758870 ] Return filesize+1 rather than 0 for new lines at end
  editlib: crystaltextbuffer.cpp crystaltextbuffer.h
 PATCH: [ 758900 ] Fix bug in pasting contiguous empty lines.
  editlib: crystaltextbuffer.cpp
 PATCH: [ 756218 ] Fix copy & paste typo in comment in Merge.cpp
  WinMerge: Merge.cpp

2003-06-21 Perry
 PATCH: [ 716456 ] Update Undo/Redo info with rescan line mapping
  WinMerge: MergeDoc.cpp MergeEditView.h
  editlib: crystaltextbuffer.cpp crystaltextbuffer.h

2003-06-19 Perry
 PATCH: [ 728153 ] If opening first file fails, don't open second
  WinMerge: MainFrm.cpp

2003-06-17 Kimmo
 PATCH: [ 755918 ] Fix typo in CCrystalTextView extension list
  editlib: ccrystaltextview.cpp

2003-06-16 Christian
 PATCH [ 754015 ] WinMerge installer imrovements
  InnoSetup: Info.txt WinMerge.iss WinMergeIcon.bmp WinMergeLarge.bmp

2003-06-12 Kimmo
 PATCH: [ 753284 ] Fix cursor slowdown after rescan
  editlib: ccrystaltextview.cpp

2003-06-08 Kimmo
 PATCH: [ 750160 ] Char width fix
   editlib: ccrystaltextview.cpp

2003-06-07 Kimmo
 PATCH: [ 750302 ] Allow *.flt filter files
  WinMerge: Merge.cpp

2003-06-06 Kimmo
 Updated filter file from patch [ 742041 ] Improvements to file/directory filters
  Filters: Merge_VC_loose.flt
 BUG: [ 749007 ] "Highlighting" is misspelled as "Hilighting"
  WinMerge: Merge.rc

2003-06-05 WinMerge 2.0.0 Release Candidate 1 released

2003-06-05 Christian
 PATCH: [ 749566 ] Updated resource files
  Languages: all resource.h files and all Merge*.rc files

2003-06-04 Christian
 Updated Czech and Danish resources
  Languages: Czech\resource.h Czech\MergeCzech.rc Danish\resource.h Danish\MergeDanish.rc

2003-06-02 Kimmo
 PATCH: [ 747090 ] Fix scroll handling
  editlib: ccrystaltextview.cpp

2003-06-01 Kimmo
 PATCH: [ 746319 ] Adjust horiz scrolling width
  editlib: ccrystaltextview.cpp

2003-05-31 Kimmo
 PATCH: [ 745654 ] Draw long lines
  WinMerge: MergeEditView.cpp
  editlib: ccrystaltextview.cpp
 PATCH: [ 742041 ] Improvements to file/directory filters
  WinMerge: FileFilterMgr.h FileFilterMgr.cpp Merge.cpp
 PATCH: [ 738557 ] Allow "Open Left" for directories
  WinMerge: DirActions.cpp DirView.h DirView.cpp

2003-05-29 Christian
 PATCH: Applied [ 745223 ] Fix pasting different EOL types
  edilib: ccrystaltextbuffer.cpp
 BUG: [ 744990 ] Pasting to the right

2003-05-29 Kimmo
 Made new folder \Filters for filter files.  Added Perry's original filter files
 working with beta 1.9.2.2

2003-05-28 Kimmo
 PATCH: [ 744872 ] Use CopyFile()
  WinMerge: files.h files.cpp MergeDoc.cpp

2003-05-26 Kimmo
 PATCH: [ 743284 ] String fixes
  WinMerge: DirDoc.cpp DirView.cpp MainFrm.cpp MergeDoc.h paths.cpp
  editlib: ccrystaleditview.cpp ccrystaltextview.cpp registry.cpp

2003-05-25 Kimmo
 PATCH: [ 742735 ] Fix CCrystalTextBuffer::InsertLine()
  edilib: ccrystaltextbuffer.cpp

2003-05-23 Christian
 Made new folder \InnoSetup\ for files related to making WinMerge installer using InnoSetup

2003-05-22 Perry
 PATCH: [ 741265 ] Fix for bug#741263: 1.9.2.2 crash on refresh
  WinMerge: Diff.cpp DiffContext.cpp DiffContext.h DirDoc.cpp MainFrm.cpp

2003-05-19 WinMerge beta 1.9.2.2 released

2003-05-18 Perry
 PATCH: [ 739529 ] project file & directory filters
  WinMerge: Diff.cpp DiffContext.cpp DiffContext.h FileFilterMgr.cpp 
    FileFilterMgr.h MainFrm.cpp MainFrm.h Merge.cpp Merge.dsp Merge.h
	Merge.rc PropFilter.cpp PropFilter.h resource.h

2003-05-16 Kimmo
 PATCH: [ 737709 ] Remove unneeded UpdateAllViews()
  WinMerge: MergeDoc.cpp
 PATCH: [ 738467 ] Enable/disable save items
  WinMerge: MergeEditView.h MergeEditView.cpp

2003-05-14 Kimmo
 PATCH: [ 737692 ] Scrolling optimisation - significant speedup
  editlib: ccrystaltextview.cpp

2003-05-13 Kimmo
 PATCH: [ 736443 ] Prpoper Esc fix
  WinMerge: DirView.h DirView.cpp Merge.cpp MergeEditView.h MergeEditView.cpp

2003-05-09 Kimmo
 PATCH: [ 735127 ] German Translation
  Updated German language file submitted by Jörg Schneider
 PATCH: [ 734787 ] Disable ESC closing window
  NOTE: This is to fix BUG [ 734554 ] ESC closes dialog + document
  WinMerge: Merge.cpp
 BUG: [ 711961 ] shift-tab in editor moved block then deselects
  WinMerge: MergeEditView.cpp

2003-05-07 Kimmo
 PATCH: [ 733383 ] Enable Find- and Replace- dialogs
  WinMerge: Merge.rc resource.h
  editlib: ceditreplacedlg.h ceditreplacedlg.cpp cfindtextdlg.h
   cfindtextdlg.cpp editcmd.h editres.rc
  Removed: editlib/resource.h
  Updated other languages
 PATCH: [ 733926 ] Fix find dialog text selection
  editlib: ccrystaltextview.cpp

2003-05-06 Kimmo
 PATCH: [ 732775 ] Add support for MAC files
  WinMerge: MergeDoc.cpp MergeEditView.h

2003-05-03 Kimmo
 BUG: [ 731486 ] Crash after save
  WinMerge: MergeDoc.cpp
 PATCH: [ 731533 ] Temp path fix
  WinMerge: MergeDoc.h MergeDoc.cpp
  editlib: ccrystaltextbuffer.h ccrystaltextbuffer.cpp

2003-05-02 Kimmo
 BUG: [ 724726 ] Status bar says "Rescanning" the first time
  WinMerge: Merge.rc

2003-05-01 Kimmo
 PATCH: [ 730738 ] Update BCMenu (to v3.033)
  WinMerge: BCMenu.h BCMenu.cpp
   Updates BCMenu to v3.033, http://www.codeproject.com/menu/bcmenu.asp

2003-04-29 Kimmo
 PATCH: [ 728542 ] Automatic rescan enable/disable
  WinMerge: MainFrm.h MainFrm.cpp Merge.rc MergeEditView.h MergeEditView.cpp
   PropGeneral.h PropGeneral.cpp resource.h
   Updated other languages too

2003-04-28 Kimmo
 PATCH: [ 726330 ] Saving before refresh - backout saving - see bug [ 723412 ]
  WinMerge: MergeDoc.cpp MergeEditView.cpp
 PATCH: [ 728228 ] Rename properties to options and rearrange
  Renaming "Properties" to "Options"
  WinMerge: MainFrm.h MainFrm.cpp Merge.rc resource.h
  Updated .rc and resource.h for other languages
 BUG: [ 718133 ] Inconsistent user keyword list for C/C++ syntax hiligth
  editlib: cplusplus.cpp

2003-04-27 Kimmo
 BUG: [ 728173 ] Autoscroll first diff breaks syntax hilight
  WinMerge: MergeDoc.cpp

2003-04-26 Kimmo
 PATCH: [ 726330 ] Saving before refresh
  WinMerge: MergeDoc.h MergeDoc.cpp MergeEditView.cpp
 PATCH: [ 727455 ] Autoscroll first diff for dir compare
  WinMerge: DirView.h MainFrm.cpp

2003-04-25 Kimmo
 PATCH: [ 727104 ] Disable margins for unknown filetypes
  editlib: ccrystaltextview.h ccrystaltextview.cpp

2003-04-23 Kimmo
 PATCH: [ 721939 ] Wider horiz scroll + more space after last char
  editlib: ccrystaltextview.cpp
 PATCH: [ 726390 ] Last diff shown incorrectly sometimes
  WinMerge: MergeDoc.cpp

2003-04-20 Perry
 Changed dynamic array to be CArray based
  editlib: ccrystaltextview.cpp
 PATCH: [ 724309 ] Add WaitStatusCursors
  WinMerge: DirDoc.cpp DirView.cpp MainFrm.cpp Merge.dsp MergeDoc.cpp MergeEditView.cpp 
   WaitStatusCursor.cpp WaitStatusCursor.h
 PATCH: [ 724473 ] Move WaitStatusCursor strings into RC
  WinMerge: DirDoc.cpp DirView.cpp MainFrm.cpp MergeDoc.cpp MergeEditView.cpp resource.h StdAfx.cpp StdAfx.h
 PATCH: [ 724479 ] Fix Refresh crash in empty dir view
  WinMerge: DirDoc.cpp
 bugfix: Add new files that were part of patch#724309
  WinMerge: WaitStatusCursor.cpp WaitStatusCursor.h
 PATCH: [ 724493 ] WaitStatusCursor for MergeDoc rescans
  WinMerge: MergeDoc.cpp

2003-04-19 Perry
 [ 724280 ] Could use wait cursors at OpenSelection calls
  WinMerge: DirView.cpp

2003-04-15 Perry
 PATCH: [ 722083 ] refresh button (menu item, accelerator)
  WinMerge: DirView.cpp DirView.h Merge.rc MergeEditView.cpp MergeEditView.h resource.h res/Toolbar.bmp
 Also updated resource files (resource.h, *.rc, Toolbar.bmp) to all languages

2003-04-14 Kimmo
 PATCH: [ 720613 ] CDirView leaks imagelist
  WinMerge: DirView.cpp
 PATCH: [ 720701 ] Use memory-mapped files when saving files
  WinMerge: files.h files.cpp MergeDoc.h MergeDoc.cpp

2003-04-14 Perry
 PATCH: [ 716475 ] Reduce edtlib.h coupling
 WinMerge: MergeEditView.h StdAfx.h editlib/ccrystaleditview.inl

2003-04-13 Kimmo
 PATCH: [ 719872 ] Use memory-mapped files when loading files
  WinMerge: files.h files.cpp Merge.dsp MergeDoc.h MergeDoc.cpp

2003-04-10 Kimmo
 PATCH: [ 717688 ] CrystalEditor optimisations and memleaks
  fix tab bug.
  editlib: ccrystaltextview.cpp

2003-04-09 Kimmo
 PATCH: [ 717688 ] CrystalEditor optimisations and memleaks
  editlib: ccrystaltextview.cpp

2003-04-08 Kimmo
 PATCH: [ 716744 ] Fix CrystalEditor memory leaks
  editlib: ccrystaltextbuffer.cpp ccrystaltextview.cpp

2003-04-07 Kimmo
 PATCH: [ 716308 ] Disable italic text
  editlib: ccrystaltextview.cpp
 PATCH: [ 715553 ] Add commandline options to not add paths to MRU
  Usage: -ur to ignore rigth, -ul to ignore left and -ub to ignore both
  WinMerge: MainFrm.h MainFrm.cpp Merge.cpp 

2003-04-06 Kimmo
 PATCH: [ 715457 ] LoadFromFile() rewrote
  WinMerge: MergeDoc.h MergeDoc.cpp

2003-04-06 Perry
 PATCH: [ 716088 ] Fix bin same/diff bug in Diff.cpp & analyze.c
  WinMerge: analyze.c Diff.cpp

2003-04-04 Christian
 PATCH: [ 711843 ] Allow backspace at beginning of line
  WinMerge: MainFrm.cpp

2003-04-03 Kimmo
 BUG: [ 714570 ] Sensitive to EOL -setting not saved
  WinMerge: MainFrm.cpp

2003-04-02 Kimmo
 PATCH: [ 713322 ] Save whole buffer not line by line
  WinMerge: MergeDoc.cpp
 PATCH: [ 713416 ] MergeEditView optimisations
  WinMerge: MergeEditView.cpp

2003-03-31 Kimmo
 PATCH: [ 711437 ] Don't copy/cut removed lines
 WinMerge: MergeDoc.h MergeDoc.cpp MergeEditView.h MergeEditView.cpp

2003-03-31 Perry
 PATCH: [ 712429 ] Fix UpdateItemStatus bug 712093
 WinMerge: DirActions.cpp DirView.cpp paths.cpp paths.h

2003-03-30 Perry
 PATCH: [ 712417 ] Fix save of open doc before next merge
 WinMerge: ChildFrm.cpp ChildFrm.h DirDoc.cpp DirDoc.h DirFrame.cpp DirFrame.h
  DirView.cpp DirView.h MainFrm.cpp MainFrm.h MergeDoc.cpp MergeDoc.h

2003-03-29 Perry
 PATCH: [ 710347 ] Fix crash of winmerge c:\ d:\
 WinMerge: DiffContext.h DirDoc.cpp MainFrm.cpp Merge.cpp OpenDlg.cpp OpenDlg.h paths.cpp paths.h
 PATCH: [ 687177 ] Handle more errors during copy/creation
 WinMerge: MainFrm.cpp
 PATCH: [ 689884 ] Revise doc/view code (allow multiple docs)
 WinMerge: ChildFrm.cpp DirActions.cpp DirDoc.cpp DirDoc.h DirView.cpp MainFrm.cpp MainFrm.h
  Merge.cpp MergeDoc.cpp MergeDoc.h MergeEditView.cpp
 NB: This broke two things in MainFrm--search for TODO: 2003-03-29
 BUGFIX: [ 711975 ] CMainFrame::GetAllViews crashes
 WinMerge: MainFrm.cpp
 BUGFIX: [ 711983 ] ClearMergeDoc causing ASSERT
 WinMerge: DirDoc.cpp MergeDoc.cpp

2003-03-26 WinMerge beta 1.9.1.4 released

2003-03-25 Perry
 PATCH: [ 709575 ] Fix sanity check in CChildFrame::UpdateHeaderSizes()
 WinMerge: ChildFrm.cpp
 PATCH: [ 708542 ] Make splash & about show language-independent version
 common: version.cpp version.h
 WinMerge: Merge.cpp Splash.cpp

2003-03-25 Christian
 Replace COPYING with corrected version from http://www.gnu.org/licenses/gpl.txt

2003-03-25 Kimmo
 PATCH: [ 708893 ] Don't ask to save file compare
  WinMerge: MergeDoc.h MergeDoc.cpp
 PATCH: [ 703069 ] Fix undo crash
  editlib: crystaltextbuffer.cpp
 PATCH: [ 709502 ] Fix missing/existing EOL at end of file
  WinMerge: MergeDoc.h MergeDoc.cpp

2003-03-23 Perry
 PATCH: [ 706006 ] Suppress Rescan during Merge
  Merge.cpp Merge.h MergeDoc.cpp MergeDoc.h MergeEditView.cpp

2003-03-23 Kimmo
 PATCH: [ 707753 ] Delayed rescan - fix
  WinMerge: MergeEditView.cpp

2003-03-22 Kimmo
 PATCH: [ 707753 ] Delayed rescan
  WinMerge: MergeEditView.h MergeEditView.cpp

2003-03-21 Kimmo
 PATCH: [ 707152 ] Delay path check in opendialog
  WinMerge: OpenDlg.h OpenDlg.cpp

2003-03-14 Kimmo
 PATCH: [ 703234 ] Use stricmp
  WinMerge: DIFF.C diffmain.c SDIFF.C

2003-03-11 Perry
  Deleted unused res files: bitmap1.bmp, bmp00001.bmp, ScreenShot.gif, WinMerge.gif

2003-03-11 Christian
 PATCH: [ 700872 ] Esc to close crashes WinMerge
  WinMerge: Merge.cpp

2003-03-09 Kimmo
 PATCH: [ 699839 ] Add same binaries to dir compare status
  WinMerge: MainFrm.h MainFrm.cpp
 PATCH: [ 699893 ] Add drag&drop of files/paths to main window
  Note: Press down Ctrl when dropping dirs for recursive compare
  WinMerge: MainFrm.h MainFrm.cpp Merge.cpp paths.h paths.cpp

2003-03-07 WinMerge beta 1.9.1.3 released

2003-03-07 Perry
 PATCH: [ 699580 ] Fix paths.cpp
  WinMerge: paths.cpp

2003-03-07 Kimmo
 PATCH: [ 698754 ] Update filetimes after save
  WinMerge: DiffContext.h DiffContext.cpp DirDoc.h DirDoc.cpp MergeDoc.cpp

2003-03-06 Christian
 Update Danish language file with new strings in MergeDanish.rc
 Removed duplicate dialog in French language file in MergeFrench.rc
 Added Czech to BuildAll.bat
 PATCH: [ 698346 ] Use full path for directory context menu option
  WinMerge: PropRegistry.cpp

2003-03-06 Kimmo
 PATCH: [ 696695 ] DirDoc Redisplay optimisation
  WinMerge: DirDoc.h DirDoc.cpp

2003-03-05 Perry
 Added new subdir Languages/Danish/res
  PATCH: [ 695857 ] Fix directory handling, & UNC paths, & shortnames
 Fix Danish language files: Update resource.h and update language dialogbox to use IDC_LANGUAGE_LIST.

2003-03-04
 BUG: [ 684622 ] Escape key closes whole program
  Nikki Locke's patch slightly modified
  WinMerge: Merge.cpp
 PATCH: [ 696588 ] Multimonitor + virtual screens support
  WinMerge: MainFrm.cpp Merge.dsp multimon.h
 BUG: [ 697320 ] Saving enabled when comparing directories
  WinMerge: DirView.h DirView.cpp

2003-02-28 Kimmo
 BUG: [ 693932 ] Trailing \ on path crashes WinMerge
  WinMerge: OpenDlg.h OpenDlg.cpp

2003-02-27 Kimmo
 BUG: [ 693820 ] Typed path failed to compare
  WinMerge: OpenDlg.cpp
 BUG: [ 693004 ] Keyboard does not work for accessing menus
  Add missing WM_MENUCHAR handler from www.codeguru.com
  WinMerge: MainFrm.h MainFrm.cpp

2003-02-26 Kimmo
 BUG: [ 683753 ] Rescan is not prompting to save dirty
      current file
  WinMerge:
   MainFrm.cpp

2003-02-26 Christian
 [ 70970 ] Translate Merge.rc into danish
    BuildAll.bat and added directory Languages/Danish

2003-02-26 Kimmo
 [ 692922 ] Don't try to compare file & directory
  WinMerge:
   OpenDlg.cpp
 [ 686699 ] Check & return file saving success
  Fix2: Do not return save success of "Save As"
  WinMerge:
   MergeDoc.cpp

2003-02-24 Kimmo
 [ 687574 ] Navigate in directory view (fix bug in patch)
  WinMerge:
   DirView.cpp
 [ 686699 ] Check & return file saving success - fix
  WinMerge:  
   MergeDoc.h Mergedoc.cpp

2003-02-22 Perry
 [ 650356 ] suggest commenting out several functions
 [ 684416 ] is_all_whitespace is bad
  Removed bad unused functions in common/coretools.cpp (& .h)
  (Did not remove all unused functions, only ones with bugs)

2003-02-21 Perry
 Sync'ed all language resources to English version.
 [ 684300 ] Stringified Diffitems
   + combined & modularized code in DirDoc.cpp
  WinMerge:
   DiffContext.cpp DiffContext.h DirDoc.cpp DirView.cpp DirView.h

2003-02-20 Perry
 [ 689876 ] Patch to fix bug # 689869 (ASSERT on Rescan)
  WinMerge:
   MainFrm.cpp & new resource IDS_ERROR_FILE_NOT_FOUND
 [ 687574 ] Navigate in directory view
  WinMerge:
   DirView.cpp DirView.h
 [ 690176 ] Cmdline param for ESC closing
   (and updated all obsolete French & German accelerators as well)
  WinMerge:
   Merge.cpp Merge.h Merge.rc
  Languages:
   Czech\MergeCzech.rc Dutch\MergeDutch.rc French\MergeFrench.rc
   German\MergeGerman.rc Italian\MergeItalian.rc Spanish\MergeSpanish.rc
  [ 689896 ] Update to sync Czech resource
    Czech\MergeCzech.rc

2003-02-18 Christian
  Removed annoying SourceSafe path from Merge.dsp

2003-02-18 Kimmo
  [ 684737 ] Fix Language Box to handle dblclick
  Languages:
   LanguageSelect.h LanguageSelect.cpp
  WinMerge:
   Merge.rc resource.h
  [ 687039 ] View whitespaces on editor
  WinMerge:
   MainFrm.h MainFrm.cpp Merge.rc resource.h
  WinMerge/editlib:
   ccrystaltextview.cpp

2003-02-15 Kimmo
  [ 686699 ] Check & return file saving success
  Merge.rc MergeDoc.h Mergedoc.cpp resource.h

2003-02-14 Kimmo
 [ 685491 ] Saving fixes: SaveToFile() rewrite part
  + Missing NULL check for mf->m_pDirDoc in CMergeDoc
  MergeDoc.h MergeDoc.cpp

2003-02-13  Perry
 [ 685816 ] Recommend deleting unlocalized translations
 [ 684290 ] improved bin test:
  Diff.cpp readme.txt
 [ 686090 ] Show/hide binary files
 WinMerge:
  DirDoc.cpp MainFrm.cpp MainFrm.h Merge.rc readme.txt
  resource.h
 Languages:
  Spanish/MergeSpanish.rc Spanish/resource.h

2003-02-12  Perry
 Languages:
  Dutch/MergeDutch.rc
 Some updates to align Dutch rc towards English rc.
 [ 685637 ] CMainFrame::SyncFiles GPF bug

2003-02-12  Christian
 [ 630286 ] WinMerge crashes/fails in WinCVS
 [ 683752 ] Add option to be listed on Directory context menu

2003-02-11  Perry
 Fixing recent SplitFilename & directory concat problems.
 [ 683924 ] Same binaries for directory compare.

2003-02-10  Perry
 Kimmo's fix for crash due to NULL doc pointer in MergeDoc::SaveHelper.
 [ 470013 ] Spanish Orthography and Semantics

2003-02-09  Perry
 [ 683120 ] splitfilename changed to CStrings
 Move new SplitFilename from Chris Mumford into coretools, remove old
 versions, add test chassis, and fix some minor cases.

2003-02-08  Perry
 DirDoc.*: Changed from strftime to COleDateTime::Format (respects user prefs).
 First half of [ 679692 ] Update after editing (with code combination).
 [ 682505 ] API changes for CLog, CDirView and CDirDoc
 2nd half of [ 679692 ] Update after editing
 
2003-02-07  WinMerge beta 1.9.1.1 released

2003-02-07  Christian
 Added 24 missing languages
 Fixed duplicated strings in Italian rc.

2003-02-05  Perry
 Updated Brazilian, Italian, Spanish resources to sync with English/main resources.

2003-01-28  Christian
 Committed [ 424579 ] Escape to exit

2003-01-27  Christian
 [ 668654 ] Tabtype selection feature
 [ 672554 ] Update DirView after individual merge
 Fixed [ 225571 ] After individual merge, dirView not updated
 [ 672879 ] Propose clarifying change in ccrystaleditview.cpp
 [ 672885 ] Fix for ASSERT from CChildFrame::UpdateHeaderSizes
 [ 673063 ] Modification check before close
 [ 675526 ] Waitcursors and merging all

2003-01-21  Christian
 [ 671037 ] Changes for MSVC.NET
 [ 671810 ] Tempfiles to temp dir

2003-01-20  Christian
 [ 671034 ] operator precedence bug in SplitterWndEx.cpp

2003-01-15  Christian
 [ 650384 ] Fix for false equals for binary files
 [ 651689 ] Add OpenLeft, OpenLeftWith, ... context
 [ 650293 ] Implement context menus with multiselect

2003-01-14  Christian
 [ 665993 ] Little optimisation

2002-12-17  WinMerge beta 1.7.2.11 released

2002-11-26  Perry
 Implemented recursive directory delete
 Fix bug in EOL handling in crystaltextbuffer, and add optional EOL sensitivity.
 Added optional EOL insensitivity to gnu diff IO.c.
 Added status bar progress (file count) indicator during scanning
 Fixed tooltips of toolbar buttons to list correct hotkeys
 Split "Show Unique" option into "Show Left Unique" and "Show Right Unique"

2002-12-02  Perry
 Added left files, left dirs, right files, right dirs to status bar feedback

2002-11-18  WinMerge beta 1.7.2.1 released
