3 (This summarizes all changes to all files under Src, including Src\Languages.)
6 Remove expat and SCEW unicode targets from build batch
8 BUG: [ 1576168 ] Cannot find file filter path message is wrong
9 Src: FileFiltersDlg.cpp
10 Src/Languages/*: Merge*.rc
11 Bump ShellExtension version to 1.12
12 ShellExtension: ShellExtension.rc
15 PATCH: [ 1693113 ] Enable ShellExtension for folder backgrounds
16 ShellExtension: WinMergeShell.cpp WinMergeShell.rgs
17 BUG: [ 1693441 ] Compare by date (and size) broken in 2.7.3.2
21 BUG: [ 1693275 ] File extension filter does not work correctly
22 Src: FileFilterHelper.cpp
25 RFE: [ 1685190 ] Add 1 pixel margin to line numbers area
26 Src/editlib: ccrystaltextview.cpp
27 PATCH: [ 1693041 ] Fix couple of editor bugs
28 Submitted by Jeremy Dewey
29 editlib: ccrystaleditview.cpp ccrystaltextbuffer.cpp
32 PATCH: [ 1692033 ] Use SetResourceVersions.wsf with 3 version numbers
33 Src: SetResourceVersions.wsf
34 PATCH: [ 1692097 ] Updated Toolbar Enabled/Disabled BMP
35 Submitted by Alexander Skinner
36 Src/res: ToolbarDisabled.bmp ToolbarEnabled.bmp
39 BUG: [ 1630762 ] Cannot save project file if including non-ascii chars
40 Src: Merge.dsp ProjectFile.cpp
43 PATCH: [ 1603292 ] Add tab interface for MDI child windows
44 Src: MainFrm.cpp MainFrm.h Merge.dsp Merge.rc OptionsDef.h OptionsInit.cpp
46 Src/Common: MDITabBar.cpp MDITabBar.h
47 Src/Languages/*: Merge*.rc
49 Src/Languages/*: Merge*.rc
52 PATCH: [ 1689293 ] Batch file for building WinMerge files
56 PATCH: [ 1690503 ] fix for bug 1659281 "WinMerge forgets monitor to use when th
57 Submitted by from Dan Pidcock
61 RFE: [ 1690346 ] Manual selection of syntax highlighting scheme
62 Src/Languages/*: Merge*.rc
63 Src: Merge.rc MergeEditView.cpp MergeEditView.h resource.h
66 PATCH: [ 1646210 ] Use CSS for HTML report
68 PATCH: [ 1686279 ] New icons for Copy and Advance
69 Src/res: ToolbarDisabled.bmp ToolbarEnabled.bmp
72 PATCH: [ 1689854 ] C# development file filter
73 Filters new file: CSharp_loose.flt
74 BUG: [ 1689778 ] Refresh should be in view menu, not the edit menu
75 Patch from Dan Pidcock
77 Src/Languages/*: Merge*.rc
78 PATCH: [ 1689515 ] Swedish translation of "Page Se&tup"
79 Submitted by Hans Eriksson
80 Src/Languages/Swedish: MergeSwedish.rc
83 RFE: [ 1646407 ] Use "equal" or "not equal" as file compare icon
84 (Fixed the blurred icons and minimize the flicking effect)
88 2007-03-27 WinMerge experimental release 2.7.3.2 (SVN revision 4201)
91 PATCH: [ 1688012 ] Remove IDR_MAINFRAME icon from lang files
92 Src: AboutDlg.cpp Merge.rc resource.h
93 Src/Languages/*: Merge*.rc
94 PATCH: [ 1684865 ] WinMerge Icon Set Revision 4
95 (Now with the 256*256 versions)
96 Src/res: MergeDoc.ico MergeProject.ico
99 PATCH: [ 1687966 ] Fix crash when changing compare method
100 Src: DiffContext.cpp DiffContext.h FolderCmp.cpp
103 BUG: [ 1687754 ] Editor regression in trunk (2)
104 Src: stringdiffs.cpp stringdiffsi.h
107 BUG: [ 1639453 ] Imaginary difference highlighted in character level mode
111 PATCH: [ 1687661 ] Remove ICONS and BITMAPS from lang files
112 Src/Languages/*: Merge*.rc
113 PATCH: [ 1687983 ] Remove IMAGES and CURSORS from lang files
114 Src/Common: Picture.cpp
115 Src/editlib: ccrystaltextview.cpp
116 Src/Languages/*: Merge*.rc
119 BUG: [ 1687754 ] Editor regression in trunk
120 Src: stringdiffs.cpp stringdiffsi.h
123 Japanese translation - update
124 Src/Languages/Japanese/MergeJapanese.rc
127 PATCH: [ 1687430 ] printing patch
128 Src: Merge.rc MergeEditView.cpp MergeEditView.h
129 Src/Common: SplitterWndEx.cpp SplitterWndEx.h
130 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
131 Src/Languages/*: Merge*.rc
134 BUG: [ 1680920 ] Line filters are not preserved across sessions
135 Src/Common: OptionsMgr.cpp
138 PATCH: [ 1687439 ] Add MergeProject.ico to WinMerge EXE
139 Src: Merge.dsp Merge.rc resource.h
140 Src/res new file: MergeProject.ico
143 PATCH: [ 1684865 ] WinMerge Icon Set Revision 4
144 (Initially without the 256*256 version)
145 Src/res: MergeDoc.ico
148 BUG: [ 1683061 ] Bug in highlighting
152 RFE: [ 1646407 ] Use "equal" or "not equal" as file compare icon
153 Src: ChildFrm.cpp ChildFrm.h MergeDoc.cpp
156 BUG: [ 1491334 ] thinly highlighted position is wrong
157 Src: stringdiffs.cpp stringdiffsi.h
159 2007-03-20 WinMerge experimental release 2.7.3.1 (SVN revision 4179)
162 PATCH: [ 1683805 ] Remove unneeded linefilter registry values
163 Src: LineFiltersList.cpp
164 Src/Common: OptionsMgr.cpp OptionsMgr.h
165 PATCH: [ 1683842 ] Allow resizing copy confirmation dialog
166 Src: ConfirmFolderCopyDlg.cpp ConfirmFolderCopyDlg.h Merge.rc
167 Src/Languages/*: Merge*.rc
170 PATCH: [ 1680209 ] New icons from Alexander Skinner (Part 1)
171 Based on icons by Alexander Skinner
172 Src/res: copy.bmp cut.bmp language.bmp paste.bmp print.bmp select_all.bmp select_font.bmp
173 PATCH: [ 1683289 ] Swedish translation update for Improve Line filters dialog
174 Submitted by Hans Eriksson
175 Src/Languages/Swedish: MergeSwedish.rc
178 Remove extra line from manifest file
179 Src/res: WinMergeU.exe.manifest
182 PATCH: [ 1682475 ] Improve Line filters dialog (add new files I forgot to add)
184 Src new files: LineFiltersList.cpp LineFiltersList.h
187 PATCH: [ 1682475 ] Improve Line filters dialog
188 Src: DirDoc.cpp MainFrm.cpp MainFrm.h Merge.rc Merge.rc MergeDoc.cpp OptionsDef.h
189 OptionsInit.cpp PropLineFilter.cpp PropLineFilter.h
190 Src/Languages/*: Merge*.rc
191 BUG: [ 1682500 ] Crash when comparing empty folders
192 Reported and analyzed by Takashi
196 Trivial string initialization fix
197 Src: SyntaxColors.cpp
200 PATCH: [ 1679196 ] Cleanup logfile class usage
201 Src: DiffWrapper.cpp DirActions.cpp DirDoc.cpp DirScan.cpp FolderCmp.cpp MainFrm.cpp
202 Merge.cpp Merge.h MergeDoc.cpp Plugins.cpp StdAfx.cpp StdAfx.h
203 Src/Common: LogFile.cpp LogFile.h
206 Remove unneeded include lines
208 Remove unneeded initialization
210 PATCH: [ 1678676 ] Swedish translation of New Copy Confirmation dialog
211 Submitted by Hans Eriksson
212 Src/Languages/Swedish: MergeSwedish.rc
215 Czech translation - translation of "confirm copy" dialog
216 Src/Languages/Czech/MergeCzech.rc
219 PATCH: [ 1664689 ] French translation (update2)
220 Submitted by Jean-F Jolin
221 Src/Languages/French: MergeFrench.rc
222 Remove two unused functions, improve comments
224 BUG: [ 1670991 ] File panes lost focus after delete confirmation dialog
226 Fix comment about contributors file
228 PATCH: [ 1676802 ] Move compare options to DiffContext
229 Src: ByteComparator.cpp ByteComparator.h CompareOptions.cpp CompareOptions.h
230 DiffContext.cpp DiffContext.h DirDoc.cpp DirDoc.h FolderCmp.cpp
233 PATCH: [ 1675087 ] New copy confirmation dialog
234 Src: DirActions.cpp FileActionScript.h Merge.dsp Merge.rc resource.h
235 Src new files: ConfirmFolderCopyDlg.cpp ConfirmFolderCopyDlg.h
236 Src/Languages/*: Merge*.rc
239 PATCH: [ 1675211 ] Fix crash when hiding parent folder item on folder view
243 PATCH: [ 1673908 ] Update of Swedish translation for "View margins"
244 Submitted by Hans Eriksson
245 Src/Languages/Swedish: MergeSwedish.rc
248 PATCH: [ 1673082 ] Polish translation for WM CVS
249 Submitted by dr_prozac
250 Src/Languages/Polish: MergePolish.rc
253 BUG: [ 1668996 ] Two "Copy Right" buttons in Russian GUI.
254 Src/Languages/Russian: MergeRussian.rc
257 PATCH: [ 1664689 ] French translation (update)
258 Submitted by Jean-F Jolin
259 Src/Languages/French: MergeFrench.rc
261 2007-02-27 WinMerge beta release 2.7.2 (revision 4137)
264 Bump ShellExtension version to 1.11
265 ShellExtension: ShellExtension.rc
268 PATCH: [ 1664689 ] French translation
269 Submitted by Jean-F Jolin
270 Src/Languages/French: MergeFrench.rc
273 Czech translation - update
274 Src/Languages/Czech/MergeCzech.rc
277 PATCH: [ 1667564 ] Various Updates in German Translation
278 Src/Languages/German: MergeGerman.rc
281 Cleanup WMGotoDlg constructor
283 CleanUp VSS dialog class
287 BUG: [ 1664731 ] Margin and line numbers not separated
288 Src/editlib: ccrystaltextview.cpp
289 BUG: [ 1664727 ] Empty file compare looks broken
290 Fix revision marks for scratchpads
291 Src/editlib: ccrystaltextview.cpp
292 BUG: [ 1664832 ] Typo Error in the Registry
293 ShellExtension: WinMergeShell.rgs
294 BUG: [ 1666559 ] Error on save option (WinMerge 2.7.1.7)
298 BUG: [ 1664727 ] Empty file compare looks broken
299 Src/editlib: ccrystaltextview.cpp
301 2007-02-20 WinMerge experimental release 2.7.1.7 (SVN revision 4120)
304 PATCH: [ 1663798 ] Add option and menuitem for file compare selection margin
305 Src: Merge.rc MergeEditView.cpp MergeEditView.h OptionsDef.h OptionsInit.cpp
307 Src/editlib: ccrystaltextview.cpp
308 Src/Languages/*: Merge*.rc
309 Remove commented out lines
313 PATCH: [ 1663012 ] Fix total count for compare progress dialog
314 Src: DirCompProgressDlg.cpp DirCompProgressDlg.h
315 Bug: [ 1663197 ] s/inproper/improper [in Changes.txt]
317 PATCH: [ 1642876 ] Open manual for command line help
318 Src: Merge.cpp Merge.h Merge.rc resource.h
319 Src/Languages/*: Merge*.rc
322 Czech translation - update
323 Src/Languages/Czech/MergeCzech.rc
326 PATCH: [ 1662002 ] Use two threads for folder compare
327 Src: Diffcontext.cpp Diffcontext.h DiffThread.cpp DiffThread.h DirScan.cpp
331 PATCH: [ 1640274 ] Icons for folder compare popup menu
332 Src: MainFrm.cpp Merge.dsp Merge.rc resource.h
333 Src/res new files: both.bmp left.bmp left_to_browse.bmp left_to_right.bmp
334 move_left_to_browse.bmp move_right_to_browse.bmp right.bmp
335 right_to_browse.bmp right_to_left.bmp
336 Src/Languages/*: Merge*.rc
339 PATCH: [ 1659183 ] Add Vista security attributes to manifest files
340 Src/res: WinMerge.exe.manifest WinMergeU.exe.manifest
343 PATCH: [ 1657664 ] Swedish translation update for Backup options
344 Submitted by Hans Eriksson
345 Src/Languages/Swedish: MergeSwedish.rc
348 Fix compile with VC6 (doesn't have CString::Append() or CString::AppendChar())
349 Src: MainFrm.cpp PropBackups.cpp
352 PATCH: [ 1650831 ] Polish translation update for WinMerge 2.6.4
353 Submitted by dr_prozac
354 Src/Languages/Polish: MergePolish.rc
357 Add accelerator keys to new Backup options dialog
359 Src/Languages/*: Merge*.rc
362 PATCH: [ 1582537 ] CSS syntax highlighter
364 editlib: ccrystaltextview.cpp ccrystaltextview.h
365 editlib new file: css.cpp
368 PATCH: [ 1652696 ] Add more options for backup files
369 Src: FileActionScript.cpp MainFrm.cpp MainFrm.h Merge.dsp Merge.rc MergeDoc.cpp
370 OptionsDef.h OptionsInit.cpp PropGeneral.cpp PropGeneral.h resource.h
371 Src new files: PropBackups.cpp PropBackups.h
372 Src/Common: PreferencesDlg.cpp PreferencesDlg.h
373 Src/Languages/*: Merge*.rc
376 Remove unused enum definition
384 Remove unused parameter from CMainFrame::SyncFileToVCS()
385 Src: FileActionScript.cpp MainFrm.cpp MainFrm.h
387 2007-02-01 WinMerge experimental release 2.7.1.6 (SVN revision 4094)
390 PATCH: [ 1636314 ] Fix limiting to single file compare window (2)
393 PATCH: [ 1639493 ] Updated Bulgarian language files
394 Submitted by tigertron
395 Src/Languages/Bulgarian: MergeBulgarian.rc
396 Docs/Users/Languages: Readme-Bulgarian.txt
397 PATCH: [ 1650043 ] Convert CDiffWrapper to use CompareOptions
398 Src: CompareOptions.cpp CompareOptions.h DiffWrapper.cpp DiffWrapper.h
399 Remove commented out include line
403 PATCH: [ 1648182 ] Separate Compare options from DiffWrapper
404 Src: CompareOptions.h DiffWrapper.h DirDoc.cpp DirDoc.h Merge.dsp
405 Src new file: CompareOptions.cpp
406 PATCH: [ 1646638 ] Catalan translation update
407 Submitted by Jordi Vilar
408 Src/Languages/Catalan: MergeCatalan.rc
411 Merge7z DllBuild 0019 - Unassociate .exe filename extension from NSIS format
412 ArchiveSupport/Merge7z: Merge7zCommon.cpp Merge7zCommon.h revision.txt
413 Support 7-Zip versions 4.43 & 4.44
414 ArchiveSupport/Merge7z new files: Merge7z443.dsp Merge7z444.dsp
415 ArchiveSupport/Merge7zInstaller: Files.rc2
418 PATCH: [ 1640741 ] patch for BUG:[ 1635100 ] Inefficient word-wrap code
419 Src: MergeEditView.cpp MergeEditView.h
420 Src/edtlib: ccrystaltextview.cpp ccrystaltextview.h
423 PATCH: [ 1644668 ] Fix ANSI regexps(2)
424 Src: DiffWrapper.cpp FileFilterHelper.cpp FilterList.cpp
427 PATCH: [ 1644668 ] Fix ANSI regexps
428 Src: DiffWrapper.cpp FileFilterHelper.cpp FilterList.cpp FilterList.h
429 PATCH: [ 1644820 ] Implement post-compare linefilters for folder compare
430 Src: DiffContext.cpp DiffContext.h DiffThread.cpp DiffThread.h DirDoc.cpp
431 DirDoc.h FolderCmp.cpp FolderCmp.h
434 PATCH: [ 1644785 ] 24bit icons for "Window" menu
435 Based on icons by Alexander Skinner
436 Src/res: cascade.bmp change_pane.bmp close.bmp horizontally.bmp vertically.bmp
437 PATCH: [ 1644800 ] 24bit "Goto" icon
438 Based on icons by Alexander Skinner
442 PATCH: [ 1642809 ] Move compare code out from DiffFileData
443 Src: DiffFileData.cpp DiffFileData.h DiffWrapper.cpp DirScan.cpp
444 DirViewColItems.cpp Merge.dsp
445 Src new files: FolderCmp.cpp FolderCmp.h
448 BUG: [ 1637433 ] Forget selected filter after close
449 Src: Merge.cpp OptionsInit.cpp
452 PATCH: [ 1636314 ] Fix limiting to single file compare window
454 Move options function call out of if() (for easier debugging)
458 PATCH: [ 1620076 ] Add Bazaar and Mercurial to SourceControl.flt
459 Submitted by René Leonhardt
460 Filters: SourceControl.flt
461 Add René Leonhardt to Contributors.txt
462 Docs/Users: Contributors.txt
463 PATCH: [ 1634968 ] Swedish translation update for 2.7.1.5+
464 Submitted by Hans Eriksson
465 Src/Languages/Swedish: MergeSwedish.rc
468 Update manual URL point to 2.6 version manual in readme.txt
469 Docs/Users/ReadMe.txt
470 Docs/Users/Languages/ReadMe-*.txt
471 PATCH: [ 1633581 ] Restrict expanding env variables in open dialog
472 Src: OpenDlg.cpp OpenDlg.h paths.cpp paths.h
475 PATCH: [ 1633194 ] Add editor tab setting to configuration log
476 Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
478 2007-01-10 WinMerge experimental release 2.7.1.5 (SVN revision 4030)
481 PATCH: [ 1631796 ] Use PCRE for filemask filtering
482 Src: DiffWrapper.cpp DirDoc.h FileFilterHelper.cpp FileFilterHelper.h Merge.cpp
483 Merge.dsp Ucs2Utf8.cpp Ucs2Utf8.h
484 Src/Common removed files: Regexp.cpp RegExp.h
485 PATCH: [ 1631806 ] Fix Filterspath initialization
486 Src: MainFrm.cpp MainFrm.h Merge.cpp Merge.h OptionsInit.cpp
489 BUG: [ 1631613 ] WinMerge crashes when editing code files
490 Src/editlib: ccrystaleditview.cpp
493 BUG: [ 1630630 ] Unexpected selection of text after changing pane
494 Src: MergeEditView.cpp
497 PATCH: [ 1597814 ] 'Wrap Lines' + 'Next Diff' Bug (3)
498 Src: MergeEditView.cpp MergeEditView.h
501 PATCH: [ 1631215 ] Remove used files
503 Src/Common deleted: listvwex.cpp listvwex.h
506 PATCH: [ 1593810 ] Line-filtering post compare
507 Src: DiffWrapper.cpp DiffWrapper.h MainFrm.cpp MainFrm.h Merge.dsp MergeDoc.cpp
508 Src new files: FilterList.cpp FilterList.h
511 BUG: [ 1597939 ] Rename Edits Wrong Field in Folder Compare List
515 BUG: [ 1567749 ] "Unable to compare files" needs short result
516 Src: DirViewColItems.cpp Merge.rc resource.h
517 Src/Languages/*: Merge*.rc
520 TODO: [ 1489875 ] Mimimum height for location pane visible area indicator
521 Src: LocationView.cpp
522 TODO: [ 1485038 ] Rename DIFFITEM::IsSideLeft() and IsSideRight()
523 Src: CompareStats.cpp DiffContext.cpp DiffFileData.cpp DiffItem.cpp DiffItem.h
524 DirActions.cpp DirDoc.cpp DirScan.cpp DirView.cpp DirViewColHandler.cpp
526 PATCH: [ 1567773 ] Change "Only in xxxxxxxxxx" to "Right Only: xxxxxxxxxx"
527 Src: DirViewColItems.cpp Merge.rc resource.h
528 Src/Languages/*: Merge*.rc
529 ConvertFilter() function in FileOrFolderSelect can be a static function
530 Src: FileOrFolderSelect.cpp FileOrFolderSelect.h
533 PATCH: [ 1628203 ] Reduce options caching in MergeEditView
534 Src: MergeEditView.cpp MergeEditView.h
535 PATCH: [ 1628299 ] Use OptionsMgr for archive options
537 PATCH: [ 1628263 ] Add debug-menuitem for resetting options
538 Src: MainFrm.cpp MainFrm.h Merge.rc resource.h
539 Src/Languages/*: Merge*.rc
542 PATCH: [ 1625344 ] Move OptionsMgr from MainFrame to MergeApp
543 Src: FileActionScript.cpp MainFrm.cpp MainFrm.h Merge.cpp Merge.h
544 OptionsInit.cpp PropRegistry.cpp PropTextColors.cpp SourceControl.cpp
545 Src/Common: OptionsMgr.h
546 Use Empty() method for CString instead of assigning empty string into it
547 Src/Common: varprop.h
550 PATCH: [ 1625022 ] Constify OptionsManager parameters
551 Src/Common: OptionsMgr.cpp OptionsMgr.h
554 PATCH: [ 1623772 ] Constify PathContext parameter strings
555 Src: PathContext.cpp PathContext.h
557 2006-12-21 WinMerge experimental release 2.7.1.4 (SVN revision 3991)
560 BUG: [ 1603061 ] "Copy Left/Right To .." doesn't work correctly(2)
561 Src: FileActionScript.cpp DirActions.cpp
564 BUG: [ 1606583 ] VC6 build is broken
565 Backout of patch [ 1603769 ] Send MergeCmdLineInfo between instances
566 Src: MainFrm.cpp Merge.cpp MergeCmdLineInfo.cpp MergeCmdLineInfo.h
567 Bump ShellExtension version to 1.10
568 ShellExtension: ShellExtension.rc
569 BUG: [ 1619689 ] Filefilter: ASP.NET Devel
573 PATCH: [ 1618358 ] Fix warning about non-standard extension with enum
575 PATCH: [ 1618364 ] Make GPL URL const string
579 PATCH: [ 1617502 ] Cleanup use of enum in MovedLines
583 BUG: [ 1614558 ] Goto line doesn't work when word wrap is enabled
584 Src: MergeEditView.cpp
587 BUG: [ 1602219 ] Crappy save of project files
588 Src: MainFrm.cpp ProjectFilePathsDlg.cpp
591 PATCH: [ 1614442 ] Swedish translation update for WinMerge 2.6.2
592 Submitted by Hans Eriksson
593 Src/Languages/Swedish: MergeSwedish.rc
596 BUG: [ 1584068 ] location pane is inaccurate when word wrap is on (2)
597 Src: LocationView.cpp LocationView.h MergeEditView.cpp
600 Fix error in logical condition for checking if item is directory
602 PATCH: [ 1610998 ] Splash screen does not stop timer
604 PATCH: [ 1611060 ] Move constants from Merge.cpp to FileOrFolderSelect.cpp
605 Src: FileOrFolderSelect.cpp Merge.cpp
608 BUG: [ 1611542 ] "Wrap lines" does not work for diff pane
609 Src: MergeDiffDetailView.cpp MergeDiffDetailView.h
612 PATCH: [ 1447744 ] Match lines inside diff blocks (based on Perry's patch)
613 Src new files: MergeDocDiffSync.cpp
614 Src: DiffList.h Merge.dsp Merge.rc MergeDoc.cpp MergeDoc.h OptionsDef.h OptionsInit.cpp
615 PropCompare.cpp PropCompare.h resource.h
616 Src/Languages/*: Merge*.rc
619 BUG: [ 1584068 ] location pane is inaccurate when word wrap is on
620 Src: LocationView.cpp LocationView.h MergeEditView.cpp MergeEditView.h
623 BUG: [ 1604115 ] No copyright info in aboutbox for translations
627 BUG: [ 1610877 ] wrong shortcut (localizazion IT, italian)
628 Src/Languages/Italian: MergeItalian.rc
631 PATCH: [ 1610442 ] Make time getting faster for files
632 Src: DirScan.cpp FileInfo.cpp
633 PATCH: [ 1610477 ] Fix UniFile for weird filetimes
634 Src/Common: UniFile.cpp UniFile.h
637 Add missing include to fix ANSI build target
638 Src: FileOrFolderSelect.cpp
640 2006-12-05 WinMerge experimental release 2.7.1.3 (SVN revision 3919)
643 PATCH: [ 1608846 ] Create a class for moved blocks
644 Src: DiffWrapper.cpp DiffWrapper.h Merge.dsp MergeDoc.cpp MergeDoc.h
645 Src new files: MovedLines.cpp MovedLines.h
646 PATCH: [ 1557295 ] Exclude Source Control files and directories filter
647 Submitted by Paul Welter
648 Filters new file: SourceControl.flt
649 Add Peter Welter and Ivan Masár to contributors
650 Docs/Users: Contributors.txt
653 PATCH: [ 1607193 ] INI Syntax Improvements
655 PATCH: [ 1608541 ] Use INI highlighter for VB6 project files
656 Src/editlib: ccrystaltextview.cpp
659 PATCH: [ 1607823 ] Remove manifest loading from lang dlls
660 Src/Languages/*: Merge*.rc
663 PATCH: [ 1597814 ] 'Wrap Lines' + 'Next Diff' Bug (2)
664 Src: MergeEditView.cpp
667 PATCH: [ 1556688 ] Fix maketstring to check for zero-term by MultiByteToWideCha
668 Src: Common/unicoder.cpp
669 PATCH: [ 1606496 ] Slovak translation (update)
670 Submitted by Ivan Masár
671 Src/Languages/Slovak: MergeSlovak.rc
674 Remove commented out code
678 BUG: [ 1589324 ] WinMegee crashes on copy
679 Src: FileFilterMgr.cpp
682 Fix filefilter regexp uppercasing for trunk
683 Src: FileFilterMgr.cpp
686 BUG: [ 1603077 ] Doesn't filter the file vc60.idb using "Merge_VC_loose.flt"
687 Filters: Merge_VC_loose.flt
690 BUG: [ 1603061 ] "Copy Left/Right To .." doesn't work correctly
694 PATCH: [ 1606496 ] Slovak translation
695 Submitted by Ivan Masár
696 ShellExtension/Languages: ShellExtensionSlovak.rc
697 Src/Languages/Slovak: MergeSlovak.rc
700 PATCH: [ 1597814 ] 'Wrap Lines' + 'Next Diff' Bug
701 Src: MergeEditView.cpp
704 PATCH: [ 1605682 ] Add Syntax Highlight option to config log
705 Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
706 PATCH: [ 1556685 ] Avoid infinite loop in character loop in crystal c++ parser
708 Src/editlib: asp.cpp basic.cpp batch.cpp cplusplus.cpp csharp.cpp dcl.cpp fortran.cpp
709 html.cpp innosetup.cpp is.cpp java.cpp lisp.cpp nsis.cpp. pascal.cpp perl.cpp php.cpp
710 python.cpp rexx.cpp rsrc.cpp ruby.cpp sgml.cpp sh.cpp siod.cpp sql.cpp tcl.cpp tex.cpp
714 BUG: [ 1603230 ] DirView icons isn't shown correctly on NT4.0
715 Src/res: equalfile.ico fileskip.ico lfile.ico notequalfile.ico rfile.ico
718 PATCH: [ 1604078 ] Hide skipped items by default
722 PATCH: [ 1603769 ] Send MergeCmdLineInfo between instances
723 Src: MainFrm.cpp Merge.cpp MergeCmdLineInfo.cpp MergeCmdLineInfo.h
726 BUG: [ 1602214 ] Incorrect work with associated files in WinMerge 2.7.1.2
728 PATCH: [ 1603196 ] Allow Open-dialog kind of folder selection for project files
729 Src: FileOrFolderSelect.cpp FileOrFolderSelect.h OpenDlg.cpp OpenDlg.h
732 BUG: [ 1603562 ] Location pane's bar outlines
733 Src: LocationView.cpp
736 Perry is not active developer
737 Docs/Users: Contributors.txt
740 PATCH: [ 1602365 ] Move SelectFile and SelectFolder routines to separate file
741 Src: DirActions.cpp DirCmpReportDlg.cpp FileFiltersDlg.cpp MainFrm.cpp Merge.cpp
742 Merge.dsp Merge.h MergeDoc.cpp OpenDlg.cpp PatchDlg.cpp ProjectFilePathsDlg.cpp
743 PropRegistry.cpp PropVss.cpp
744 Src/Common: PreferencesDlg.cpp
745 Src new files: FileOrFolderSelect.cpp FileOrFolderSelect.h
748 Fix bunch of doxygen warnings (wrong parameter names etc)
749 Src: CmdLineParser.h DiffWrapper.cpp DirDoc.cpp FilepathEdit.cpp files.cpp
750 paths.cpp PropEditor.cpp WMGotoDlg.h
752 2006-11-23 WinMerge experimental release 2.7.1.2 (SVN revision 3844)
755 PATCH: [ 1512881 ] Fix memleak from charsets.c
756 Src: charsets.cp charsets.h Merge.cpp
757 PATCH: [ 1596285 ] Unresolved external symbol __abs64 with VC7.1
758 Submitted by Gal, minor edit by Kimmo
759 Src: StdAfx.cpp StdAfx.h
760 BUG: [ 1584068 ] location pane is inaccurate when word wrap is on
762 Src: LocationView.cpp
765 PATCH: [ 1600714 ] Allow canceling when started from commandline
766 Src: Merge.cpp Merge.h
769 PATCH: [ 1600000 ] Fix project file Has*() functions
770 Src: ProjectFile.cpp ProjectFile.h
773 BUG: [ 1599631 ] WinMerge 2.7.1.1 ignores left dir in project file
777 PATCH: [ 1590831 ] Handle minimize argument (Bug 1570351)
778 Src: MergeDiffDetailView.cpp
779 Src/Common: SplitterWndEx.cpp
782 PATCH: [ 1598194 ] New command line parser
783 Src: MainFrm.cpp Merge.cpp Merge.dsp Merge.h
784 Src added files: ClearCaseCmdLineParser.cpp ClearCaseCmdLineParser.h
785 CmdLineParser.h MergeCmdLineInfo.cpp MergeCmdLineInfo.h
786 WinMergeCmdLineParser.cpp WinMergeCmdLineParser.h
787 Src removed files: CmdArgs.cpp CmdArgs.h MergeArgs.cpp
790 PATCH: Moved white-space trimming to FileFilterHelper class
791 Src: FileFilterHelper.cpp
793 2006-11-16 WinMerge experimental release 2.7.1.1 (SVN revision 3810)
796 PATCH: [ 1596692 ] Change the way modified docs are saved to fix several issues
797 Src: MainFrm.cpp MergeDiffDetailView.cpp MergeDoc.cpp MergeDoc.h
800 BUG: [ 1596285 ] Unresolved external symbol __abs64 with VC7.1
801 Src: StdAfx.cpp StdAfx.h
804 BUG: [ 1594188 ] /x option does not work
808 PATCH: [ 1586689 ] True color bookmark icon
809 Src/editlib: ccrystaltextview.cpp
810 Src/res: mg_icons.bmp
813 PATCH: [ 1590737 ] BCMenu update to v3.036
814 Src: BCMenu.cpp BCMenu.h
817 PATCH: [ 1591532 ] Remove unused XmlDoc class
819 Src removed files: XmlDoc.cpp XmlDoc.h
822 Add PCRE 6.7 (with windows build files from ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Contrib/)
823 New folder: /Externals/pcre
824 PATCH: [ 1591605 ] Add PCRE regexps and convert file filtering to PCRE
825 Src: FileFilterMgr.cpp FileFilterMgr.h Merge.dsp Plugins.cpp
826 Src new files: Ucs2Utf8.cpp Ucs2Utf8.h
829 PATCH: [ 1586705 ] DirView icons (Tim made [not]equalfile.ico)
830 Src/res: equalfile.ico fileskip.ico lfile.ico notequalfile.ico rfile.ico
833 PATCH: [ 1590892 ] Handle unicode paths for project files
837 PATCH: [ 1589427 ] Add back read-only handling for project files
839 PATCH: [ 1589438 ] Add read-only info to ProjectFile dialog
841 PATCH: [ 1589563 ] Fix crash with weird filetimes (and cleanup the code)
842 Src: DiffFileInfo.cpp DiffFileInfo.h DirScan.cpp DirViewColHandler.cpp
843 DirViewColItems.cpp FileInfo.cpp FileInfo.h
846 PATCH: [ 1589601 ] Add "ReDim" keyword to Visual Basic highlighter
847 Src\editlib: basic.cpp
850 Add Expat version 2.0.0 to /Externals/expat (revision: 3749)
851 New folder: /Externals/Expat
852 Add SCEW version 0.4.0 to /Externals/scew (revision: 3750)
853 New folder: /Externals/scew
854 PATCH: [ 1587574 ] Convert project files code to use expat+SCEW
855 Src: Merge.dsp ProjectFile.cpp ProjectFile.h
856 Remove folder: Src/ExpatLib/*
857 PATCH: [ 1588212 ] Add manifest file to resource file
859 Src/Languages/*: Merge*.rc
860 Move files from Installer/InnoSetup: WinMerge.exe.manifest WinMergeU.exe.manifest
864 PATCH: [ 1586869 ] Fix File Select -dialog modality (commit the file I missed in previous commit)
865 Src/Common: PreferencesDlg.cpp
868 PATCH: [ 1586869 ] Fix File Select -dialog modality
869 Src: DirCmpReportDlg.cpp FileFiltersDlg.cpp MainFrm.cpp Merge.cpp Merge.h
870 MergeDoc.cpp PatchDlg.cpp ProjectFilePathsDlg.cpp PropRegistry.cpp PropVss.cpp
871 PATCH: [ 1586892 ] Remove unused unknown.ico and code loading it
872 Src: DirView.cpp Merge.rc resource.h
873 Src/Languages/*: Merge*.rc
874 Remove file: Src/Res: unknown.ico
877 BUG: [ 1418805 ] Menu colors incorrect with non-standard color scheme
881 PATCH: [ 1584004 ] Delete "Toolbar.bmp"
882 Src/res deleted file: Toolbar.bmp
885 Fix compile warnings (some of them 64-bit), remove unused variables and code, fix types
887 Remove unused function, fix improper pointer usage
888 Src: FileFilterHelper.cpp
889 Fix casting a pointer type to DWORD (not 64-bit compatible)
890 Src: DirView.cpp DirView.h
893 PATCH: [ 1578419 ] Fix creating WinMerge folder to MyFolders always
894 Src: MainFrm.cpp MainFrm.h
895 Trivial type fixes, coding style fixes and converting comments to doxygen
896 Src: StdAfx.cpp StdAfx.h
897 Fix misuse of reference parameters (compiler warning)
901 PATCH: [ 1574696 ] Fix problem in saving filefilter to project file
902 Src: ProjectFilePathsDlg.cpp
905 BUG: [ 1573240 ] Crash in subversion trunk
906 Src: MainFrm.cpp MainFrm.h OptionsInit.cpp
909 BUG: [ 1570259 ] Bookmarks GUI get reset after save
910 Src/editlib: ccrystaltextview.cpp
913 BUG: [ 1570173 ] Crash when merging all differences
917 PATCH: [ 1555344 ] Separate active/inactive developers in Contributors.txt
918 Docs/Users: Contributors.txt
921 PATCH: [ 1572359 ] Various Updates in German Translation for WinMerge 2.6
922 Src/Languages/German: MergeGerman.rc
925 PATCH: [ 1570241 ] Various Updates in German Translation for WinMerge 2.6
926 Src/Languages/German: MergeGerman.rc
929 BUG: [ 1566783 ] Crash on Save Project when no file is selected
933 PATCH: [ 1567874 ] Change manual URL to point to 2.6 manual
937 BUG: [ 1564572 ] Leak memory on undoing
938 Src: GhostTextBuffer.h
939 Src/editlib: ccrystaltextbuffer.h
942 PATCH: [ 1565917 ] Register.bat to register ShellExt for 64-bit Windows
943 ShellExtension: Register.bat
944 BUG: [ 1563187 ] Can't close a file compare with -e switch
948 PATCH: [ 1565359 ] Various Updates in German Translation for WinMerge 2.6
949 Src/Languages/German: MergeGerman.rc
952 PATCH: [ 1564857 ] FindAnyFile function doesn't compile with VC6
953 Src/Common: coretools.cpp
956 PATCH: [ 1563171 ] Catalan translation update (Open-dialog)
957 Submitted by Jordi Vilar
958 Src/Languages/Catalan: MergeCatalan.rc
961 BUG: [ 1564283 ] Parameter -x causes files to be closed after merging
965 PATCH: [ 1564280 ] Stack corruption in LanguageSelect
966 Src/Common: LanguageSelect.cpp
969 Couple of type fixes to CMoveConstraint
970 Src/Common: CMoveConstraint.cpp CMoveConstraint.h
971 Fix check for pointer/value by using bit-shift instead of a cast + add trivial typecasts
972 Src: GhostTextBuffer.cpp
973 Src/editlib: ccrystaltextbuffer.cpp
976 PATCH: [ 1563157 ] Fix coretools.cpp for 64-bit
977 Src/Common: coretools.cpp coretools.h
978 Fix type in ccrystaltextbuffer.h
979 Src/editlib: ccrystaltextbuffer.h
980 PATCH: [ 1563171 ] Catalan translation update
981 Submitted by Jordi Vilar
982 Src/Languages/Catalan: MergeCatalan.rc
983 PATCH: [ 1563386 ] Spanish translation update
984 Submitted by Jesus M. Delgado 'Mack'
985 Src/Languages/Spanish: MergeSpanish.rc
986 Quiet warnings from DiffList.cpp
988 Some SPECIAL_ITEM_POS cleanups
989 Src: DirActions.cpp DirDoc.cpp DirView.cpp DirView.h
990 Fix check for pointer/value by using bit-shift instead of a cast
991 Src: GhostTextBuffer.h
992 Src/editlib: ccrystaltextbuffer.h
994 2006-09-21 WinMerge experimental release 2.5.7.1 (SVN revision 3600)
997 PATCH: [ 1558213 ] Tweak text positions in splash screen
999 Bump ShellExtension version to 1.9.0 (first 64-bit Windows version)
1000 ShellExtension: ShellExtension.rc
1001 Fix 64-bit typecast warning
1002 Src: GhostTextBuffer.h
1003 Fix 64-bit pointer truncation in SetWindowLongPtr call (the last I hope)
1005 Minor tweaks to 64-bit ShellExtension project file
1006 ShellExtension: ShellExtensionX64.vcproj
1009 PATCH: [ 1561788 ] Fix 64-bit CFile constructor usage
1010 Src/Common: UniFile.cpp
1011 PATCH: [ 1561796 ] Get/SetWindowLong not supported in 64-bit Windows
1012 Src: 7zCommon.cpp ChildFrm.cpp
1013 Src/Common: CSubclass.cpp sizecbar.cpp
1014 BUG: [ 1561781 ] 64-bit compile errors from 7zCommon.cpp
1016 PATCH: [ 1561650 ] Separate FilterCommentsManager code from DiffWrapper
1017 Src: DiffWrapper.cpp DiffWrapper.h Merge.dsp
1018 Src new files: FilterCommentsManager.cpp FilterCommentsManager.h
1019 Fix 64-bit compile warning by casting last SendMessage() param to LPARAM
1021 Fix hex number used instead of INVALID_HANDLE_VALUE
1022 Src/Common: sinstance.cpp
1023 Fix 64-bit pointer truncation in SetWindowLongPtr call
1027 PATCH: [ 1561001 ] Fix FileActionScript type in running actions
1028 Src: FileActionScript.cpp
1029 PATCH: [ 1561008 ] Warning fix for FileActionScript
1031 PATCH: [ 1561080 ] Cleanup for loglevel definition
1032 Src: DirDoc.cpp DirScan.cpp MainFrm.cpp Plugins.cpp StdAfx.cpp
1033 Src/Common: LogFile.cpp LogFile.h
1036 Cleanup 64-bit ShellExtension projectfile, add a debug target
1037 ShellExtension: ShellExtensionX64.vcproj
1040 PATCH: [ 1559619 ] 64-bit shellextension project file
1041 ShellExtension new files: ShellExtensionX64.def ShellExtensionX64.vcproj
1042 Remove unused variable
1043 Src/editlib: memcombo.cpp
1044 Remove unused variable
1046 Fix typecasting warnings
1047 Src: locality.cpp locality.h MergeDoc.cpp
1048 Remove unused variable
1049 Src: FileActionScript.cpp
1050 Remove unused variable
1051 Src: FileFiltersDlg.cpp
1054 BUG: [ 1558839 ] ShellExtension does not compile as 64-bit
1055 ShellExtension: WinMergeShell.cpp WinMergeShell.h
1056 PATCH: [ 1558893 ] Fix incompatible prototype in MessageBoxDialog
1057 Src/Common: MessageBoxDialog.cpp MessageBoxDialog.h
1058 PATCH: [ 1558913 ] Fix OnTimer prototypes (64-bit compatibility)
1059 Src: ChildFrm.cpp ChildFrm.h DircompProgressDlg.cpp DirCompProgressDlg.h DirView.cpp
1060 Dirview.h MainFrm.cpp MainFrm.h MergeEditview.cpp MergeEditView.h OpenDlg.cpp
1061 Opendlg.h Splash.cpp Splash.h
1062 Src/Common: MessageBoxDialog.cpp MessageBoxDialog.h
1063 Src/editlib: ccrystaltextview2.cpp ccrystaltextview.h
1066 BUG: [ 1547247 ] WinMerge ANSI target does not compile with VS2005
1068 Src: Common/SuperComboBox.cpp
1069 PATCH: [ 1558152 ] Italian translation updated
1070 Submitted by Andrea Decorte
1071 Src/Languages/Italian: MergeItalian.rc
1074 PATCH: [ 1555764 ] prevent from shaking in view when pressing F5 down
1075 Src: GhostTextView.cpp MergeDiffDetailView.cpp
1078 PATCH: [ 1556851 ] An Swedish translation update
1079 Submitted by Hans Eriksson
1080 Src/Languages/Swedish: MergeSwedish.rc
1082 2006-09-11 WinMerge beta release 2.5.6 (revision 3552)
1085 Japanese translation - update
1086 Src/Languages/Japanese: MergeJapanese.rc
1089 PATCH: [ 1555764 ] prevent from shaking in view when pressing F5 down
1090 Src: GhostTextView.cpp GhostTextView.h MergeDiffDetailView.cpp MergeDiffDetailView.h
1093 BUG: [ 1555664 ] fail to copy all to right when enabling moved block detect
1097 Czech translation update from Jan Hryz
1098 Src/Languages/Czech/MergeCzech.rc
1099 PATCH: [ 1553714 ] Add new commandine switches to help dialog
1100 Src: Merge.rc MergeArgs.cpp resource.h
1101 Src/Languages/*: Merge*.rc
1102 PATCH: [ 1552228 ] Don't use 'export' as variable name
1106 RFE: [ 1533506 ] Need commandline switch for single-instance
1110 PATCH: [ 1552901 ] Update VC loose filefilter
1111 Filters: Merge_VC_loose.flt
1112 PATCH: [ 1552917 ] Fix GUI for autocompletion option
1114 Src/Languages/*: Merge*.rc
1117 PATCH: [ 1552095 ] Fix last compare method not visible in GUI list
1119 Src/Languages/*: Merge*.rc
1122 PATCH: [ 1551332 ] defer loading plugin
1123 Src: MainFrm.cpp Merge.rc MergeDoc.cpp MergeEditView.cpp MergeEditView.h
1124 Src/Languages/*: Merge*.rc
1127 BUG: [ 1550427 ] WinMerge 2.5.5.7 don't save "Include subfoders by default"
1128 Src: PropRegistry.cpp
1131 Japanese translation - update
1132 Src/Languages/Japanese: MergeJapanese.rc
1135 PATCH: [ 1544777 ] Compare by size
1136 Forgot to commit Options-dialog changes last time so option for this wasn't visible
1137 Src: PropCompare.cpp
1138 BUG: [ 1547262 ] Suspicious bit shift warning
1140 Src/Common: UniFile.cpp
1143 PATCH: [ 1547190 ] Fix VS2005 compile
1147 BUG: [ 1546938 ] New toolbar icons only works for 'disabled' icons
1148 Src/Languages/*/Merge*.rc
1151 Fix compiling WinMerge after moving folders around (Merge7z moved under ArchiveSupport)
1154 ***** Switch to Subversion *****
1156 2006-08-24 WinMerge experimental release 2.5.5.7 (cvs)
1159 PATCH: [ 1545411 ] Add some missing options to configlog
1160 Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
1161 PATCH: [ 1545165 ] WinMarge Bulgarian Translation
1162 Submitted by tigertron
1163 Src/Languages/Bulgarian: MergeBulgarian.rc
1164 Docs/Users/Languages: Readme-Bulgarian.txt
1165 Docs/Users/Contributors.txt
1166 InnoSetup: WinMerge.iss
1167 ShellExtension: ShellExtension.rc
1168 ShellExtension/Languages: ShellExtensionBulgarian.rc
1169 PATCH: [ 1545890 ] Swedish translation for update for WinMerge 2.5.5.7+
1170 Submitted by Hans Eriksson
1171 Src/Languages/Swedish: MergeSwedish.rc
1172 BUG: [ 1545082 ] Crash when comparing .rc files
1173 Fix submitted by Takashi
1174 Src/editlib: ccrystaltextview.cpp
1177 PATCH: [ 1544905 ] Use stat() to check if file is read-only
1178 Src: files.cpp files.h
1179 PATCH: [ 1544777 ] Compare by size
1180 Src: DiffWrapper.h DirScan.cpp Merge.rc resource.h
1181 Src/Languages/*: Merge*.rc
1184 PATCH: [ 1541427 ] Using as an external diff tool (RFE 1454623)
1185 Src: MainFrm.cpp MainFrm.h MergeArgs.cpp MergeDoc.cpp
1188 PATCH: [ 1544784 ] Use as ClearCase external merge tool
1192 BUG: [ 1543783 ] Misbehave margin draw
1193 Src/editlib: ccrystaltextview.cpp
1196 PATCH: [ 1544147 ] Add Install-feature for file filters
1197 Src: FileFiltersDlg.cpp FileFiltersDlg.h Merge.rc resource.h
1198 Src/Languages/*: Merge*.rc
1199 BUG: [ 1534429 ] Message IDS_SUGGEST_IGNOREEOL incorrect
1203 PATCH: [ 1424673 ] Widen labels on OpenDialog
1206 Src/Languages/*: Merge*.rc
1209 PATCH: [ 1542201 ] Change default user filter folder to WinMerge/Filters
1211 PATCH: [ 1542829 ] Rename Format-item in File-menu to Convert
1213 Src/Languages/*: Merge*.rc
1216 PATCH: [ 1540090 ] Change horizontal scroll synch from relative to absolute
1217 Src/Common: SplitterWndEx.cpp
1220 PATCH: [ 1541158 ] New high-color toolbar icons
1221 Src: BCMenu.cpp MainFrm.cpp MainFrm.h Merge.rc resource.h
1222 Src/res: ToolbarDisabled.bmp ToolbarEnabled.bmp
1225 PATCH: [ 1539568 ] draw icon at modified line (it was changed to line revision marks)
1226 Src: GhostTextBuffer.cpp GhostTextBuffer.h MergeDoc.cpp MergeDoc.h
1227 Src/editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h ccrystaltextview.cpp
1230 PATCH: [ 1456356 ] Scrollbars sometimes not initially active
1234 PATCH: [ 1540129 ] Fix indentation of diffutils io.c
1235 Src/diffutils/src: IO.C
1236 PATCH: [ 1540054 ] Remove Copy All -items from folder compare menu
1238 Src/Languages/*: Merge*.rc
1239 PATCH: [ 1535558 ] Add GUI for shell extension folder include
1240 Src: Merge.rc PropRegistry.cpp PropRegistry.h resource.h
1241 Src/Languages/*: Merge*.rc
1244 BUG: [ 1538340 ] Undo enabled for folder compare.
1245 Src: DirView.h DirView.cpp
1248 Japanese translation - update
1249 Src/Languages/Japanese: MergeJapanese.rc
1252 PATCH: [ 1539204 ] Remove '#' from '#differences' column
1254 Src/Languages/*: Merge*.rc
1257 PATCH: [ 1538264 ] Split DiffFileData class to own files
1258 Src: DiffWrapper.cpp DiffWrapper.h DirScan.cpp DirViewColItems.cpp Merge.dsp
1259 Src new files: DiffFileData.cpp DiffFileData.h
1260 PATCH: [ 1537261 ] Swedish 2.5.5.6+ translation update
1261 Submitted by Hans Eriksson
1262 Src/Languages/Swedish: MergeSwedish.rc
1265 Fix doxygen comment for ImportOptions()
1266 Src/Common: OptionsMgr.cpp
1269 PATCH: Code cleanup. Removed commented out code.
1270 Src/Common: SuperComboBox.cpp
1272 BUG: [ 1531965 ] Crash undoing empty (?) event
1273 Src/editlib: ccrystaleditview.cpp
1276 Czech translation - update
1277 Src/Languages/Czech/MergeCzech.rc
1280 PATCH: [ 1310951 ] Option to copy DirCmpReport to clipboard
1281 Src: DirCmpReport.cpp DirCmpReport.h DirCmpReportDlg.cpp DirCmpReportDlg.h
1283 Src/Languages/*: Merge*.rc
1286 Czech translation - update
1287 Src/Languages/Czech/MergeCzech.rc
1289 2006-08-08 WinMerge experimental release 2.5.5.6 (cvs)
1292 BUG: [ 1535835 ] Import settings from the file
1293 Src/Common: PreferencesDlg.cpp PreferencesDlg.h
1294 PATCH: [ 1536240 ] Fix diff count numbers for real
1295 Src: DiffWrapper.cpp DirScan.cpp
1296 Src/diffutils/src: analyze.c UTIL.c
1299 PATCH: [ 1514487 ] Merge7z DllBuild 0018
1300 Merge7z: Merge7z311.cpp Merge7z409.cpp Merge7zCommon.cpp Merge7zCommon.h
1301 revision.txt Merge7z*.dsp
1302 Merge7z new files: Merge7z433.dsp Merge7z434.dsp Merge7z435.dsp Merge7z436.dsp
1303 Merge7z437.dsp Merge7z438.dsp Merge7z439.dsp Merge7z440.dsp Merge7z442.dsp
1304 Merge7zInstaller: Installer.cpp Installer.rc Files.rc2
1305 Change recommended version of 7-Zip to 4.42
1309 PATCH: [ 1535175 ] Shell ext: Add flag for subfolder inclusion
1310 ShellExtension: WinMergeShell.cpp WinMergeShell.h
1311 Bump ShellExtension version to 1.8.0
1312 ShellExtension: ShellExtension.rc
1315 BUG: [ 1533292 ] crash when specifying nonexistent project file.
1319 PATCH: [ 1534770 ] Add "don't wrap end of file" option for Find
1320 Src: Merge.rc resource.h
1321 Src/editlib: ccrystaleditview.cpp ccrystaltextview.cpp ccrystaltextview.h
1322 ceditreplacedlg.cpp cfindtextdlg.cpp cfindtextdlg.h
1323 Src/Languages/*: Merge*.rc
1324 BUG: [ 1534461 ] WinMerge 2.5.5.5 ingoring subfolders option in project files
1325 Src: MainFrm.cpp Merge.cpp
1328 Czech translation - update
1329 Src/Languages/Czech/MergeCzech.rc
1331 2006-08-03 WinMerge experimental release 2.5.5.5 (cvs)
1334 PATCH: [ 1533457 ] Add Refresh Selected -item to Folder compare main menu
1335 Src: DirActions.cpp DirView.cpp DirView.h Merge.rc
1336 Src/Languages/*: Merge*.rc
1339 PATCH: [ 1532743 ] Improve difference count columns in folder compare
1340 Src: DiffItem.h DiffItemList.cpp DirScan.cpp DirVierwColItems.cpp
1342 Src/Languages/*: Merge*.rc
1343 PATCH: [ 1529864 ] Stop using Application Data folders as filefilter folders
1344 Src: FileFilterHelper.cpp FileFilterHelper.h
1347 PATCH: [ 1531845 ] Fix memory leak after find
1348 Src/editlib: ccrystaltextview.cpp
1349 PATCH: [ 1531957 ] Fix imagelist memory leak in editor
1350 Src/editlib: ccrystaltextview.cpp
1351 PATCH: [ 1430331 ] New Debug menu
1352 Submitted by Perry, modified by me
1353 Src: MainFrm.cpp MainFrm.h Merge.rc resource.h
1354 Src/Languages/*: Merge*.rc
1355 PATCH: [ 1531319 ] Tidy Folder compare progress dialog
1357 Src/Languages/*: Merge*.rc
1360 PATCH: [ 1531293 ] Fix wrong cursor position after find
1361 Src: ccrystaltextview.cpp ccrystaltextview.h cfindtextdlg.cpp
1362 PATCH: [ 1406051 ] code cleanup for ScriptFileActions
1364 Src: DirActions.cpp FileActionScript.cpp FileActionScript.h
1365 PATCH: [ 1530459 ] Add some doxygen comments for ViewableWhitespace
1366 Src: ViewableWhitespace.cpp ViewableWhitespace.h
1369 BUG: [ 1528322 ] Crash when using F6 / Bugg for file differences
1370 Src: MergeEditView.cpp
1373 PATCH: [ 1530352 ] Start flashing WinMerge window when folder compare is ready
1374 Src: DirView.cpp MainFrm.cpp MainFrm.h
1375 PATCH: [ 1529995 ] Swedish translation update for 2.5.5.4+
1376 Submitted by Hans Eriksson
1377 Src/Languages/Swedish: MergeSwedish.rc
1378 PATCH: [ 1530655 ] Catalan translation update
1379 Submitted by Jordi Vilar
1380 Src/Languages/Catalan: MergeCatalan.rc
1383 PATCH: [ 1529915 ] Refresh menu on DirView does not work correctly
1384 Src: DirActions.cpp DirScan.cpp
1387 PATCH: [ 1529599 ] Cleanup DiffWrapper
1388 Src: DiffWrapper.cpp DiffWrapper.h MergeDoc.cpp PatchTool.cpp
1389 PATCH: [ 1529965 ] Add error messages for managing file filters
1390 Src: FileFiltersDlg.cpp FileFiltersDlg.h Merge.rc resource.h
1391 Src/Languages/*: Merge*.rc
1394 PATCH: [ 1527843 ] prevent dialog from flickering
1395 Src: DirCompProgressDlg.cpp DirView.cpp
1396 Src/Common: CMoveConstraint.cpp
1399 PATCH: [ 1528841 ] Cleanup ByteComparator
1400 Src: ByteComparator.cpp ByteComparator.h FileTextStats.h
1401 PATCH: [ 1528987 ] Use 64-bit variable as file position in Bytecompare
1402 Src: ByteComparator.cpp ByteComparator.h DiffWrapper.cpp FileTextStats.h
1403 PATCH: [ 1529053 ] Success message for loading/saving project file
1404 Src: Merge.rc ProjectFilePathsDlg.cpp resource.h
1405 Src/Languages/*: Merge*.rc
1408 PATCH: [ 1528444 ] Cleanup for AppSerialize
1409 Src: AppSerialize.cpp AppSerialize.h
1412 PATCH: [ 1527771 ] Remove Apply syntax highlight to other side option
1413 Src: Merge.rc MergeDoc.cpp OptionsDef.h OptionsInit.cpp PropEditor.cpp
1414 PropEditor.h resource.h
1415 Src/Languages/*: Merge*.rc
1418 PATCH: [ 1527947 ] Various Updates in German Translation for WinMerge 2.5
1419 Src/Languages/German: MergeGerman.rc
1422 PATCH: [ 1526918 ] Detect which side file is binary file
1423 Src: DiffItem.h DiffWrapper.cpp DiffWrapper.h
1424 Src/diffutils/src: DIFF.H IO.c analyze.c
1426 2006-07-20 WinMerge experimental release 2.5.5.4 (cvs)
1429 PATCH: [ 1525013 ] Add description for ASP.NET filter
1431 PATCH: [ 1525417 ] Move MovedBlock code to own file
1432 Src: DiffWrapper.cpp Merge.dsp
1433 Src new file: MovedBlocks.cpp
1434 PATCH: [ 1525531 ] Allow comparing project files from Open-dialog
1436 Config log files are .txt files (not .log)
1438 BUG: [ 1495212 ] Wrong cursor position after selecting wordwrapped line
1440 Src/editlib: ccrystaltextview.cpp
1443 Czech translation - update
1444 Src/Languages/Czech/MergeCzech.rc
1447 BUG: [ 1198248 ] version copyright symbol needs review
1448 Src/Languages/*: MergeChineseSimplified.rc MergeChineseTraditional.rc MergeJapanese.rc
1452 BUG: [ 1525451 ] ASSERT in CCrystalTextView::DrawSingleLine()
1453 Src/editlib: ccrystaltextview.cpp
1454 BUG: [ 1525466 ] ASSERT in CCrystalTextView::AssertValidTextPos()
1455 Src/editlib: ccrystaltextview2.cpp
1458 BUG: [ 1524832 ] Bogus include's
1459 Src: DirColsDlg.cpp PropEditor.cpp
1460 PATCH: [ 1522037 ] Add read-only option for paths in Project file
1461 Src: MainFrm.cpp Merge.cpp Merge.rc OpenDlg.cpp OpenDlg.h ProjectFile.cpp
1462 ProjectFile.h ProjectFilePathsDlg.cpp ProjectFilePathsDlg.h resource.h
1463 Src/Languages/*: Merge*.rc
1464 PATCH: [ 1525025 ] Copy/paste error in MainFrm.cpp
1466 PATCH: [ 1525198 ] Version info misses copyright (c) char
1470 Fix and improve comment for folder compare columns table
1472 BUG: [ 1524251 ] File filter does not work on 2.5.5.3
1473 Original fix from Takashi, modified by Kimmo
1474 Src: FileFilterMgr.cpp
1477 PATCH: [ 1517057 ] Option to Ignore Multiline Comments (bugfix for single-line comments)
1478 Submitted by David Maisonave
1479 Src: DiffWrapper.cpp
1482 Strip SuperComboBox strings before saving
1483 Src/Common: SuperComboBox.cpp
1485 2006-07-14 WinMerge experimental release 2.5.5.3 (cvs)
1488 BUG: [ 1521555 ] Location Pane - can't see current location because of color
1489 Use 3d-color instead of scrollbar color in location pane
1490 Src: LocationView.cpp
1491 PATCH: [ 1521696 ] Improve Text color option dialog
1492 Src: Merge.rc PropTextColors.cpp PropTextColors.h
1493 Src/Languages/*: Merge*.rc
1496 PATCH: [ 1521352 ] Cleanup char constants for CRegExep
1497 Src/Common: RegExp.cpp
1498 PATCH: [ 1521392 ] Fix reading last line in linefilter file
1499 Src: FileFilterMgr.cpp
1500 BUG: [ 1498511 ] Conflict accelerator key in IDR_DIRVIEWMENU
1502 Src/Languages/*: Merge*.rc
1503 PATCH: [ 1517057 ] Option to Ignore Multiline Comments (bugfix + rename to filtering)
1504 Submitted by David Maisonave
1505 Src: DiffWrapper.cpp DiffWrapper.h DirDoc.cpp MainFrm.cpp Merge.rc MergeDoc.cpp
1506 OptionsDef.h OptionsInit.cpp PropCompare.cpp Propcompare.h resource.h
1507 Src/Languages/*: Merge*.rc
1508 PATCH: [ 1517057 ] Option to Ignore Multiline Comments (bugfix)
1509 Submitted by David Maisonave
1510 Src: DiffWrapper.cpp
1513 PATCH: [ 1517057 ] Option to Ignore Multiline Comments
1514 Submitted by David Maisonave
1515 Src: DiffWrapper.cpp DiffWrapper.h DirDoc.cpp MainFrm.cpp Merge.rc MergeDoc.cpp
1516 OptionsDef.h OptionsInit.cpp PatchTool.cpp PropCompare.cpp Propcompare.h
1518 Src/Languages/*: Merge*.rc
1519 Add Ed_K and David Maisonave to Contributors
1520 Docs/Users: Contributors.txt
1521 Document UniMemFile::ReadString() function parameters and return values
1522 Src/Common: UniFile.cpp
1525 Quiet warning about deprecated function for VS2003 and later
1529 PATCH: [ 1517362 ] Ensure diff is visible in location view
1530 Src: LocationView.cpp
1531 Fix codinstyle in LocationView.cpp (messed up by patch #1517362)
1532 Src: LocationView.cpp
1533 Make VS2005 build less noisy by defining _CRT_SECURE_NO_DEPRECATE for it
1537 PATCH: [ 1516626 ] Enable double-click in column customization dialog
1538 Src: DirColsDlg.cpp DirColsDlg.h
1539 PATCH: [ 1514435 ] Optimize versioninfo reading
1540 Src: AboutDlg.cpp ConfigLog.cpp Splash.cpp
1541 Src/Common: version.cpp version.h
1544 BUG: [ 1303166 ] crash or freeze on closing all window
1547 2006-07-03 WinMerge experimental release 2.5.5.2 (cvs)
1550 PATCH: [ 1515380 ] Page Up/Down Anomaly
1552 Src/editlib: ccrystaltextview2.cpp
1553 PATCH: [ 1515966 ] Use View-IDs in MergeDoc.cpp
1554 Src: MergeDoc.cpp MergeDoc.h
1555 PATCH: [ 1516016 ] Fix poor handling of invalid tab size in Options-dialog
1556 Src: Merge.rc PropEditor.cpp PropEditor.h resource.h
1557 Src/Languages/*: Merge*.rc
1558 Fix comment in DiffList.cpp
1562 PATCH: [ 1515669 ] Add selected difference marker for locationview
1563 Src: LocationView.cpp LocationView.h
1566 PATCH: [ 1514459 ] Cleanup for LocationView code (use view ID)
1567 Src: LocationView.cpp LocationView.h StdAfx.h
1568 PATCH: [ 1514580 ] Tweak location view bar look
1569 Src: LocationView.cpp
1572 PATCH: [ 1514645 ] Various Updates in German Translation for WinMerge 2.5
1573 Src/Languages/German: MergeGerman.rc
1576 PATCH: [ 1513618 ] Fix Merge.rc translation id
1580 PATCH: [ 1512708 ] Fix compile with VS2005
1581 Also additional cleanup for CCrystalTextView::GetMarginWidth()
1582 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
1583 PATCH: [ 1512726 ] Fix combining filesize from two values
1584 Src: DiffFileInfo.cpp DirScan.cpp FileInfo.cpp FileInfo.h
1585 PATCH: [ 1512775 ] Fix encoding columns showing -1
1586 Src: FileTextEncoding.cpp FileTextEncoding.h
1589 PATCH: [ 1510596 ] Updated Readme-Swedish.txt
1590 Submitted by Hans Eriksson
1591 Docs/Users/Languages: ReadMe-Swedish.txt
1592 PATCH: [ 1510600 ] Updated MergeSwedish.rc file for 2.5.5.1+
1593 Submitted by Hans Eriksson
1594 Src/Languages/Swedish: MergeSwedish.rc
1595 BUG: [ 1483242 ] Needless resource file 'MergeSwedish_LastTranslation.rc'?
1596 Remove unneeded file
1597 Removed: Src/Languages/Swedish: MergeSwedish_LastTranslation.rc
1598 BUG: [ 1489034 ] Src/Common/LanguageSelect.rc unused?
1599 Remove unneeded file
1600 Removed: Src/Common/LanguageSelect.rc
1601 Remove unused files (language.h & language.c)
1602 Removed: Src: language.c language.h
1604 2006-06-21 WinMerge experimental release 2.5.5.1 (cvs)
1607 PATCH: [ 1509505 ] Manual: new compare method and options export/import
1608 Docs/Users/Manual: Configuration.xml
1609 Bump manual revision to 1.2.4
1610 Docs/Users/Manual: WinMerge_help.xml
1611 Bump ShellExtension version to 1.7.2
1612 ShellExtension: ShellExtension.rc
1615 BUG: [ 1505763 ] Crash after closing file compare window
1616 Src: MergeEditView.cpp
1617 PATCH: [ 1508865 ] Improve error handling for loading file filters
1618 Src: FileFilterHelper.cpp FileFilterMgr.cpp FileFilterMgr.h FileFiltersDlg.cpp
1620 PATCH: [ 1508898 ] Show binary as one of EOL types
1621 Src: DirViewColItems.cpp Merge.rc resource.h
1622 Src/Languages/*: Merge*.rc
1623 PATCH: [ 1506184 ] Polish translation update for WM 2.5.4.0
1624 Submitted by dr_prozac
1625 Src/Languages/Polish: MergePolish.rc
1626 PATCH:[ 1509495 ] Polish translation for ShellExtension
1627 Submitted by dr_prozac
1628 ShellExtension/Languages: ShellExtensionPolish.rc
1631 RFE: [ 1499245 ] Ruby Syntax Highlighting
1633 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h ruby.cpp
1636 BUG: [ 1494776 ] Can't rename files if '|' seperator exists
1637 Src: DirView.h DirView.cpp DirActions.cpp
1640 BUG: [ 1486434 ] Copy Pathnames for right-only dir copies parent dir only
1644 PATCH: [ 1483544 ] New compare method: by date and size
1645 Src: DiffWrapper.h DirScan.cpp Merge.rc PropCompare.cpp resource.h
1646 Src/Languages/*: Merge*.rc
1649 BUG: [ 1496066 ] WinMerge crashed with those files
1650 Src: GhostTextView.cpp GhostTextView.h
1653 BUG: [ 1494610 ] Wrong selection in ccrystalview2.cpp
1654 Src/editlib: ccrystaltextview2.cpp
1655 PATCH: [ 1497817 ] Cleanup CCrystalTextView::GetLineBySubLine
1656 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
1659 PATCH: [ 1497154 ] Fix memory leak in wordwrap code
1660 Src/editlib: ccrystaltextview.cpp
1661 PATCH: [ 1497068 ] Initialize cursorpositions in GhostTextView
1662 Src: GhostTextView.h
1663 PATCH: [ 1497147 ] Cleanup CCrystalTextView::ClientToText
1664 Src/editlib: ccrystaltextview.cpp
1667 BUG: [ 1494610 ] Wrong selection in ccrystalview2.cpp
1669 Src/editlib: ccrystaltextview2.cpp
1672 PATCH: [ 1495017 ] Translate 'Textcolors' options to German
1673 Src/Languages/German: MergeGerman.rc
1676 PATCH: [ 1494627 ] Skip processing empty paths in Open dialog
1678 Doxygen comments and trivial cleanups for paths.cpp & paths.h
1679 Src: paths.cpp paths.h
1682 PATCH: [ 1493742 ] Limit vertical scrolling to last line of files
1683 Src/editlib: ccrystaltextview.cpp
1684 PATCH: [ 1493868 ] Add bookmark by double-clicking selection frame
1685 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h ccrystaltextview2.cpp
1686 PATCH: [ 1492458 ] Swedish translation update for 2.5.4.0
1687 Submitted by Hans Eriksson
1688 Src/Languages/Swedish: MergeSwedish.rc
1689 Add some const keywords and fix comments, remove unused function.
1690 Src: DiffList.cpp DiffList.h
1691 BUG: [ 1488797 ] ASSERT in CMergeEditView::OnPrevdiff
1693 Src: MergeEditView.cpp
1696 PATCH: [ 1493713 ] Translate 'Bookmarks' feature to German
1697 Src/Languages/German: MergeGerman.rc
1700 PATCH: [ 1491436 ] Spanish Readme.txt
1701 Submitted by Jesus M. Delgado 'Mack'
1702 Docs/Users/Languages new file: ReadMe-Spanish.txt
1703 InnoSetup: WinMerge.iss
1706 PATCH: [ 1491993 ] Ability to rename files (RFE 1380228)
1707 Src: DirActions.cpp DirView.cpp DirView.h Merge.rc resource.h
1710 PATCH: [ 1491212 ] Czech Translation
1711 Submitted by: Jan Hryz
1712 Src/Languages/Czech/MergeCzec.rc
1713 PATCH: [ 1492025 ] Catalan translation update
1714 Submitted by Jordi Vilar
1715 Src/Languages/Catalan: MergeCatalan.rc
1716 PATCH: [ 1491424 ] Spanish translation for v2.5.3.7
1717 Submitted by Jesus M. Delgado 'Mack'
1718 Languages/Spanish: MergeSpanish.rc
1720 2006-05-18 WinMerge beta release 2.5.4
1723 PATCH: [ 1490540 ] Manual: add picture and explanation about our version tree
1724 Docs/Users/Manual: Introduction.xml
1725 Docs/Users/Manual/build: build_html.bat build_htmlhelp.bat
1726 Docs/Users/Manual/Art new files: WinMerge_versions.gif WinMerge_versions.odg
1729 PATCH: [ 1489824 ] Better default folder for user filters
1731 BUG: [ 1445975 ] BuildDll.bat exit is not good
1732 Src/Languages: BuildDll.bat
1733 PATCH: [ 1488387 ] Russian translation update for 2.4.6
1734 Submitted by Dmitriy Aleshkowskiy
1735 Src/Languages/Russian: MergeRussian.rc
1738 PATCH: [ 1489133 ] Manual: document new filter location(s)
1739 Docs/Users/Manual: Filters.xml
1740 PATCH: [ 1489091 ] Enable Help/Index
1742 PATCH: [ 1489098 ] Doesn't open Help TOC correctly
1744 BUG: [ 1487856 ] Long delay if many language dlls
1746 Src/Common: LanguageSelect.cpp LanguageSelect.h
1747 BUG: [ 1487854 ] ASSERT in CCrystalTextView::OnPrint
1748 Fix suggested by Mallato
1749 Src/editlib: ccrystaltextview.cpp
1750 Graphic Design: Alexander Skinner
1751 Docs/Users: Contributors.txt
1752 BUG: [ 1478057 ] Memory leak when cancelling print preview
1753 Fix suggested by Mallato
1754 Src/editlib: ccrystaltextview.cpp
1757 PATCH: [ 1488637 ] PHP/ASP Syntax Highlighting Fix (Bug 1441643)
1758 Src/editlib: asp.cpp php.cpp
1761 PATCH: [ 1485861 ] Czech translation - update
1762 Submitted by: Jan Hryz
1763 Src/Languages/Czech/MergeCzec.rc
1764 PATCH: [ 1483553 ] Swedish MergeSwedish.rc 1.304 2.5.3.7 update
1765 Submitted by Hans Eriksson
1766 Src/Languages/Swedish: MergeSwedish.rc
1767 PATCH: [ 1484004 ] Manual: new Open-dialog screenshot and small fixes
1768 Docs/Users/Manual: Quick_start.xml
1769 Docs/Users/Manual/screenshots: OpenDlg1.gif
1770 PATCH: [ 1484013 ] Manual: small changes to Introduction chapter
1771 Docs/Users/Manual: Introduction.xml
1772 PATCH: [ 1484092 ] Manual: preliminary whats new list for 2.5
1773 Docs/Users/Manual: Whatsnew_2_1.xml
1774 PATCH: [ 1484101 ] Manual: Add index
1775 Docs/Users/Manual: WinMerge_help.xml
1776 PATCH: [ 1484142 ] Manual: update some options descriptions
1777 Docs/Users/Manual: Configuration.xml
1780 PATCH: [ 1483344 ] Fix creating private file filters
1781 Src: FileFiltersDlg.cpp
1782 PATCH: [ 1483486 ] Add commenting for CLogFile
1783 Src/Common: LogFile.cpp LogFile.h
1786 PATCH: [ 1483107 ] Remove dublicated code from folder compare progress dlg
1787 Src: DirCompProgressDlg.cpp DirCompProgressDlg.h
1788 PATCH: [ 1483088 ] Add GUI for user to select filter folder
1789 Src: FileFilterHelper.cpp FileFilterHelper.h FileFiltersDlg.cpp MainFrm.cpp Merge.rc
1790 OptionsDef.h OptionsInit.cpp paths.cpp paths.h PropRegistry.cpp PropRegistry.h
1792 Src/Languages/*: Merge*.rc
1795 BUG: [ 1481053 ] Options: Text Colors should use 3D-Look too
1797 Src/Languages/*: Merge*.rc
1798 PATCH: [ 1482352 ] Icons for 'Bookmarks' feature
1799 Src: MainFrm.cpp Merge.rc resource.h
1800 Src/res new files: clear_bookmarks.bmp next_bookmark.bmp prev_bookmark.bmp
1802 Src/Languages/*: Merge*.rc
1805 BUG: [ 1363364 ] DisplayBinaryFiles extension list wrong
1806 Also bump version of plugin to 1.0.3.0
1807 Plugins/src_VCPP/DisplayBinaryFiles: ChangeLog.txt DisplayBinaryFiles.rc WinMergeScript.cpp
1808 Plugins/dlls: DisplayBinaryFiles.dll
1811 PATCH: [ 1482411 ] Add line before 'Open Project' in main menu
1813 Src/Languages/*: Merge*.rc
1816 PATCH: [ 1482688 ] sgml.cpp contains "lt" twice
1817 Src/editlib: sgml.cpp
1818 PATCH: [ 1482694 ] xml.cpp contains "lt" twice
1819 Src/editlib: xml.cpp
1820 PATCH: [ 1482765 ] Fix closing folder compare progress dialog
1821 Src: DirCompProgressDlg.cpp DirCompProgressDlg.h DirView.cpp
1823 2006-05-04 WinMerge experimental release 2.5.3.7 (cvs)
1826 PATCH: [ 1481213 ] Fix foldercompare short-size suffixes and localize them
1827 Src: DirViewColItems.cpp Merge.rc resource.h
1828 Src/Languages/*: Merge*.rc
1829 PATCH: [ 1481391 ] Make LocationView update from MergeView more safe
1830 Src: LocationView.cpp MergeEditView.cpp MergeEditView.h
1831 BUG: [ 1456356 ] Scrollbars sometimes not initially active
1832 Another possible fix..
1833 Src/editlib: ccrystaltextview.cpp
1836 PATCH: [ 1480652 ] Small fix for XML syntax highlight
1837 Src/editlib: xml.cpp
1840 PATCH: [ 1479007 ] WinMerge Icon Set Revision 3
1841 Submitted by Alexander Skinner
1843 BUG: [ 1474782 ] Crash when comparing SQL with with binary data
1844 Fix suggested by anonymous submitter
1845 Src/editlib: asp.cpp basic.cpp batch.cpp cplusplus.cpp csharp.cpp dcl.cpp
1846 fortran.cpp html.cpp ini.cpp innosetup.cpp is.cpp java.cpp lisp.cpp nsis.cpp
1847 pascal.cpp perl.cpp php.cpp python.cpp rexx.cpp rsrc.cpp sgml.cpp sh.cpp
1848 siod.cpp sql.cpp tcl.cpp tex.cpp xml.cpp
1849 PATCH: [ 1471835 ] Fix setting filename in folder-compare report dialog
1850 Fix bug in the original patch
1851 Src: DirCmpReportDlg.cpp
1854 PATCH: [ 1475649 ] Enable selection margin and line numbers
1855 Src/res new file: mg_icons.bmp
1858 PATCH: [ 1475649 ] Enable selection margin and line numbers
1859 Src: GhostTextView.cpp GhostTextView.h Merge.rc MergeEditView.cpp
1860 MergeEditView.h OptionsDef.h OptionsInit.cpp resource.h
1861 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h editcmd.h
1862 Src/Languages/*: Merge*.rc
1865 PATCH: [ 1477957 ] Fix 'Help' button position in German translation
1866 Src/Languages/German: MergeGerman.rc
1869 PATCH: [ 1476279 ] Cleanup CDiffContext::UpdateInfoFromDiskHalf() and its usage
1870 Src: Diffcontext.cpp DiffContext.h DirScan.cpp DirViewColItems.cpp
1873 PATCH: [ 1475776 ] Optimize dirview UI updates
1874 Src: DirActions.cpp DirDoc.cpp DirDoc.h
1875 PATCH: [ 1472622 ] Czech translation - update (more dialog fixes)
1876 Submitted by: Jan Hryz
1877 Src/Languages/*: Merge*.rc
1880 PATCH: [ 1474884 ] Fix XmlDoc not releasing file handles
1881 Src: XmlDoc.cpp XmlDoc.h
1882 PATCH: [ 1475092 ] Add DocumentsLoaded() to MergeDiffDetailView
1883 Src: MergeDiffDetailView.cpp MergeDiffDetailView.h MergeDoc.cpp
1884 Gal Hammer is now a developer
1885 Docs/Users: Contributors.txt
1888 PATCH: [ 1473902 ] Add dialog for editing and saving project files
1889 Src: DirDoc.cpp DirDoc.h MainFrm.cpp MainFrm.h Merge.dsp Merge.rc MergeDoc.cpp
1890 MergeDoc.h resource.h
1891 Src new files: ProjectFilePathsDlg.cpp ProjectFilePathsDlg.h
1892 Src/Languages/*: Merge*.rc
1893 PATCH: [ 1472622 ] Czech translation - update
1894 Submitted by: Jan Hryz
1895 Src/Languages/Czech/MergeCzec.rc
1896 PATCH: [ 1472622 ] Czech translation - update (apply dialog fixes)
1897 Submitted by: Jan Hryz
1898 Src/Languages/*: Merge*.rc
1901 PATCH: [ 1473635 ] Move some results update code to DirDoc
1902 Src: DirActions.cpp DirDoc.cpp DirDoc.h
1903 PATCH: [ 1468691 ] Center folder compare status dialog to mainframe
1904 Adding line I missed previous time applying the patch (2006-04-12)
1908 TODO: [ 1469363 ] Need image for aborted status in folder compare
1910 Src: DirView.cpp Merge.rc resource.h
1911 Src/res new file: aborted.ico
1912 Src/Languages/*: Merge*.rc
1913 PATCH: [ 1400653 ] Write project files using objects
1915 Src: Merge.dsp ProjectFile.cpp ProjectFile.h
1916 Src new files: XmlDoc.cpp XmlDoc.h
1919 PATCH: [ 1471835 ] Fix setting filename in folder-compare report dialog
1920 Src: DirCmpReportDlg.cpp DirCmpReportDlg.h
1923 PATCH: [ 1445996 ] Fix wrong PgDown scrolling after mousescroll(2)
1924 Src/editlib: ccrystaltextview2.cpp
1926 2006-04-12 WinMerge experimental release 2.5.3.6 (cvs)
1929 PATCH: [ 1468691 ] Center folder compare status dialog to mainframe
1931 PaTCH: [ 1468783 ] Fix disabled scrollbars after loading files
1932 Src: MergeDoc.cpp MergeEditView.cpp MergeEditView.h
1935 PATCH: [ 1467872 ] Fix diff navigation for first-line of diff
1936 Src: MergeEditView.cpp
1937 PATCH: [ 1443719 ] xml output reports
1938 Submitted by Perry, modified by me
1939 Src: DirCmpReport.cpp DirCmpReport.h DirCmpReportDlg.cpp DirCmpReportDlg.h
1940 DirView.cpp DirView.h Merge.dsp Merge.rc resource.h
1941 Src new file: DirReportTypes.h
1944 PATCH: [ 1467305 ] Beep when long compare is ready
1945 Src: DirView.cpp DirView.h
1948 BUG: [ 1461375 ] Forgot old patch #981526 for sgml.cpp, sh.cpp and tcl.cpp?
1949 Src\editlib: sgml.cpp sh.cpp tcl.cpp
1952 BUG: [ 1383719 ] ShellExtension resources opening in IDE fails
1954 ShellExtension/Languages/*.rc
1955 BUG: [ 1465893 ] Compile error with VC6 (SuperComboBox.cpp)
1957 Src/Common: SuperComboBox.cpp
1960 BUG: [ 1463137 ] MergeArgs.h is empty file?
1963 Src removed file: MergeArgs.h
1966 PATCH: [ 1461896 ] Syntax highlighting of HTML for ASP not complete
1967 Src\editlib: asp.cpp
1970 PATCH: [ 1460749 ] Print relative paths to patch files
1971 Src: DiffWrapper.cpp DiffWrapper.h MainFrm.cpp MergeDoc.cpp PatchDlg.h
1972 PatchTool.cpp PatchTool.h
1973 BUG: [ 1461328 ] Commandline handling overwrites flags?
1976 BUG: [ 1460236 ] Splash localization is broken
1977 Src: Merge.rc resource.h Splash.cpp
1978 Src/Languages/*: Merge*.rc
1979 PATCH: [ 1445426 ] Clear PrivateBuild flag in SetResourceVersions.wsf
1981 Src: SetResourceVersions.wsf
1984 BUG: [ 1458714 ] [Replace All] doesn't work
1985 Src/editlib: ceditreplacedlg.cpp
1988 PATCH: [ 1459284 ] Update of MergeSwedish.rc for WinMerge 2.5.3.5+
1989 Submitted by Hans Eriksson
1990 Src/Languages/Swedish: MergeSwedish.rc
1991 PATCH: [ 1458852 ] Fix UI for multiple file patches
1992 Src: PatchDlg.cpp PatchDlg.h
1993 PATCH: [ 1441718 ] Auto Complete on files or folders selection
1994 Submitted by Gal Hammer
1995 Src/Common: SuperComboBox.cpp SupercompoBox.h
1996 Src: Merge.rc OpenDlg.cpp OptionsDef.h OptionsInit.cpp PropGeneral.cpp
1997 PropGeneral.h resource.h
1998 Src/Languages/*: Merge*.rc
2001 PATCH: [ 1458066 ] Use / as path delimiter in patch files
2002 Src: DiffWrapper.cpp
2003 PATCH: [ 1406944 ] Compute text statistics in QuickCompare
2004 Src new file: FileTextStats.h
2007 PATCH: [ 1457203 ] Create patch from multiple files in folder compare
2008 Src: DirView.cpp DirView.h MainFrm.cpp
2011 PATCH: [ 1457306 ] Revamped Visual Basic syntax highlighter
2012 Src\editlib: basic.cpp
2015 BUG: [ 1455656 ] GPL text still contains 'How to Apply These Terms...'
2018 2006-03-22 WinMerge experimental release 2.5.3.5 (cvs)
2021 PATCH: [ 1455706 ] Catalan translation update
2022 Submitted by Jordi Vilar
2023 Src/Languages/Catalan: MergeCatalan.rc
2024 PATCH: [ 1406944 ] Compute text statistics in QuickCompare
2025 Src: ByteComparator.cpp ByteComparator.h DiffFileInfo.cpp DiffFileInfo.h DiffWrapper.cpp
2026 Diffwrapper.h DirScan.cpp DirViewColItems.cpp Merge.dsp Merge.rc resource.h
2027 Src/diffutils/src: DIFF.H IO.C
2028 Src/Languages/*: Merge*.rc
2031 PATCH: [ 1455663 ] Add new keywords to Visual Basic highlighter
2032 Src\editlib: basic.cpp
2035 PATCH: [ 1448599 ] WinMerge Program Icon Set
2036 Submitted by Alexander Skinner
2038 PATCH: [ 1452288 ] Add ASP.NET filefilter
2039 By By Jon Galloway and Josh Blair
2040 Filters new file: ASPNET.flt
2041 PATCH: [ 1454720 ] Fix resizable dialogs missing captionbar close button
2043 Src/Languages/*: Merge*.rc
2044 PATCH: [ 1455430 ] New Splash Screen Revision 2
2045 Submitted by Alexander Skinner
2047 Remove obsolete splashscreen image (for old splashscreen)
2048 Src/res removed file: WinMergesplash.psd
2051 PATCH: [ 1449892 ] Add compare method to configlog
2052 Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
2053 PATCH: [ 1453252 ] Fix closing filecompare after error
2054 Src: MainFrm.cpp MergeDoc.cpp
2057 PATCH: [ 1449571 ] Add '*.pm' and '*.plx' to Perl highlighter
2058 Src/editlib: ccrystaleditview.cpp
2061 BUG: [ 1449947 ] Looks like diffutils bug for mac-style
2062 BUG: [ 1449949 ] crash comparing two simple test mac files
2063 Fix looping which missed mac case
2067 PATCH: [ 1449868 ] Fix difference counts
2068 Src: DiffWrapper.cpp
2071 PATCH: [ 1449038 ] Add Help-button to Open-dialog
2072 Src: FileFiltersDlg.cpp FileFiltersDlg.h Merge.rc OpenDlg.cpp OpenDlg.h
2073 PropLineFilter.cpp PropLineFilter.h
2074 Src/Common: PreferencesDlg.cpp
2075 Src/Languages/*: Merge*.rc
2078 PATCH: [ 1447927 ] Add Help Search to menu, open correct manual location
2079 Src: DirView.cpp DirView.h MainFrm.cpp MainFrm.h Merge.rc MergeEditView.cpp
2080 MergeEditView.h resource.h
2081 Src/Languages/*: Merge*.rc
2084 PATCH: [ 1447506 ] Don't include splash bitmap to lang files
2085 Src/Languages/*: Merge*.rc
2086 Remove Catalan localized splash screen
2087 Src/Languages/Catalan/res removed files: splash1.bmp WinMergeSplash.psd
2088 BUG: [ 1447851 ] Not enough space for version info in new splash screen
2090 PaTCH: [ 1445377 ] WinMerge Logos (72 DPI)
2091 Submitted by Alexander Skinner
2092 Add new folder Docs/Logos
2093 New Docs/Logos files: readme.txt WinMerge_logo_24bit.png
2094 WinMerge_logo_shadow_24bit.png WinMerge_logo_shadow_trans.tif
2095 WinMerge_logo_trans.gif
2096 Change Splashscreen text to according to Dean's wish
2098 Add Alexander Skinner to contributors list
2099 Docs/Users: Contributors.txt
2100 PATCH: [ 1447348 ] Build language files to Build directory
2101 Src/Languages: BuildDll.bat
2102 PATCH: [ 1447806 ] Use JPEG splashscreen
2103 Src: Merge.dsp Merge.rc resource.h Splash.cpp Splash.h
2104 Src/Common new files: Picture.cpp Picture.h
2105 Src/res new file: splash.jpg
2106 Src/res deleted file: splash1.bmp
2107 Src/Languages/*: Merge*.rc
2110 BUG: [ 1441389 ] Comparing root directory - mysterious
2111 Src: DiffWrapper.cpp
2114 PATCH: [ 1447539 ] Add explanatory comment to CCrystalTextBuffer::MoveLine
2115 Src/editlib: ccrystaltextbuffer.cpp
2116 PATCH: [ 1447547 ] Add more comments to CMergeDoc::PrimeTextBuffers
2120 Remove unneeded splash image (Splash2.bmp) as noted in Patch item #1441392
2121 Src/res removed file: Splash2.bmp
2124 PATCH: [ 1445434 ] SyntaxColors scrambling reg values
2125 Src: SyntaxColors.cpp
2127 2006-03-10 WinMerge experimental release 2.5.3.4 (cvs)
2130 PATCH: [ 1445996 ] Fix wrong PgDown scrolling after mousescroll
2131 Src/editlib: ccrystaltextview2.cpp
2132 BUG: [ 1446648 ] cvs trunk doesn't compile
2136 PATCH: [ 1441392 ] New Splash Screen
2137 Submitted by Alexander Skinner
2139 Src/res: splash1.bmp
2142 Update MakeResDll readme with current information (MSVC.Net 2003 works
2143 now), and better explanation of how to pick a specific version.
2144 MakeResDll: readme.txt
2145 PATCH: [ 1443391 ] Update MakeResDll for VS.NET 2005
2146 MakeResDll: MakeResDll.cpp MakeResDll.dsp MakeResDll.rc
2147 StdAfx.cpp StdAfx.h readme.txt resource.h
2148 New MakeResDll: Merge.ico VsVersionDlg.cpp VsVersionDlg.h
2149 Bump MakeResDll version from 1.0.6.0 to 1.0.7.0.
2150 MakeResDll: MakeResDll.rc
2151 PATCH: [ 1442844 ] Make GetFileExt easier to understand
2152 Src: MergeDoc.cpp MergeDoc.h
2153 Add two minor comments to PropRegistry.
2156 2006-03-06 WinMerge experimental release 2.5.3.3 (cvs)
2159 BUG: [ 1444211 ] bug in current SelectFile
2161 PATCH: [ 1443841 ] Add header comment to Src/Changes.txt
2165 BUG: [ 1442866 ] German RC format error
2166 Src/Languages/German: MergeGerman.rc
2167 BUG: [ 1442865 ] languages lack generate patch & report bitmaps
2168 Src/Languages/*: Merge*.rc
2171 PATCH: [ 1435361 ] Fix and cleanup project file code
2172 Src: DiffContext.cpp DiffContext.h DirDoc.cpp MainFrm.cpp
2173 Merge.cpp Merge.h Merge.rc MergeArgs.cpp ProjectFile.cpp
2175 Src/Languages/*: Merge*.rc
2178 PATCH: [ 1396506 ] customizable text colors
2179 Fix compilation (MSVC.NET 2003 correctly gave error that MSVC6 ignored)
2180 Src: PreferencesDlg.cpp
2181 PATCH: [ 1442125 ] Improvements for MakeResDll parsing
2182 MakeResDll: MakeResDll.cpp MakeResDll.rc resource.h
2183 Src\Common: RegKey.cpp RegKey.h
2184 PATCH: [ 1442134 ] MakeResDll: check that RC file exists
2185 MakeResDll: MakeResDll.cpp MakeResDll.rc resource.h
2186 PATCH: [ 1442238 ] Fix MakeResDll to work with VS.NET 2003
2187 MakeResDll: MakeResDll.cpp MakeResDll.rc
2188 PATCH: [ 1442791 ] Update MakeResDll project
2189 Add Changes.txt to project.
2190 Change version copyright from "2003" to "2003-2006"
2191 MakeResDll: MakeResDll.dsp MakeResDll.rc
2193 2006-03-04 Perry (MSVC6)
2194 Current selftests status: Failure count: 0 (of 756)
2197 PATCH: [ 1396506 ] customizable text colors
2198 Src: MainFrm.cpp MainFrm.h Merge.dsp Merge.rc MergeDoc.cpp
2199 OptionsDef.h OptionsInit.cpp PropArchive.cpp PropArchive.h
2200 PropCodepage.cpp PropCodepage.h PropColors.cpp PropColors.h
2201 PropCompare.cpp PropCompare.h PropEditor.h PropGeneral.h
2202 PropRegistry.h PropSyntaxColors.cpp PropSyntaxColors.h
2203 PropVss.h SyntaxColors.cpp SyntaxColors.h resource.h
2204 Src\Common: PreferencesDlg.cpp PreferencesDlg.h
2205 Src/Languages/*: Merge*.rc
2206 PATCH: [ 1439335 ] Reset cwd in Merge.cpp SelectFile
2207 Src: Merge.cpp OpenDlg.cpp
2208 PATCH: [ 1442082 ] Fix MakeDirs to not error if directory exists
2209 Src\Common: coretools.cpp
2210 PATCH: [ 1396506 ] customizable text colors
2212 Src: new PropTextColors.cpp PropTextColors.h
2215 PATCH: [ 1442699 ] New Changes.txt file for MakeResDll
2216 Add Changes.txt change log (this file).
2217 MakeResDll: new Changes.txt
2218 PATCH: [ 1424636 ] New BuildOneLanguage.vbs & fix MakeResDll exit
2219 MakeResDll: MakeResDll.cpp StdAfx.h
2220 Src\Languages: BuildDll.bat BuildOneLanguage.vbs
2223 PATCH: [ 1441387 ] Improve File Encoding dialog
2225 Src/Languages/*: Merge*.rc
2226 PATCH: [ 1442107 ] Move About-dialog code to separate files from Merge.cpp
2227 Src: Merge.cpp Merge.dsp
2228 Src new files: AboutDlg.cpp AboutDlg.h
2231 PATCH: [ 1437770 ] Icons for 'Generate Patch' and 'Generate Report'
2232 Src: MainFrm.cpp Merge.rc resource.h
2233 Src/res new files: patch.bmp report.bmp
2236 PATCH: [ 1441124 ] Improve filter test dialog
2238 Src/Languages/*: Merge*.rc
2241 PATCH: [ 1424535 ] Czech Translation, Submitted by Jan Hryz
2242 Improve unpacker selection dialog and new filter location selection dialog
2244 Src/Languages/*: Merge*.rc
2247 PATCH: [ 1438233 ] New icons for 'notequalfile', 'lfile' and 'rfile'
2248 Src/res: lfile.ico notequalfile.ico rfile.ico
2251 PATCH: [ 1436855 ] Typo in lang files (change pactch to patch)
2252 Src/Languages/*: Merge*.rc
2253 BUG: [ 1440774 ] Test button for file filters enabled for no filter
2254 Fix submitted by Gal Hammer
2255 Src: FileFiltersDlg.cpp
2256 PATCH: [ 1395847 ] Integration with Rational ClearCase
2257 Submitted by Gal Hammer
2258 Src: MainFrm.cpp MainFrm.h Merge.h MergeArgs.cpp MergeDoc.cpp MergeDoc.h
2259 Src/Common: coretools.cpp coretools.h
2262 BUG: [ 1439360 ] Native languages sometimes suppressed in Unicode Build
2263 Add note to CLanguageSelect::GetNativeLanguageNameString
2264 explaining why codepage check is done even for Unicode build.
2265 Src/Common: LanguageSelect.cpp
2268 BUG: [ 1439350 ] Russian language name in LanguageSelect?
2269 Src/Common: LanguageSelect.cpp
2272 PATCH: [ 1435470 ] Remove CTextFile
2274 Deleted Src\Common: textfile.cpp textfile.h
2275 PATCH: [ 1439229 ] Fix CMergeDoc::SanityCheckD not to dereference illegal lines
2276 BUG: [ 1438390 ] Crash when editting the attached files
2278 PATCH: [ 1434007 ] Move source control code out of MainFrm.cpp
2279 Src: MainFrm.cpp MainFrm.h Merge.dsp
2280 New Src: SourceControl.cpp
2283 PATCH: [ 1437758 ] Improve diff selection when selected diff not visible
2284 Src: MergeEditView.cpp MergeEditView.h
2285 PATCH: [ 1431607 ] Fix worddiff highlight error
2287 Src: stringdiffs.cpp
2290 PATCH: [ 1437677 ] Various Updates in German Translation for WinMerge 2.5
2291 Src/Languages/German: MergeGerman.rc
2294 PATCH: [ 1435431 ] Fix GenerateReport lines
2296 Src: DirCmpReport.cpp
2297 PATCH: [ 1395721 ] VS.NET 2003 warning of SEH bug
2299 PATCH: [ 1428686 ] Catalan translation update
2301 Src/Languages/Catalan: MergeCatalan.rc
2302 PATCH: [ 1430321 ] Swedish translation update and feedback on WinMerge 2.5.3.2
2304 Src\Languages\Swedish: MergeSwedish.rc
2305 PATCH: [ 1434270 ] Fix difference counts
2307 Src: DiffWrapper.cpp
2310 PATCH: [ 1435384 ] Add context menu for diff pane
2311 Src: Merge.rc MergeDiffDetailView.cpp MergeDiffDetailView.h resource.h
2312 Src/Languages/*: Merge*.rc
2313 PATCH: [ 1433125 ] Trap errors from filesystem during actions
2314 Src: FileActionScript.cpp
2317 PATCH: [ 1405603 ] New Test dialog for file filters
2318 (Forgot to do all the language resources)
2319 and misc RC file fixes (eg, many fixes in editor proppage)
2320 New: Src/Languages: WinMerge_Resource_Discrepencies.txt
2323 PATCH: [ 1405603 ] New Test dialog for file filters
2324 Src: FileFilterMgr.cpp FileFilterMgr.h FileFiltersDlg.cpp
2325 FileFiltersDlg.h Merge.dsp Merge.rc resource.h
2326 Src new: TestFilterDlg.cpp TestFilterDlg.h
2327 PATCH: [ 1433312 ] Add cvs tags to source files
2328 Src: ByteComparator.cpp SharedFilterDlg.cpp StdAfx.cpp
2329 TestFilterDlg.cpp TestFilterDlg.h ViewableWhitespace.cpp
2330 Src/Common: SortHeaderCtrl.cpp SortHeaderCtrl.h UniFile.cpp
2331 UniFile.h textfile.cpp textfile.h unicoder.cpp unicoder.h
2332 varprop.cpp varprop.h version.cpp version.h
2335 PATCH: [ 1178743 ] Disable lang menu if no additional langs installed
2336 Src: Merge.cpp Merge.h
2337 Src/Common: LanguageSelect.cpp LanguageSelect.h
2340 PATCH: [ 1433931 ] Add comment before isBin checks in DirView
2342 PATCH: [ 1424153 ] Remove VTS_PUI1 from lwdisp.h
2343 BUG: [ 1395475 ] VTS_UI1 & VTSPUI1 macro redefinition warnings (VS.NET)
2344 Src\Common: lwdisp.h
2345 PATCH: [ 1433927 ] Fix external editor default and messages
2346 BUG: [ 1433774 ] default editor is blank
2347 Src: MainFrm.cpp Merge.cpp Merge.rc OptionsInit.cpp resource.h
2348 Src/Languages/*: Merge*.rc
2349 PATCH: [ 1433353 ] Fix menu resources
2350 Src: MainFrm.cpp Merge.cpp Merge.rc resource.h
2351 Src/Languages/*: Merge*.rc
2353 2006-02-19 Christian
2354 PATCH: [ 1429125 ] Return number of diffs instead of true/false
2358 BUG: [ 1395483 ] Signed/unsigned mismatch warning from LocationView.cpp
2359 Src: LocationView.cpp
2362 BUG: [ 1395475 ] VTS_UI1 & VTSPUI1 macro redefinition warnings (VS.NET)
2363 Fixed VTS_PUI1 (which previous patch for this bug missed).
2364 Src\Common: lwdisp.h
2367 PATCH: [ 1424535 ] Czech Translation, Submitted by Jan Hryz
2368 Improve folder compare columns dialog (idea for new arrows from Catalan translation)
2370 Src/Languages/*: Merge*.rc
2373 PATCH: [ 1431771 ] Alter CheckTranslations.vbs to YesNoCancel
2374 Src/Languages: CheckTranslations.vbs
2375 PATCH: [ 1419582 ] Polish translation update for latest v2.5
2376 Contributed by dr_prozac
2377 Src/Languages/Polish: MergePolish.rc
2378 PATCH: [ 1431846 ] Update Czech Translation
2379 Contributed by Jan Hryz
2380 Src/Languages/Czech: MergeCzech.rc
2381 ShellExtension/Languages/ShellExtensionCzech.rc
2382 A few control adjustments matching Czech to English (many left)
2383 Src/Languages/Czech: MergeCzech.rc
2386 PATCH: [ 1431636 ] IgnoreEOL broken in cvs trunk
2387 Src: PropCompare.cpp
2390 PATCH: [ 1431768 ] Write paths to patch files as given
2391 Src: DiffWrapper.cpp
2394 PATCH: [ 1431205 ] Fix ViewWhitespace \r\n bug
2395 BUG: [ 1431012 ] View line differences adds additional EOL char
2396 Src/editlib: ccrystaltextview.cpp
2397 PATCH: [ 1431197 ] Fix off-by-one highlight error
2398 Src: stringdiffs.cpp
2399 Fix button movement on LanguageSelect (broken by PATCH#1423461).
2400 Also add cvs id comment at top, and doxygen file label.
2401 Src\Common: LanguageSelect.cpp
2404 BUG: [ 1197976 ] GeneratePatch file browse not intialized correctly
2405 Fix submitted by Perry
2409 PATCH: [ 1431131 ] Fix VS.NET 2003 compilation
2410 Src\Common: coretools.cpp scbarg.cpp scbarg.h sizecbar.cpp sizecbar.h
2411 Shrink Swedish dialog IDD_PROPPAGE_LARGE to same size as English
2412 (all controls already were the same size anyway)
2413 Src\Languages\Swedish: MergeSwedish.rc
2416 PATCH: [ 1212124 ] File encoding GUI
2417 Src: DiffContext.cpp DiffFileInfo.cpp DiffFileInfo.h DiffItem.cpp
2418 DiffItem.h DiffThread.cpp DiffWrapper.cpp DirActions.cpp
2419 DirScan.cpp DirView.cpp DirView.h DirViewColItems.cpp FileLocation.h
2420 MainFrm.cpp Merge.dsp Merge.rc MergeDoc.cpp MergeDoc.h OpenDlg.cpp
2421 codepage_detect.cpp codepage_detect.h resource.h
2422 NEW Src: FileTextEncoding.cpp FileTextEncoding.h IntToIntMap.h
2423 LoadSaveCodepageDlg.cpp LoadSaveCodepageDlg.h MergeDocEncoding.cpp
2424 dlgutil.cpp dlgutil.h
2427 Adjust whitespace to match English translation
2428 Also update Russian options/editor controls to match English
2429 Src\Languages\Russian: MergeRussian.rc
2430 Src\Languages\Slovak: MergeSlovak.rc
2431 Src\Languages\Swedish: MergeSwedish.rc
2432 Src\Languages\Turkish: MergeTurkish.rc
2433 PATCH: [ 1424681 ] Widen labels on unpacker dialog
2435 Src\Languages: Merge*.rc
2438 PATCH: [ 1429517 ] Fix coretools.cpp compilation (for MakeResDll)
2439 Src/Common: coretools.cpp
2440 PATCH: [ 1427838 ] code cleanup bottom of merge.cpp
2442 Synchronizing Turkish translation to English where feasible.
2443 Src/Languages/Turkish: MergeTurkish.rc
2444 Update Swedish Options/Editor to current English layout
2445 Src/Languages/Swedish: MergeSwedish.rc
2448 PATCH: [ 1428800 ] Fix ListCopy/AllLeft
2449 BUG: [ 1428791 ] All Left gave me a bunch of msgboxes
2450 Src: MergeDoc.cpp MergeDoc.h
2451 PATCH: [ 1428726 ] Fix for compilation under VS2005
2452 Src: BCMenu.cpp DiffWrapper.cpp DirCmpReport.cpp
2453 DirColsDlg.cpp DirViewColHandler.cpp GhostTextBuffer.cpp
2454 MergeArgs.cpp MergeDiffDetailView.cpp MergeDoc.cpp
2456 Src\Common: LanguageSelect.cpp SuperComboBox.cpp UniFile.cpp
2457 coretools.cpp multiformatText.cpp scbarg.cpp scbarg.h
2458 sizecbar.cpp sizecbar.h
2459 Src\editlib: asp.cpp basic.cpp batch.cpp ccrystaltextview.cpp
2460 cplusplus.cpp crystaltextblock.cpp csharp.cpp dcl.cpp
2461 fortran.cpp html.cpp ini.cpp innosetup.cpp is.cpp java.cpp
2462 lisp.cpp nsis.cpp pascal.cpp perl.cpp php.cpp python.cpp
2463 rexx.cpp rsrc.cpp sgml.cpp sh.cpp siod.cpp sql.cpp
2464 tcl.cpp tex.cpp xml.cpp
2465 PATCH: [ 1427563 ] Give descriptive name to CMergeDoc::SaveHelper
2466 Src: MainFrm.cpp MergeDiffDetailView.cpp MergeDoc.cpp
2467 MergeDoc.h MergeEditView.cpp
2468 PATCH: [ 1426593 ] Remove empty CMergeDoc::SetDiffViewMode()
2470 Src: MergeDoc.cpp MergeDoc.h
2472 2006-02-09 WinMerge experimental release 2.5.3.2 (cvs)
2475 PATCH: [ 1427851 ] Small cleanup for FileFilterMgr::AddFilter()
2476 Src: FileFilterMgr.cpp
2477 Add Jan Hryz as Czech translator and contributor
2478 Docs/Users: Contributors.txt
2481 PATCH: [ 1427845 ] Double-click fails to open, no message
2483 BUG: [ 1427956 ] Differences count in Folder Compare wrong?
2484 Make sure to set diff count to 0 just before counting them
2485 Src: DiffWrapper.cpp
2488 PATCH: [ 1426499 ] Move Save Projectfile to File menu
2489 Src: DirDoc.cpp DirDoc.h MainFrm.cpp MainFrm.h Merge.rc MergeDoc.cpp
2490 MergeDoc.h OpenDlg.cpp OpenDlg.h resource.h
2491 Src/Languages/*: Merge*.rc
2494 PATCH: [ 1424884 ] Fix UniStdioFile encoding of TCHAR
2495 BUG: [ 1402379 ] A character display and save error with encoding of unicode
2496 Src\Common: UniFile.cpp unicoder.cpp unicoder.h
2499 Current selftests status: Failure count: 0 (of 756)
2502 PATCH: [ 1426552 ] Add selftests between platform versions
2503 Src: Changes.txt ConfigLog.cpp DiffWrapper.cpp DiffWrapper.h
2504 DirDoc.cpp MainFrm.cpp MergeArgs.cpp MergeDoc.cpp
2505 MergeDocLineDiffs.cpp OptionsDef.h OptionsInit.cpp PatchTool.cpp
2506 PropCompare.cpp PropCompare.h
2507 Src\editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h
2510 Current selftests status: Failure count: 0 (of 588)
2513 PATCH: [ 1424867 ] Fix common prefix code for \r\n
2514 Src\diffutils\src: IO.C
2515 PATCH: [ 1426793 ] Fix diffutils that counts lines in suffix
2516 Src\diffutils\src: IO.C
2519 Current selftests status: Failure count: 0 (of 588)
2522 PATCH: [ 1424535 ] Czech Translation, Submitted by Jan Hryz
2523 Fix dir compare report dialog layout
2525 Src/Languages/*: Merge*.rc
2528 Synchronizing Slovak translation to English where feasible.
2529 Src/Languages/Slovak: MergeSlovak.rc
2530 Synchronizing Swedish translation to English where feasible.
2531 Src/Languages/Swedish: MergeSwedish.rc
2532 PATCH: [ 1392413 ] Track lossy encodings & warn user
2533 Src: FileFilterMgr.cpp Merge.rc MergeDoc.cpp files.h resource.h
2534 Src/Common: UniFile.cpp UniFile.h unicoder.cpp
2535 PATCH: [ 1392413 ] Track lossy encodings & warn user
2536 Src/Languages/*: Merge*.rc
2539 PATCH: [ 1414201 ] Cleanup Merge Line Flags
2540 Src: LocationView.cpp Merge.dsp MergeDiffDetailView.cpp MergeDoc.cpp
2541 MergeEditView.cpp MergeEditView.h
2542 NEW Src: MergeLineFlags.h
2545 PATCH: [ 1424264 ] Use 'Item' instead of file in View-menu
2547 Src/Language: */Merge*.rc
2550 Fix Italian Edit/Options/Editor line selection controls.
2551 Src/Languages/Italian/MergeItalian.rc
2552 PATCH: [ 1414904 ] updated italian translation for winmerge 2.5.3.1
2553 Submitted by A. Decorte
2554 New updates for selecting current diffs and wrap lines.
2555 Src/Languages/Italian/MergeItalian.rc
2558 BUG: [ 1422257 ] Wrong text in tooltip
2559 (Dutch translation had wrong shortcut keys in tooltip)
2560 Src/Languages/Dutch/MergeDutch.rc
2561 PATCH: [ 1424535 ] Czech Translation
2562 Submitted by Jan Hryz
2563 Src/Languages/Czech/MergeCzech.rc
2566 PATCH: [ 1424142 ] Wrap two lwdisp macros in ifndef
2567 Src/Common: lwdisp.h
2568 Undo PATCH: [ 1424142 ] Wrap two lwdisp macros in ifndef
2569 Src/Common: lwdisp.h
2570 BUG: [ 1383052 ] warning C4005: 'COMPILE_MULTIMON_STUBS' : macro redefinition
2571 (Wrap multimon def with ifndef
2573 PATCH: [ 1423461 ] Rearrange language select dialog
2574 Revise patch applied earlier: put Ok on left and Cancel on right.
2575 (Also fix French dialog which was left out before.)
2577 Src/Languages: */Merge*.rc
2578 PATCH: [ 1421199 ] Fix plugin menu for when location or diff detail view active
2579 Src: ChildFrm.cpp ChildFrm.h MainFrm.cpp MainFrm.h MergeDoc.cpp MergeDoc.h
2580 PATCH: [ 1414904 ] updated italian translation for winmerge 2.5.3.1
2581 Submitted by A. Decorte
2582 Src/Languages/Italian: MergeItalian.rc
2583 PATCH: [ 1423907 ] Fix diffutils hashing of \r
2584 Src/diffutils: IO.C UTIL.C
2585 Current selftests status: Failure count: 0 (of 480)
2586 Created branch "R_diffutils_branch"
2589 PATCH: [ 1409651 ] fix diffutils handling trailing whitespace
2590 Src/diffutils/src: IO.C UTIL.C
2591 Current selftests status: Failure count: 24 (of 480)
2592 Failing -b t002 (u & m platforms, all 4 builds)
2593 Failing -bi t002 (u & m platforms, all 4 builds)
2594 Failing -b bug1406950 (u & m platforms, all 4 builds)
2597 PATCH: [ 1423060 ] Modify perl selftest to test all 4 builds
2599 Current selftests status: Failure count: 36 (of 480)
2600 Failing -b t002 (all 3 platforms, all 4 builds)
2601 Failing -bi t002 (all 3 platforms, all 4 builds)
2602 Failing -b bug1406950 (all 3 platforms, all 4 builds)
2603 PATCH: [ 1421694 ] Widen comments label in Rational ClearCase dialog
2605 Src/Languages: */Merge*.rc
2606 PATCH: [ 1423461 ] Rearrange language select dialog
2607 Src: MainFrm.cpp MainFrm.h Merge.rc OpenDlg.cpp OpenDlg.h
2608 Src/Common: LanguageSelect.cpp LanguageSelect.h
2609 Src/Languages: */Merge*.rc
2612 PATCH: [ 1422052 ] Correction of Swedish for 2.5.3.1+
2613 Contributed by Hans Eriksson
2614 Src/Languages/Swedish: Merge Swedish
2617 PATCH: [ 1412386 ] Adding readme files
2618 New WinMerge/readme.txt
2619 (Various other directories affected -- readme.txt & Changes.txt files)
2622 PATCH: [ 1419329 ] Select Line Difference
2623 Src: Merge.rc MergeDiffDetailView.cpp MergeDiffDetailView.h MergeEditView.cpp
2624 MergeEditView.h resource.h
2625 Src/Language: */Merge*.rc
2628 BUG: [ 1419317 ] link error on 8-bit cvs trunk
2629 Add HtmlHelp.lib to link lines MergeRelease, MergeDebug, MergeUnicodeRelease.
2631 PATCH: [ 1419582 ] Polish translation update for latest v2.5
2632 Contributed by dr_prozac
2633 Src/Languages/Polish: MergePolish.rc
2634 PATCH: [ 1421018 ] Fix handle leak in GetOpenFileName
2635 BUG: [ 1418765 ] 2.4.4.0U maintain opened a handle on folders
2636 Adds new method paths_GetWindowsDirectory & resets current
2637 directory to WINDIR after GetOpenFileName call
2638 Src: MainFrm.cpp OpenDlg.cpp paths.cpp paths.h
2639 Cosmetic: synchronizing whitespace to English version
2640 Src/Languages/*: MergeTurkish.rc MergeSwedish.rc MergeSpanish.rc
2641 Cosmetic: synchronizing whitespace to English version
2642 Src/Languages/*: MergePolish.rc
2643 Updating Polish dialog control layout to English (except where
2644 would hinder appearance)
2645 Src/Languages/*: MergePolish.rc
2648 PATCH: [ 1419171 ] Various Updates in German Translation for WinMerge 2.5
2649 Src/Languages/German: MergeGerman.rc
2652 PATCH: [ 1415895 ] Split cmdline help string into chunks
2653 Src: Merge.cpp Merge.h Merge.rc MergeArgs.cpp resource.h
2654 Src/Languages: */*.rc
2657 PATCH: [ 1414904 ] updated italian translation for winmerge 2.5.3.1
2658 Submitted by A. Decorte
2659 InnoSetup\Languages: Italian.isl
2660 PATCH: [ 1415165 ] Updated Swedish translation for 2.5.3.1+
2661 Submitted by Hans Eriksson
2662 Src\Languages\Swedish: MergeSwedish.rc
2663 PATCH: [ 1414195 ] Delete two old TODO notes
2665 PATCH: [ 1414196 ] Delete useless CChildFrame::OnNotify method
2666 Src: ChildFrm.cpp ChildFrm.h
2667 PATCH: [ 1414199 ] Fix outdated comment on DirView.cpp :: NumToStr
2671 PATCH: [ 1413230 ] Use HtmlHelp API to open help
2672 Src: MainFrm.cpp Merge.dsp
2675 BUG: [ 1412237 ] InitOption return value wrong if RegCreateKey fails
2676 Fix unused wrong return value of InitOption & improve one comment
2677 Src/Common: OptionsMgr.cpp
2678 BUG: [ 1414868 ] Bug in byte_compare (early finish)
2679 (Also added some comments.)
2680 Src: DiffWrapper.cpp
2682 2006-01-24 WinMerge experimental release 2.5.3.1 (cvs)
2685 PATCH: [ 1406840 ] Use HTMLHelp locally
2687 PATCH: [ 1411727 ] Merge inactive diff when cursor is inside it
2688 Src: MergeDoc.cpp MergeDoc.h MergeEditView.cpp MergeEditView.h
2691 Add repro files to selftests from
2692 BUG [ 1406950 ] QuickCompare vs diffutils, disagree on trailing whitespace
2693 Current selftests status: Failure count: 9 (of 108)
2694 Failing -b t002 (all 3 platforms)
2695 Failing -bi t002 (all 3 platforms)
2696 Failing -b bug1406950 (all 3 platforms)
2697 PATCH: [ 1406950 ] QuickCompare vs diffutils, disagree on trailing whitespace
2698 Src: ByteComparator.cpp
2699 (selftests results unimproved, because selftest uses diffutils core, not QuickCompare)
2702 PATCH: [ 1405540 ] Cleanup filters dialog
2703 Src: FileFiltersDlg.cpp FileFiltersDlg.h
2706 PATCH: [ 1411102 ] Add '*.dsl' and '*.jsp' to syntax highlighter
2707 Src/editlib: ccrystaleditview.cpp
2710 PATCH: [ 1411406 ] self-tests and new arguments and new diff2winmerge.exe
2711 Src: Changes.txt MainFrm.cpp MainFrm.h Merge.cpp Merge.h MergeArgs.cpp
2712 Src/Common: OptionsMgr.cpp OptionsMgr.h
2713 New directory WinMerge/diff2winmerge, for diff2winmerge utility
2714 New directory WinMerge/selftests added
2715 Current selftests status: Failure count: 6 (of 108)
2716 Failing -b t002 (all 3 platforms)
2717 Failing -bi t002 (all 3 platforms)
2720 PATCH: [ 1411150 ] Add GetActiveMergeView for MergeDoc
2721 Src: MergeDoc.cpp MergeDoc.h
2724 PATCH: [ 1407740 ] Polish translation update (for version 2.4.4.0)
2725 Submitted by dr_prozac
2726 (Perry merging many of these to cvs trunk)
2727 Src/Language/Polish: MergePolish.rc
2730 BUG: [ 1408587 ] Unused DoScroll() function in Merge*View
2731 Remove DoScroll() from CMergeEditView and CMergeDiffDetailView
2732 Src: MergeDiffDetailView.cpp MergeDiffDetailView.h MergeEditView.cpp
2736 PATCH: [ 1406207 ] Fix error message for unique folders
2737 Src: DirView.cpp Merge.rc resource.h
2738 Src/Language: */Merge*.rc
2741 PATCH: [ 1401711 ] A hybrid of word diff and char diff
2742 Submitted by Takashi Sawanaka
2743 Src: MergeDocLineDiffs.cpp PropEditor.cpp
2744 stringdiffs.cpp stringdiffs.h
2747 PATCH: [ 1406203 ] Open unique files to external editor
2748 Src: DirView.cpp Merge.rc resource.h
2749 Src/Language: */Merge*.rc
2752 PATCH: [ 1333600 ] Get rid of global MainFrame pointer (part1)
2753 Src: DirActions.cpp DirDoc.cpp DirView.cpp FileActionScript.cpp
2754 MainFrm.cpp MainFrm.h Merge.cpp MergeDoc.cpp MergeEditView.cpp
2755 OpenDlg.cpp PropRegistry.cpp
2756 Src\Common: PreferencesDlg.cpp
2759 PATCH: [ 1403457 ] Support Unicode file filter files
2760 Src: FileFilterMgr.cpp
2763 PATCH: [ 1372044 ] Add FileActionScript for folder compare actions
2764 Src: DirActions.cpp DirView.h Merge.dsp
2765 Src new files: FileActionScript.cpp FileActionScript.h
2766 PATCH: [ 1385672 ] Replace some 'file's with 'item's
2768 Src/Language: */Merge*.rc
2769 PATCH: [ 1405340 ] Add XP shadow to folderskip.ico
2771 Src/res: folderskip.ico
2774 TODO: [ 1395638 ] CChildFrame::PreCreateWindow() does nothing
2775 Src: ChildFrm.cpp ChildFrm.h MainFrm.cpp
2778 PATCH: [ 1403454 ] Add comment to UniStdioFile.h
2780 Src/Common: UniFile.h
2781 PATCH: [ 1403893 ] Fix whitespace error in ByteCompare
2782 BUG: [ 1400779 ] Whitespace bug in ByteComparator
2783 Src: ByteComparator.cpp
2786 PATCH: [ 1039677 ] Alter text of Reset button label
2788 Src/Language: */Merge*.rc
2791 PATCH: [ 1399263 ] Captioned panes (new style)
2792 Src: ChildFrm.cpp DiffViewBar.h LocationBar.h Merge.dsp Merge.rc resource.h
2793 Src/Common new files: scbarcf.cpp scbarcf.h
2794 Src/Language: */Merge*.rc
2795 PATCH: [ 1399738 ] Filename bars to use caption colors
2796 Src: ChildFrm.cpp FilePathEdit.cpp FilePathEdit.h
2799 PATCH: [ 1403412 ] German: Option 'Line Difference Coloring' looks broken
2800 Src/Languages/German: MergeGerman.rc
2802 2006-01-11 WinMerge beta release 2.5.2
2805 PATCH: [ 1402774 ] Use dark red color for 'binarydiff.ico'
2807 Src/res: binarydiff.ico
2808 PATCH: [ 1400845 ] Allow Shift+Ctrl+F3 to search selected text backwards
2809 With addition from Takashi for Shift+F3 backwards search
2811 Src/editlib: ccrystaltextview.cpp
2812 Src/Language: */Merge*.rc
2813 BUG: [ 1400829 ] Crash trying to open location pane context menu
2814 Src: LocationView.cpp
2817 PATCH: [ 1401420 ] New 'MergeDir' icon
2818 Src/res: MergeDir.ico
2821 PATCH: [ 1400830 ] Fix drop to only do LoadProjectFile when 1 file dropped
2822 BUG: [ 1400797 ] Dropping two project files doesn't work to compare them
2823 (Also fixes extension test to be case-sensitive)
2827 BUG: [ 1396222 ] CDirView::MoveSelection() is confused
2828 (Rename MoveSelection to MoveFocus & add more commenting)
2829 Src: DirActions.cpp DirView.cpp DirView.h
2832 PATCH: [ 1398064 ] Catalan translation update
2834 Src/Languages/Catalan: MergeCatalan.rc
2835 PATCH: [ 1398959 ] Implement GuessEncoding in QuickCompare
2836 Src: codepage_detect.cpp DiffWrapper.cpp DiffWrapper.h
2838 2006-01-05 WinMerge experimental release 2.5.0.5 (cvs)
2841 PATCH: [ 1393635 ] Save pane sizes and positions when they change
2842 Src: ChildFrm.cpp ChildFrm.h DiffViewBar.cpp DiffViewBar.h LocationBar.cpp
2843 LocationBar.h LocationView.cpp LocationView.h MergeDiffDetailView.cpp
2844 MergeDiffDetailView.h StdAfx.h
2845 PATCH: [ 1396413 ] Update Open dialog controls when its activated
2846 Src: OpenDlg.cpp OpenDlg.h
2849 Cosmetic; normalizing blank lines to agree with English Merge.rc
2851 Brazilian\MergeBrazilian.rc
2852 ChineseSimplified\MergeChineseSimplified.rc
2853 Korean\MergeKorean.rc
2854 Norwegian\MergeNorwegian.rc
2857 PATCH: [ 1394877 ] Find selected text with Ctrl+F3
2859 Src/editlib: ccrystaltextview.cpp
2860 Src/Language: */Merge*.rc
2861 PATCH: [ 1395584 ] Update CSizingControlBar to latest version
2862 Src: DiffViewBar.cpp DiffViewBar.h LocationBar.cpp LocationBar.h Merge.dsp StdAfx.h
2863 Src/Common: sizecbar.cpp sizecbar.h
2864 Src/Common new files: scbarg.cpp scbarg.h
2865 Src/Common deleted files: sizecbarg.cpp sizecbarg.h
2866 PATCH: [ 1383262 ] Fix bitmap leak in ShellExtension
2867 Also bump version number to 1.7.1
2869 ShellExtension: ShellExtension.rc WinMergeShell.cpp WinMergeShell.h
2872 PATCH: [ 1390104 ] fix for BUG: [ 1384069 ] Wrapped lines have incorrect column
2873 Src: MergeEditView.cpp
2874 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
2877 BUG: [ 1390849 ] cvs trunk MergeChineseSimplified doesn't compile
2878 Src/Languages: ChineseSimplified: MergeChineseSimplified.rc
2879 PATCH: [ 1212161 ] Fix handling of \r\n in ByteComparator
2880 Src: ByteComparator.cpp
2883 PATCH: [ 1383802 ] Cleanup line difference options in Editor-options
2884 Src: Merge.rc PropEditor.cpp PropEditor.h resource.h
2885 PATCH: [ 1383802 ] Cleanup line difference options in Editor-options
2887 Src/Language: */Merge*.rc
2888 PATCH: [ 1391550 ] vbs script to check & optionally merge WinMerge resources
2889 Src: new CheckTranslations.vbs
2892 PATCH: [ 1395474 ] Define WINVER for compiling with VS.net
2894 PATCH: [ 1395018 ] Small cleanup for CMergeDoc::PrimeTextBuffers()
2895 Src: DiffList.cpp DiffList.h MergeDoc.cpp
2898 PATCH: [ 1395487 ] Unused local variable in UniStdioFile::DoOpen()
2899 (Delete unused variable)
2900 Src/Common: UniFile.cpp
2901 BUG: [ 1395497 ] Unused local variables in CMergeDoc::GetWordDiffArray()
2902 (Delete unused variables)
2903 Src: MergeDocLineDiffs.cpp
2904 BUG: [ 1395494 ] stringdiffs.cpp / LastChar() returning uninitialized value?
2905 Src: stringdiffs.cpp
2908 Remove unused variable from VSSHelper.cpp/VSSHelper::ReLinkVCProj()
2912 PATCH: [ 1392647 ] Prefix members with m_ in storage_for_plugins
2913 Src/Common: multiformatText.cpp multiformatText.h
2914 PATCH: [ 1394717 ] Fix resource.h include for translations
2915 Src/Languages: */Merge*.rc
2916 Src/Languages deleted: UpdateAll_resource_h.bat
2917 Src/Languages deleted: */resource.h (localized versions of resource.h)
2918 BUG: [ 1395107 ] MergeKorean.rc not compile in cvs trunk
2919 (resource.h => ..\..\resource.h fix missed Korean somehow)
2920 Src/Languages/Korean: MergeKorean.rc
2921 PATCH: [ 1394073 ] Fix ByteComparator: m_bol0
2922 (Change in ByteComparator.h is cosmetic typo fix in comment)
2923 (Fixes some bad tabbing as well)
2924 Src: ByteComparator.cpp ByteComparator.h
2927 PATCH: [ 1394759 ] Allows quotes in Rational ClearCase checkout comment
2928 Submitted by Gal Hammer
2930 Add Gal Hammer to contributors list
2931 Docs/Users: Contributors.txt
2934 BUG: [ 1394857 ] cvs trunk does not compile, ANSI, FindEncodingIdFromNameOrAl
2935 Src: codepage_detect.cpp
2938 PATCH: [ 1392347 ] Fix status after synching unique binary files
2940 PATCH: [ 1394464 ] Find again code doesn't recognize dos/mac EOLs
2941 Src/editlib: ccrystaltextview.cpp
2942 BUG: [ 1394851 ] cvs trunk does not compile (DirScan.cpp, sRule)
2946 PATCH: [ 1394247 ] Fix GuessEncoding recognition of codepages
2947 BUG: [ 1394234 ] GuessEncodings fails to recognize CP-437
2948 Src: codepage_detect.cpp
2949 PATCH: [ 1393979 ] Delete unused DiffWrapper fnc cleanup_script
2950 Src: DiffWrapper.cpp
2953 PATCH: [ 1391732 ] Do not offer to unify codepages in UNICODE build
2954 Also introduces new error IDS_DIFFERENT_UNICODINGS and new
2955 global function IsUnicodeBuild.
2957 Doing language synchronizations for this patch.
2959 Languages\Brazilian\MergeBrazilian.rc
2960 Languages\Bulgarian\MergeBulgarian.rc
2961 Languages\Catalan\MergeCatalan.rc
2962 Languages\ChineseSimplified\MergeChineseSimplified.rc
2963 Languages\ChineseTraditional\MergeChineseTraditional.rc
2964 Languages\Czech\MergeCzech.rc
2965 Languages\Danish\MergeDanish.rc
2966 Languages\Dutch\MergeDutch.rc
2967 Languages\German\MergeGerman.rc
2968 Languages\Hungarian\MergeHungarian.rc
2969 Languages\Italian\MergeItalian.rc
2970 Languages\Japanese\MergeJapanese.rc
2971 Languages\Korean\MergeKorean.rc
2972 Languages\Norwegian\MergeNorwegian.rc
2973 Languages\Polish\MergePolish.rc
2974 Languages\Russian\MergeRussian.rc
2975 Languages\Slovak\MergeSlovak.rc
2976 Languages\Spanish\MergeSpanish.rc
2977 Languages\Swedish\MergeSwedish.rc
2978 Languages\Turkish\MergeTurkish.rc
2979 PATCH: [ 1212368 ] Display correct paths in context patches
2981 Revising patched code, removing unneeded dispname added when patch applied
2982 Src: DiffWrapper.cpp
2983 diffutils\src: CONTEXT.C DIFF.H
2984 PATCH: [ 1393239 ] Split functions out of RunFileDiff
2985 Src: DiffWrapper.cpp DiffWrapper.h
2986 PATCH: [ 1392229 ] Fix Column item handling
2987 Src: DirView.h DirViewColHandler.cpp DirViewColItems.cpp
2991 PATCH: [ 1390774 ] Rename CRegOptions to CRegOptionsMgr
2992 Docs\Developers: Options.html
2993 Src\Common: OptionsMgr.cpp OptionsMgr.h
2994 Src: FileTransform.cpp MainFrm.cpp MainFrm.h SyntaxColors.cpp
2995 SyntaxColors.h codepage.h
2996 PATCH: [ 1392650 ] Fix locals of CDiffWrapper::RunFileDiff
2997 Src: DiffWrapper.cpp DiffWrapper.h MergeDoc.cpp PatchTool.cpp
2998 PATCH: [ 1392729 ] Cleanup variables in RunFileDiff
2999 Src: DiffWrapper.cpp
3000 BUG: [ 1369646 ] Confusing half-commented lines in DiffFileData::prepAndCompa
3001 Src: DiffWrapper.cpp
3002 BUG: [ 1392740 ] Clutter in debug output
3004 PATCH: [ 1391766 ] Sync language resources to English
3006 Languages\Brazilian\MergeBrazilian.rc
3007 Languages\Bulgarian\MergeBulgarian.rc
3008 Languages\Catalan\MergeCatalan.rc
3009 Languages\ChineseSimplified\MergeChineseSimplified.rc
3010 Languages\ChineseTraditional\MergeChineseTraditional.rc
3011 Languages\Czech\MergeCzech.rc
3012 Languages\Danish\MergeDanish.rc
3013 Languages\Dutch\MergeDutch.rc
3014 Languages\German\MergeGerman.rc
3015 Languages\Hungarian\MergeHungarian.rc
3016 Languages\Italian\MergeItalian.rc
3017 Languages\Japanese\MergeJapanese.rc
3018 Languages\Korean\MergeKorean.rc
3019 Languages\Norwegian\MergeNorwegian.rc
3020 Languages\Polish\MergePolish.rc
3021 Languages\Russian\MergeRussian.rc
3022 Languages\Slovak\MergeSlovak.rc
3023 Languages\Spanish\MergeSpanish.rc
3024 Languages\Swedish\MergeSwedish.rc
3025 Languages\Turkish\MergeTurkish.rc
3026 PATCH: [ 1212368 ] Display correct paths in context patches
3027 Src: DiffWrapper.cpp DiffWrapper.h
3028 diffutils\src: CONTEXT.C DIFF.H
3029 PATCH: [ 1390454 ] new commandline arguments (prediffer, ignorews...)
3030 Src: ConfigLog.cpp DirDoc.cpp DirDoc.h FileTransform.cpp
3031 MainFrm.cpp MainFrm.h Merge.cpp Merge.dsp Merge.h
3032 MergeEditView.cpp MergeEditView.h
3033 PluginManager.cpp PluginManager.h Plugins.cpp Plugins.h
3035 Src New files: MergeArgs.h MergeArgs.cpp
3036 Src/Common: CmdArgs.cpp CmdArgs.h OptionsMgr.cpp OptionsMgr.h
3039 PATCH: [ 1391732 ] Do not offer to unify codepages in UNICODE build
3040 Also introduces new error IDS_DIFFERENT_UNICODINGS and new
3041 global function IsUnicodeBuild.
3042 Src: ConfigLog.cpp MainFrm.cpp Merge.rc resource.h StdAfx.cpp StdAfx.h
3045 PATCH: [ 1390793 ] New global function GetOptionMgr
3046 Src: DirActions.cpp DirDoc.cpp DirView.cpp DirViewColHandler.cpp
3047 LocationView.cpp MainFrm.cpp MainFrm.h MergeDiffDetailView.cpp
3048 MergeDoc.cpp MergeEditView.cpp OpenDlg.cpp
3049 Src/Common: OptionsMgr.h
3052 PATCH: [ 1382130 ] New line-based RCLocalizationHelper
3056 PATCH: [ 1388704 ] Simplified Chinese language .rc file for RC1
3057 Src/Languages/ChineseSimplified: MergeChineseSimplified.rc
3058 Update language versions of resource.h
3059 Src/Languages/*: resource.h
3062 Update & synchronize translations: Danish Dutch French Hungarian Italian Japanese
3065 Danish: MergeDanish.rc
3066 Dutch: MergeDutch.rc
3067 French: MergeFrench.rc
3068 Hungarian: MergeHungarian.rc
3069 Italian: MergeItalian.rc
3070 Japanese: MergeJapanese.rc
3071 Remove needless cast
3072 Src/Common: unicoder.cpp
3073 Update & synchronize translations: Korean Norwegian Polish Russian
3076 Korean: MergeKorean.rc
3077 Norwegian: MergeNorwegian.rc
3078 Polish: MergePolish.rc
3079 Russian: MergeRussian.rc
3082 PATCH: [ 1388456 ] Convert rest of folder compare bitmaps to icons
3083 Icons from Tim (Thanks!)
3084 Src: CompareStatisticsDlg.cpp DirView.cpp Merge.dsp Merge.rc resource.h
3085 Src/res added files: binarydiff.ico equalbinary.ico equalfile.ico error.ico
3086 fileskip.ico folderup.ico folderup_disable.ico lfile.ico notequalfile.ico
3087 rfile.ico sigma.ico unknown.ico
3088 Src/res removed files: binary.bmp binarydiff.bmp error.bmp fileskip.bmp
3089 folderup.bmp folderup_disable.bmp lfile.bmp notequal.bmp rfile.bmp
3090 sigma.bmp unknown.bmp
3091 Src/Languages: *.rc resource.h
3093 2005-12-21 WinMerge experimental release 2.5.0.4 (cvs)
3096 BUG: [ 1385518 ] Batch file syntax highlighting weirdness
3098 Src/editlib: batch.cpp
3099 PATCH: [ 1387297 ] Swedish translation update for 2.5.0.3+
3100 Submitted by Hans Eriksson
3101 Src/Languages/Swedish: MergeSwedish.rc
3104 PATCH: [ 1386442 ] Local variable uses m_ prefix in CChildFrame
3108 PATCH: [ 1384646 ] Replace Question icons with warning icons in messageboxes
3109 Src: DirActions.cpp FileFiltersDlg.cpp MainFrm.cpp MergeDoc.cpp PatchDlg.cpp
3112 PATCH: [ 1383120 ] Fix background colors in WinMerge
3113 Src: SyntaxColors.cpp SyntaxColors.h
3114 Src/Common: OptionsMgr.cpp OptionsMgr.h
3115 PATCH: [ 1384181 ] Fix byte difference fencepost/infinite loop
3116 Src: CompareOptions.h ConfigLog.cpp DiffWrapper.cpp DiffWrapper.h
3117 Merge.dsp PatchDlg.cpp stringdiffs.cpp
3120 BUG: [ 1379277 ] typo fix for docs
3121 Docs/Developers: Plugins.html
3122 BUG: [ 1375661 ] Readme incomplete in WinMerge 2.5.0.3
3123 Docs/Users: ReadMe.txt
3124 PATCH: [ 1382966 ] Remove empty CMergeEditView::AddMod() and ResetMod()
3125 Src: MergeEditView.cpp MergeEditView.h
3128 PATCH: [ 1378771 ] Fix for BUG:[ 1376552 ] char offset not getting updated when...
3129 Src: ChildFrm.cpp MergeEditView.cpp
3132 PATCH: [ 1378795 ] The searched word is not highlighted correctly
3133 Src/editlib: ccrystaltextview.cpp
3136 PATCH: [ 1382955 ] Remove unused CompareStats.h include from DirFrame.cpp
3138 PATCH: [ 1376711 ] Change CFile::GetStatus to paths_DoesPathExist
3139 Src: files.cpp MainFrm.cpp MainFrm.h Merge.cpp MergeDoc.cpp OpenDlg.cpp
3141 Src/Common: coretools.cpp
3144 PATCH: [ 1381984 ] Folder compare progressdialog could be drawn off-screen
3145 Src: DirCompProgressDlg.cpp
3148 PATCH: [ 1380083 ] Fix EditBinaryFiles Plugin BuildTmp paths
3149 Plugins\src_VCPP\EditBinaryFiles: EditBinaryFiles.dsp
3152 PATCH: [ 1381975 ] Don't open Open-dialog outside screen
3153 Src: MainFrm.cpp OpenDlg.cpp
3154 Src removed file: multimon.h
3157 BUG: [ 1380019 ] Bulgarian translation has wrong language id
3158 Src/Languages/Bulgarian: MergeBulgarian.rc
3159 PATCH: [ 1382131 ] English rc file has numbers instead of symbols for language
3161 PATCH: [ 1379227 ] Fix ExpatLibs BuildTmp paths
3162 Src/ExpatLib: expat_static.dsp
3163 Src/ExpatMapLib: expat_maps_static.dsp
3164 PATCH: [ 1379228 ] Fix Merge7zInstaller BuildTmp paths
3165 Merge7zInstaller: Merge7zInstaller.dsp
3168 PATCH: [ 1381935 ] Simplify DirView icon loading
3172 BUG: [ 1382021 ] Merge7z432 missing?
3173 Merge7z new files: Merge7z431.dsp Merge7z432.dsp
3176 PATCH: [ 1188787 ] New Chinese translation rc file (from PATCH 1183476)
3177 Some more synchronizing from submitted patch
3178 Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
3179 PATCH: [ 1379226 ] Fix Display Plugins BuildTmp paths
3181 PATCH: [ 1188787 ] New Chinese translation rc file (from PATCH 1183476)
3182 Last updates from submitted patch
3183 Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
3184 BUG: [ 1381879 ] Unused variable in unicoder.cpp
3185 Src/common: unicoder.cpp
3188 Update & synchronize translations: ChineseTraditional Czech Danish Dutch
3190 ChineseTraditional: MergeChineseTraditional.rc
3191 Czech: MergeCzech.rc
3192 Danish: MergeDanish.rc
3193 Dutch: MergeDutch.rc
3194 Update & synchronize translations: French German Hungarian Italian Japanese
3196 French: MergeFrench.rc
3197 German: MergeGerman.rc
3198 Hungarian: MergeHungarian.rc
3199 Italian: MergeItalian.rc
3200 Japanese: MergeJapanese.rc
3203 PATCH: [ 1379894 ] Fix handling of unknown encoding
3205 Src/Common: unicoder.cpp
3206 Update & synchronize translations: Brazilian Bulgarian Catalan ChineseSimplified
3208 Brazilian: MergeBrazilian.rc
3209 Bulgarian: MergeBulgarian.rc
3210 Catalan: MergeCatalan.rc
3211 ChineseSimplified: MergeChineseSimplified.rc
3214 PATCH: [ 1378174 ] Share Src/res between translations
3216 Src/Languages/res: removed .bmp .cur and .ico files and WinMergeSplash.psd
3217 splash1.bmp and splash WinMergeSplash.psd not removed from Catalan
3220 PATCH: [ 1377545 ] Remove needless casts
3223 PATCH: [ 1372549 ] readme for Merge7z distributables
3227 PATCH: [ 1371994 ] Enable hi-color icons for folder compare
3228 Icons from Tim (Thanks!)
3229 Src: CompareStatisticsDlg.cpp DirView.cpp Merge.rc resource.h
3230 res new files: folder.ico folderskip.ico lfolder.ico rfolder.ico
3231 res deleted files: folder.bmp folderskip.bmp lfolder.bmp rfolder.bmp
3232 Src/Languages: *.rc resource.h
3233 Src/Languages/res: new and deleted files like in res above
3236 PATCH: [ 1371384 ] Move Expat maps into WinMerge src
3237 Plugins\src_VCPP\DisplayXMLFiles: DisplayXMLFiles.dsp
3238 Src\ExpatMapLib added
3239 Many files moved from DisplayXMLFiles to new ExpatMapLib
3240 PATCH: [ 1373020 ] Carry unicoding, codepage, & file path together
3241 & PATCH: [ 1377545 ] Remove needless casts
3242 Src: DiffWrapper.cpp DiffWrapper.h DirScan.cpp DirView.cpp
3243 MainFrm.cpp MainFrm.h Merge.dsp MergeDoc.cpp MergeDoc.h
3244 Src\Common: RegKey.cpp
3245 NEW Src\FileLocation.h
3248 PATCH: [ 1188787 ] New Chinese translation rc file (from PATCH 1183476)
3249 Remainder of dialogs
3250 Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
3251 BUG: [ 1376825 ] infinite loop bug in byte diffs
3252 Src: stringdiffs.cpp
3253 PATCH: [ 1188787 ] New Chinese translation rc file (from PATCH 1183476)
3254 A few string resources
3255 Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
3256 PATCH: [ 1249007 ] Short size column
3257 Src: DirViewColItems.cpp locality.cpp locality.h Merge.rc resource.h
3258 PATCH: [ 1377362 ] Fix coretools to MakeResDll compiles
3259 BUG: [ 1377361 ] MakeResDll broken b/c coretools broken
3260 Src/Common: coretools.cpp
3263 PATCH: [1374728 ] Fix filter dialog delete
3264 Src: FileFilterMgr.cpp
3267 PATCH: [ 1374782 ] fix for bug 1300957 Crash on save 'unique' file comparison
3268 Submitted by Oliver Mellet, some additional comment improvements by me.
3270 Takashi is now developer, Olivier Mellet submitted a patch
3271 Docs/Users: Contributors.txt
3274 PATCH: [ 1376457 ] Need clarification in platform test in ShellExtension
3275 ShellExtension: ShellExtension.cpp
3278 fix two-line-end-markers bug that was reported in:
3279 "PATCH: [ 1372716 ] patch for RFE:[ 922992 ] Word Wrap/split long lines"
3280 Src: stringdiffs.cpp
3283 PATCH: [ 1372716 ] patch for RFE:[ 922992 ] Word Wrap/split long lines
3284 Src: Merge.rc MergeDoc.cpp MergeEditView.cpp MergeEditView.h OptionsDef.h
3285 OptionsInit.cpp resource.h
3286 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h ccrystaltextview2.cpp
3287 crystalparser.cpp editcmd.h
3288 Src/Languages: *.rc resource.h
3291 PATCH [ 1374931 ] Bugfixes & upload binary for RCLocalizationHelper
3292 (RCLocalizationHelper plugin)
3295 PATCH [ 1372575 ] Fix link for DisplayXmlFiles plugin
3296 (DisplayXMLFiles plugin)
3297 TODO [ 1341058 ] ToDoDeleteThisValidateColumnOrdering()
3298 Src: DirView.cpp DirView.h DirViewColHandler.cpp
3300 2005-12-06 WinMerge experimental release 2.5.0.3 (cvs)
3303 PATCH: [ 1372589 ] Document tildas in config
3306 PATCH: [ 1373037 ] Fix filter dialog to correctly add new filters
3308 Src: FileFiltersDlg.cpp
3309 PATCH: [ 1370183 ] ShellExtension: better way to check for WinMerge executable
3310 ShellExtension: WinMergeShell.cpp
3311 Bump ShellExtension version to 1.7.0
3312 ShellExtension: ShellExtension.rc
3315 PATCH: [ 1372974 ] Make local function "GuessEncoding_from_bytes" static
3316 Src: codepage_detect.cpp
3317 PATCH: [ 1368762 ] Fix assignment in DirScan_GetItems
3318 Also add explanatory comment, for what variable does.
3322 CMarkdown::FileImage::GuessByteOrder(), GuessCodepageEncoding(): Fix UTF-8 signature detection
3323 CMarkdown::GetTagName(): Strip bogus trailing slash in name of empty tag
3324 Src: markdown.cpp codepage_detect.cpp
3327 PATCH: [ 1335128 ] Ignore uninstalled codepages
3328 Src: MergeDoc.cpp MergeDoc.h codepage.cpp codepage_detect.cpp
3329 Src/Common: unicoder.cpp
3332 PATCH: [ 1358408 ] Import and export for options
3333 Increase buffer size
3334 Src/Common: OptionsMgr.cpp
3337 PATCH: [ 1369660 ] Delete unused variables m_msgUpdateStatus
3339 Src: DirDoc.cpp DiffContext.cpp DiffContext.h DiffThread.cpp
3343 PATCH: [ 1369657 ] Delete unused variable DiffFuncStruct::msgStatusUpdate
3345 BUG: [ 1369856 ] Crashed when interface language is changed
3347 BUG: [ 1368755 ] Want comment on format line in 7ZCommon.cpp
3348 Cosmetic: adding explanatory comment to Merge7z::Proxy::operator->
3352 PATCH: [ 1369544 ] Catalan translation update
3353 Submitted by Jordi Vilar
3354 Docs/Users/Languages: ReadMe-Catalan.txt
3355 Src/Languages/Catalan: MergeCatalan.rc
3356 PATCH: [ 1265295 ] Swap file compare panes (use pointers for buffers)
3357 Forgot to update resource.h in language folders
3358 Src/Languages: resource.h
3361 Cosmetic: add comment to DiffThread giving value of msgID variable
3362 (to help debugging).
3366 BUG: [ 1368492 ] cvs ASSERT failing
3367 Fix reversion bug from Patch [ 1265295 ]
3370 PATCH: [ 1265295 ] Swap file compare panes (use pointers for buffers)
3371 Submitted by Takashi Sawanaka
3372 Src: ChildFrm.cpp DiffList.cpp DiffList.h DirDoc.cpp EditorFilepathBar.cpp
3373 EditorFilepathBar.h LocationView.cpp LocationView.h MainFrm.cpp Merge.rc
3374 MergeDiffDetailView.cpp MergeDiffDetailView.h MergeDoc.cpp MergeDoc.h
3375 MergeDocLineDiffs.cpp MergeEditView.cpp MergeEditView.h PathContext.cpp
3376 PathContext.h resource.h
3377 Src/Languages: *.rc resource.h
3380 PATCH: [ 1336598 ] Add extensions DisplayXMLFiles plugin
3381 Add several new extensions, bump version (1.0.2.0 -> 1.0.3.0)
3382 Plugins\src_VCPP\DisplayXMLFiles:
3383 DisplayXMLFiles.dsp DisplayXMLFiles.rc WinMergeScript.cpp
3388 PATCH: [ 1241935 ] Implement Line Diff coloring on byte diffs
3389 Src: MergeDoc.cpp MergeDoc.h MergeDocLineDiffs.cpp PropEditor.cpp
3391 2005-11-23 WinMerge experimental release 2.5.0.2 (cvs)
3394 PATCH: [ 1363114 ] Add '*.ctl;*.pag;*.dsr' to Visual Basic highlighter
3395 Src/editlib: ccrystaltextview.cpp
3398 PATCH: [ 1362882 ] Remove option for autoclosing compare statepane
3399 Src: Merge.rc OptionsDef.h OptionsInit.cpp PropGeneral.cpp PropGeneral.h resource.h
3400 Src/Languages: *.rc resource.h
3401 BUG: [ 1355884 ] 2.4.2 fails to open dvd files
3402 File/folder selection dialog couldn't open read-only folders
3406 PATCH: [ 1334277 ] Show asterisk in #diffs for QuickCompare results
3407 Src: DiffWrapper.cpp DiffWrapper.h DirViewColItems.cpp
3408 PATCH: [ 1334589 ] Encoding maps for Expat parser, for DisplayXmlFiles plugin
3409 Plugins/src_VCPP/DisplayXMLFiles
3410 BUG: [ 1277320 ] Plugins.txt not up-to-date
3411 Plugins/dll/IgnoreCommentsC
3414 Merge7z DllBuild 0017
3415 Merge7z: StdAfx.h Merge7zCommon.cpp Merge7zCommon.h revision.txt
3416 Merge7z new files: Merge7z430.dsp
3417 Merge7zInstaller: Files.rc2 Installer.cpp Merge7zInstaller.dsp
3420 PATCH: [ 1358408 ] Import and export for options
3421 Src: Merge.rc resource.h
3422 Src/Common: OptionsMgr.cpp OptionsMgr.h PreferencesDlg.cpp PreferencesDlg.h
3423 Src/Languages: *.rc resource.h
3426 PATCH: [ 1349645 ] Folder Compare Statistics dialog
3427 PATCH: [ 1347787 ] Use non-modal dialog for dir compare status
3428 Src: DirDoc.cpp DirDoc.h DirFrame.cpp DirFrame.h DirView.cpp DirView.h Merge.cpp Merge.dsp
3430 Src new files: CompareStatisticsDlg.cpp CompareStatisticsDlg.h DirCompProgressDlg.cpp
3431 DirCompProgressDlg.h
3432 Src deleted files: DirCompStateBar.cpp DirCompStateBar.h
3433 Src/res new file: sigma.bmp
3434 Src/Languages: *.rc resource.h
3437 PATCH: [ 1356783 ] Use OptionsMgr in SyntaxColors class
3438 Src: MainFrm.cpp SyntaxColors.cpp SyntaxColors.h
3441 PATCH: [ 1350638 ] Move options read/write code to options panels
3442 Src: MainFrm.cpp Merge.dsp PropArchive.cpp PropArchive.h PropCodepage.cpp PropCodepage.h
3443 PropColors.cpp PropColors.h PropCompare.cpp PropCompare.h PropEditor.cpp PropEditor.h
3444 PropGeneral.cpp PropGeneral.h PropRegistry.cpp PropRegistry.h PropVss.cpp PropVss.h
3445 Src new file: IOptionsPanel.h
3446 Src/Common: PreferencesDlg.cpp PreferencesDlg.h
3449 Merge Perry's fix for OpenDlg/SelectFile() to Merge.cpp/SelectFile() (PATCH #1348733)
3451 PATCH: [ 1350489 ] Use SelectFile() for external editor selection
3452 Src: PropRegistry.cpp
3455 PATCH: [ 1327413 ] Fix bug in CDirDoc::AllowUpwardDirectory()
3456 Change CDirView::AreItemsOpenable() to consider archive files as openable
3457 Src: DirActions.cpp DirDoc.cpp DirView.cpp
3460 PATCH: [ 1337905 ] Allow comparing binary files with binary unpacker
3462 PATCH: [ 1348733 ] Fix open dialog for cvs version 2.4
3466 PATCH: [ 1335072 ] Add text to Plugins.txt to cover DisplayXMLFiles
3467 Plugins/dlls: Plugins.txt
3469 2005-11-02 WinMerge experimental release 2.5.0.1 (cvs)
3472 BUG: [ 1341243 ] Current Find string is too fragile
3473 Was resetting find string after rescanning
3474 Src/editlib: ccrystaltextview.cpp
3475 PATCH: [ 1342550 ] Modernize file selection dialog
3476 PATCH: [ 1345110 ] Properly compare projectfile extension
3477 Src: Merge.cpp Merge.h OpenDlg.cpp
3478 Bump ShellExtension version to 1.6.2
3479 ShellExtension: ShellExtension.rc
3482 PATCH: [ 1345382 ] Translated Shell Extension to German
3483 ShellExtension/Languages: ShellExtensionGerman.rc
3486 RFE: [ 1324314 ] CTRL+W to close current diff
3489 PATCH: [ 1342871 ] Disable Copy Filenames for folders
3490 Src: DirView.cpp DirView.h
3491 PATCH: [ 1343059 ] Swedish translation update for 2.5.0.1 experimental
3492 Submitted by Hans Eriksson
3493 Src/Languages/Swedish: MergeSwedish.rc
3496 PATCH: [ 1341813 ] VSS project linking misdetects project files
3498 PATCH: [ 1310710 ] Fix bug #1309450
3500 Src: DiffContext.cpp DiffContext.h DiffFileInfo.cpp DiffFileInfo.h DirScan.cpp
3503 PATCH: [ 1341183 ] Fix VSS checkout canceling
3504 Src: DirActions.cpp MainFrm.cpp
3505 Open 2.4 manual (update link)
3509 PATCH: [ 1334444 ] Remove needless (& therefore confusing) cast
3510 Src: LocationView.cpp
3513 PATCH: [ 1334484 ] Skip location view paint if buffer not initialized
3514 Src: LocationView.cpp MergeDoc.cpp MergeDoc.h
3515 MergeEditView.cpp MergeEditView.h
3516 Cosmetic changes to GetFunctionsFromScript, to document
3517 arguments passed to GetTypeInfo.
3521 PATCH: [ 1333545 ] Small improvement to Open-dialog folder selection
3523 PATCH: [ 1333581 ] Increase quick compare limit and make it option
3524 Src: DiffContext.h DiffWrapper.cpp DirDoc.cpp OptionsDef.h OptionsInit.cpp
3527 PATCH: [ 1330179 ] Icon for 'Print'
3528 Src: MainFrm.cpp Merge.rc resource.h
3529 Src/res new file: print.bmp
3530 Src/Languages: *.rc resource.h
3531 Src/Languages/res new file: print.bmp
3534 PATCH: [ 1332365 ] Make some DirActions.cpp functions consts
3535 Src: DirActions.cpp DirView.h
3538 PATCH: [ 1329951 ] Readme.txt points to version 2.2 manual
3539 Docs/Users: ReadMe.txt
3540 Docs/Users/Languages: ReadMe-Catalan.txt ReadMe-Swedish.txt
3541 BUG: [ 1326621 ] Extention ".WinMerge" is omitted
3545 PATCH: [ 1330059 ] Translated 3 missing sentences to German
3546 Src/Languages/German: MergeGerman.rc
3549 PATCH: [ 1326813 ] Fix binary detection to allow archives
3553 PATCH: [ 1305541 ] Rational ClearCase support
3554 Submitted by Greg (rys1908)
3555 Src: CCPrompt.cpp CCprompt.h DirActions.cpp MainFrm.cpp MainFrm.h Merge.rc resource.h
3556 Src/Common: coretools.cpp
3557 Src/Languages: *.rc resource.h
3560 PATCH: [ 1323107 ] Patch for crash on save filenames with different cases
3561 From anonymous submitter
3563 PATCH: [ 1286629 ] print support
3564 Submitted by Markus Rollmann
3565 Src: MainFrm.cpp Merge.rc MergeEditView.cpp MergeEditView.h
3566 Src/Common: SplitterWndEx.cpp SplitterWndEx.h
3567 Src/editlib: ccrystaleditview.cpp
3569 Add Markus Rollmann to Contributors.txt
3570 Docs/Users/Contributors.txt
3573 PATCH: [ 1242008 ] Update status to binary if open fails because binary
3574 Follow on for 2nd case
3575 Src: DirView.cpp MergeDoc.cpp
3578 PATCH: [ 1302710 ] generating a report is slow
3579 Perry added comments explaining one code line
3580 Src: DirCmpReport.cpp
3583 PATCH: [ 1302710 ] generating a report is slow
3584 Submitted by Takashi Sawanaka
3585 Src: DirCmpReport.cpp
3586 PATCH: [ 1310214 ] Shell extension italian translation
3587 Submitted by Andrea Decorte
3588 ShellExtension/Languages: ShellExtensionItalian.rc
3591 PATCH: [ 1253949 ] cosmetic comment fix
3593 PATCH: [ 1253950 ] cosmetic--remove old code in InitInstance
3595 PATCH: [ 1253951 ] trivial cosmetic comment upgrade in arg parsing
3599 Merge7z DllBuild 0015
3600 Merge7z: Merge7zCommon.cpp Merge7zCommon.h revision.txt
3601 Merge7z new files: Merge7z427.dsp Merge7z428.dsp Merge7z429.dsp
3602 Merge7zInstaller update
3603 Merge7zInstaller: Files.rc2 Installer.cpp Installer.rc
3606 PATCH: [ 1309423 ] Small typo in MergeSwedish.rc
3607 Submitted by Hans Eriksson
3608 Src/Languages/Swedish: MergeSwedish.rc
3611 PATCH: [ 1229867 ] RFE [ 1205516 ], RFE [ 887948 ], and other issues
3612 Cosmetic, transcribing comment from patch discussion
3616 PATCH: [ 1302608 ] crash on generating a report
3617 Submitted by Takashi Sawanaka
3618 Src: DirCmpReport.cpp
3621 BUG: [ 1298687 ] The files marked as 'skipped' are compared
3622 Fix from Takashi Sawanaka, comment updates by me
3626 PATCH: [ 1301504 ] Danish ShellExtension translation
3627 Submitted by Christial List
3628 ShellExtension/Languages: ShellExtensionDanish.rc
3631 PATCH: [ 1297642 ] Japanese translation update
3632 Submitted by Takashi Sawanaka
3633 ShellExtension/Languages: ShellExtensionJapanese.rc
3634 Src/Languages/Japanese: MergeJapanese.rc
3637 PATCH: [ 1297406 ] updated hungarian translation
3638 Submitted by Márton Balázs
3639 Src/Languages/Hungarian: MergeHungarian.rc
3642 PATCH: [ 1295701 ] Scrolling for dir compare report filename
3645 PATCH: [ 1295758 ] Update URL for downloads page (archive options)
3646 Src: PropArchive.cpp
3649 PATCH: [ 1295767 ] German Translation for 'Highlight Line * Diff'
3650 Src/Languages/German: MergeGerman.rc
3653 PATCH: [ 1294514 ] Set file loading traces debug-only
3655 PATCH: [ 1295473 ] updated italian rc file for winmerge 2.3.6
3656 Submitted by Andrea Decorte
3657 Src/Languages/Italian: MergeItalian.rc
3660 PATCH: [ 1292120 ] More significant diff navigations fixes
3661 Src: DiffList.cpp DiffList.h MergeDoc.cpp MergeEditView.cpp
3662 BUG: [ 1290305 ] ShellExtensionU.dll info missing from config log
3666 PATCH: [ 1292279 ] Various Updates in German Translation
3667 Src/Languages/German: MergeGerman.rc
3670 PATCH: [ 1290477 ] Catalan translation update
3671 Submitted by Jordi Vilar
3672 Src/Languages/Catalan: MergeCatalan.rc
3675 PATCH: [ 1289037 ] Some (non)significant diff count fixes
3676 Src: DiffList.cpp DiffList.h MergeDoc.cpp MergeEditView.cpp
3679 PATCH: [ 1284150 ] Fix Shell Extension registering problem
3680 Also bump version to 1.6
3681 ShellExtension: ShellExtension.cpp ShellExtension.rc
3684 BUG: [ 1284304 ] StaticLink crashes after mouse over event
3685 Changed signature of CStaticLink::OnSetCursor to start with CWnd *
3686 Src\Common: StaticLink.cpp StaticLink.h
3689 PATCH: [ 1285404 ] Various Updates in German Translation
3690 Src/Languages/German: MergeGerman.rc
3693 PATCH: [ 1284890 ] Use Changes.txt instead of readme.txt for ChangeLog
3694 Added ChangeLogs folder to project, and put Changes.txt (this),
3695 readme.txt, and CHANGELO into new ChangeLogs folder.
3696 PATCH: [ 1283466 ] French translation
3697 New translation by Jean-F Jolin
3698 Src/Languages/French: MergeFrench.rc
3701 Previous change history is in file readme.txt