3 (This summarizes all changes to all files under Src, including Src\Languages.)
6 PATCH: [ 1688012 ] Remove IDR_MAINFRAME icon from lang files
7 Src: AboutDlg.cpp Merge.rc resource.h
8 Src/Languages/*: Merge*.rc
9 PATCH: [ 1684865 ] WinMerge Icon Set Revision 4
10 (Now with the 256*256 versions)
11 Src/res: MergeDoc.ico MergeProject.ico
14 PATCH: [ 1687966 ] Fix crash when changing compare method
15 Src: DiffContext.cpp DiffContext.h FolderCmp.cpp
18 BUG: [ 1687754 ] Editor regression in trunk (2)
19 Src: stringdiffs.cpp stringdiffsi.h
22 BUG: [ 1639453 ] Imaginary difference highlighted in character level mode
26 PATCH: [ 1687661 ] Remove ICONS and BITMAPS from lang files
27 Src/Languages/*: Merge*.rc
28 PATCH: [ 1687983 ] Remove IMAGES and CURSORS from lang files
29 Src/Common: Picture.cpp
30 Src/editlib: ccrystaltextview.cpp
31 Src/Languages/*: Merge*.rc
34 BUG: [ 1687754 ] Editor regression in trunk
35 Src: stringdiffs.cpp stringdiffsi.h
38 Japanese translation - update
39 Src/Languages/Japanese/MergeJapanese.rc
42 PATCH: [ 1687430 ] printing patch
43 Src: Merge.rc MergeEditView.cpp MergeEditView.h
44 Src/Common: SplitterWndEx.cpp SplitterWndEx.h
45 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
46 Src/Languages/*: Merge*.rc
49 BUG: [ 1680920 ] Line filters are not preserved across sessions
50 Src/Common: OptionsMgr.cpp
53 PATCH: [ 1687439 ] Add MergeProject.ico to WinMerge EXE
54 Src: Merge.dsp Merge.rc resource.h
55 Src/res new file: MergeProject.ico
58 PATCH: [ 1684865 ] WinMerge Icon Set Revision 4
59 (Initially without the 256*256 version)
63 BUG: [ 1683061 ] Bug in highlighting
67 RFE: [ 1646407 ] Use "equal" or "not equal" as file compare icon
68 Src: ChildFrm.cpp ChildFrm.h MergeDoc.cpp
71 BUG: [ 1491334 ] thinly highlighted position is wrong
72 Src: stringdiffs.cpp stringdiffsi.h
74 2007-03-20 WinMerge experimental release 2.7.3.1 (SVN revision 4179)
77 PATCH: [ 1683805 ] Remove unneeded linefilter registry values
78 Src: LineFiltersList.cpp
79 Src/Common: OptionsMgr.cpp OptionsMgr.h
80 PATCH: [ 1683842 ] Allow resizing copy confirmation dialog
81 Src: ConfirmFolderCopyDlg.cpp ConfirmFolderCopyDlg.h Merge.rc
82 Src/Languages/*: Merge*.rc
85 PATCH: [ 1680209 ] New icons from Alexander Skinner (Part 1)
86 Based on icons by Alexander Skinner
87 Src/res: copy.bmp cut.bmp language.bmp paste.bmp print.bmp select_all.bmp select_font.bmp
88 PATCH: [ 1683289 ] Swedish translation update for Improve Line filters dialog
89 Submitted by Hans Eriksson
90 Src/Languages/Swedish: MergeSwedish.rc
93 Remove extra line from manifest file
94 Src/res: WinMergeU.exe.manifest
97 PATCH: [ 1682475 ] Improve Line filters dialog (add new files I forgot to add)
99 Src new files: LineFiltersList.cpp LineFiltersList.h
102 PATCH: [ 1682475 ] Improve Line filters dialog
103 Src: DirDoc.cpp MainFrm.cpp MainFrm.h Merge.rc Merge.rc MergeDoc.cpp OptionsDef.h
104 OptionsInit.cpp PropLineFilter.cpp PropLineFilter.h
105 Src/Languages/*: Merge*.rc
106 BUG: [ 1682500 ] Crash when comparing empty folders
107 Reported and analyzed by Takashi
111 Trivial string initialization fix
112 Src: SyntaxColors.cpp
115 PATCH: [ 1679196 ] Cleanup logfile class usage
116 Src: DiffWrapper.cpp DirActions.cpp DirDoc.cpp DirScan.cpp FolderCmp.cpp MainFrm.cpp
117 Merge.cpp Merge.h MergeDoc.cpp Plugins.cpp StdAfx.cpp StdAfx.h
118 Src/Common: LogFile.cpp LogFile.h
121 Remove unneeded include lines
123 Remove unneeded initialization
125 PATCH: [ 1678676 ] Swedish translation of New Copy Confirmation dialog
126 Submitted by Hans Eriksson
127 Src/Languages/Swedish: MergeSwedish.rc
130 Czech translation - translation of "confirm copy" dialog
131 Src/Languages/Czech/MergeCzech.rc
134 PATCH: [ 1664689 ] French translation (update2)
135 Submitted by Jean-F Jolin
136 Src/Languages/French: MergeFrench.rc
137 Remove two unused functions, improve comments
139 BUG: [ 1670991 ] File panes lost focus after delete confirmation dialog
141 Fix comment about contributors file
143 PATCH: [ 1676802 ] Move compare options to DiffContext
144 Src: ByteComparator.cpp ByteComparator.h CompareOptions.cpp CompareOptions.h
145 DiffContext.cpp DiffContext.h DirDoc.cpp DirDoc.h FolderCmp.cpp
148 PATCH: [ 1675087 ] New copy confirmation dialog
149 Src: DirActions.cpp FileActionScript.h Merge.dsp Merge.rc resource.h
150 Src new files: ConfirmFolderCopyDlg.cpp ConfirmFolderCopyDlg.h
151 Src/Languages/*: Merge*.rc
154 PATCH: [ 1675211 ] Fix crash when hiding parent folder item on folder view
158 PATCH: [ 1673908 ] Update of Swedish translation for "View margins"
159 Submitted by Hans Eriksson
160 Src/Languages/Swedish: MergeSwedish.rc
163 PATCH: [ 1673082 ] Polish translation for WM CVS
164 Submitted by dr_prozac
165 Src/Languages/Polish: MergePolish.rc
168 BUG: [ 1668996 ] Two "Copy Right" buttons in Russian GUI.
169 Src/Languages/Russian: MergeRussian.rc
172 PATCH: [ 1664689 ] French translation (update)
173 Submitted by Jean-F Jolin
174 Src/Languages/French: MergeFrench.rc
176 2007-02-27 WinMerge beta release 2.7.2 (revision 4137)
179 Bump ShellExtension version to 1.11
180 ShellExtension: ShellExtension.rc
183 PATCH: [ 1664689 ] French translation
184 Submitted by Jean-F Jolin
185 Src/Languages/French: MergeFrench.rc
188 Czech translation - update
189 Src/Languages/Czech/MergeCzech.rc
192 PATCH: [ 1667564 ] Various Updates in German Translation
193 Src/Languages/German: MergeGerman.rc
196 Cleanup WMGotoDlg constructor
198 CleanUp VSS dialog class
202 BUG: [ 1664731 ] Margin and line numbers not separated
203 Src/editlib: ccrystaltextview.cpp
204 BUG: [ 1664727 ] Empty file compare looks broken
205 Fix revision marks for scratchpads
206 Src/editlib: ccrystaltextview.cpp
207 BUG: [ 1664832 ] Typo Error in the Registry
208 ShellExtension: WinMergeShell.rgs
209 BUG: [ 1666559 ] Error on save option (WinMerge 2.7.1.7)
213 BUG: [ 1664727 ] Empty file compare looks broken
214 Src/editlib: ccrystaltextview.cpp
216 2007-02-20 WinMerge experimental release 2.7.1.7 (SVN revision 4120)
219 PATCH: [ 1663798 ] Add option and menuitem for file compare selection margin
220 Src: Merge.rc MergeEditView.cpp MergeEditView.h OptionsDef.h OptionsInit.cpp
222 Src/editlib: ccrystaltextview.cpp
223 Src/Languages/*: Merge*.rc
224 Remove commented out lines
228 PATCH: [ 1663012 ] Fix total count for compare progress dialog
229 Src: DirCompProgressDlg.cpp DirCompProgressDlg.h
230 Bug: [ 1663197 ] s/inproper/improper [in Changes.txt]
232 PATCH: [ 1642876 ] Open manual for command line help
233 Src: Merge.cpp Merge.h Merge.rc resource.h
234 Src/Languages/*: Merge*.rc
237 Czech translation - update
238 Src/Languages/Czech/MergeCzech.rc
241 PATCH: [ 1662002 ] Use two threads for folder compare
242 Src: Diffcontext.cpp Diffcontext.h DiffThread.cpp DiffThread.h DirScan.cpp
246 PATCH: [ 1640274 ] Icons for folder compare popup menu
247 Src: MainFrm.cpp Merge.dsp Merge.rc resource.h
248 Src/res new files: both.bmp left.bmp left_to_browse.bmp left_to_right.bmp
249 move_left_to_browse.bmp move_right_to_browse.bmp right.bmp
250 right_to_browse.bmp right_to_left.bmp
251 Src/Languages/*: Merge*.rc
254 PATCH: [ 1659183 ] Add Vista security attributes to manifest files
255 Src/res: WinMerge.exe.manifest WinMergeU.exe.manifest
258 PATCH: [ 1657664 ] Swedish translation update for Backup options
259 Submitted by Hans Eriksson
260 Src/Languages/Swedish: MergeSwedish.rc
263 Fix compile with VC6 (doesn't have CString::Append() or CString::AppendChar())
264 Src: MainFrm.cpp PropBackups.cpp
267 PATCH: [ 1650831 ] Polish translation update for WinMerge 2.6.4
268 Submitted by dr_prozac
269 Src/Languages/Polish: MergePolish.rc
272 Add accelerator keys to new Backup options dialog
274 Src/Languages/*: Merge*.rc
277 PATCH: [ 1582537 ] CSS syntax highlighter
279 editlib: ccrystaltextview.cpp ccrystaltextview.h
280 editlib new file: css.cpp
283 PATCH: [ 1652696 ] Add more options for backup files
284 Src: FileActionScript.cpp MainFrm.cpp MainFrm.h Merge.dsp Merge.rc MergeDoc.cpp
285 OptionsDef.h OptionsInit.cpp PropGeneral.cpp PropGeneral.h resource.h
286 Src new files: PropBackups.cpp PropBackups.h
287 Src/Common: PreferencesDlg.cpp PreferencesDlg.h
288 Src/Languages/*: Merge*.rc
291 Remove unused enum definition
299 Remove unused parameter from CMainFrame::SyncFileToVCS()
300 Src: FileActionScript.cpp MainFrm.cpp MainFrm.h
302 2007-02-01 WinMerge experimental release 2.7.1.6 (SVN revision 4094)
305 PATCH: [ 1636314 ] Fix limiting to single file compare window (2)
308 PATCH: [ 1639493 ] Updated Bulgarian language files
309 Submitted by tigertron
310 Src/Languages/Bulgarian: MergeBulgarian.rc
311 Docs/Users/Languages: Readme-Bulgarian.txt
312 PATCH: [ 1650043 ] Convert CDiffWrapper to use CompareOptions
313 Src: CompareOptions.cpp CompareOptions.h DiffWrapper.cpp DiffWrapper.h
314 Remove commented out include line
318 PATCH: [ 1648182 ] Separate Compare options from DiffWrapper
319 Src: CompareOptions.h DiffWrapper.h DirDoc.cpp DirDoc.h Merge.dsp
320 Src new file: CompareOptions.cpp
321 PATCH: [ 1646638 ] Catalan translation update
322 Submitted by Jordi Vilar
323 Src/Languages/Catalan: MergeCatalan.rc
326 Merge7z DllBuild 0019 - Unassociate .exe filename extension from NSIS format
327 ArchiveSupport/Merge7z: Merge7zCommon.cpp Merge7zCommon.h revision.txt
328 Support 7-Zip versions 4.43 & 4.44
329 ArchiveSupport/Merge7z new files: Merge7z443.dsp Merge7z444.dsp
330 ArchiveSupport/Merge7zInstaller: Files.rc2
333 PATCH: [ 1640741 ] patch for BUG:[ 1635100 ] Inefficient word-wrap code
334 Src: MergeEditView.cpp MergeEditView.h
335 Src/edtlib: ccrystaltextview.cpp ccrystaltextview.h
338 PATCH: [ 1644668 ] Fix ANSI regexps(2)
339 Src: DiffWrapper.cpp FileFilterHelper.cpp FilterList.cpp
342 PATCH: [ 1644668 ] Fix ANSI regexps
343 Src: DiffWrapper.cpp FileFilterHelper.cpp FilterList.cpp FilterList.h
344 PATCH: [ 1644820 ] Implement post-compare linefilters for folder compare
345 Src: DiffContext.cpp DiffContext.h DiffThread.cpp DiffThread.h DirDoc.cpp
346 DirDoc.h FolderCmp.cpp FolderCmp.h
349 PATCH: [ 1644785 ] 24bit icons for "Window" menu
350 Based on icons by Alexander Skinner
351 Src/res: cascade.bmp change_pane.bmp close.bmp horizontally.bmp vertically.bmp
352 PATCH: [ 1644800 ] 24bit "Goto" icon
353 Based on icons by Alexander Skinner
357 PATCH: [ 1642809 ] Move compare code out from DiffFileData
358 Src: DiffFileData.cpp DiffFileData.h DiffWrapper.cpp DirScan.cpp
359 DirViewColItems.cpp Merge.dsp
360 Src new files: FolderCmp.cpp FolderCmp.h
363 BUG: [ 1637433 ] Forget selected filter after close
364 Src: Merge.cpp OptionsInit.cpp
367 PATCH: [ 1636314 ] Fix limiting to single file compare window
369 Move options function call out of if() (for easier debugging)
373 PATCH: [ 1620076 ] Add Bazaar and Mercurial to SourceControl.flt
374 Submitted by René Leonhardt
375 Filters: SourceControl.flt
376 Add René Leonhardt to Contributors.txt
377 Docs/Users: Contributors.txt
378 PATCH: [ 1634968 ] Swedish translation update for 2.7.1.5+
379 Submitted by Hans Eriksson
380 Src/Languages/Swedish: MergeSwedish.rc
383 Update manual URL point to 2.6 version manual in readme.txt
384 Docs/Users/ReadMe.txt
385 Docs/Users/Languages/ReadMe-*.txt
386 PATCH: [ 1633581 ] Restrict expanding env variables in open dialog
387 Src: OpenDlg.cpp OpenDlg.h paths.cpp paths.h
390 PATCH: [ 1633194 ] Add editor tab setting to configuration log
391 Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
393 2007-01-10 WinMerge experimental release 2.7.1.5 (SVN revision 4030)
396 PATCH: [ 1631796 ] Use PCRE for filemask filtering
397 Src: DiffWrapper.cpp DirDoc.h FileFilterHelper.cpp FileFilterHelper.h Merge.cpp
398 Merge.dsp Ucs2Utf8.cpp Ucs2Utf8.h
399 Src/Common removed files: Regexp.cpp RegExp.h
400 PATCH: [ 1631806 ] Fix Filterspath initialization
401 Src: MainFrm.cpp MainFrm.h Merge.cpp Merge.h OptionsInit.cpp
404 BUG: [ 1631613 ] WinMerge crashes when editing code files
405 Src/editlib: ccrystaleditview.cpp
408 BUG: [ 1630630 ] Unexpected selection of text after changing pane
409 Src: MergeEditView.cpp
412 PATCH: [ 1597814 ] 'Wrap Lines' + 'Next Diff' Bug (3)
413 Src: MergeEditView.cpp MergeEditView.h
416 PATCH: [ 1631215 ] Remove used files
418 Src/Common deleted: listvwex.cpp listvwex.h
421 PATCH: [ 1593810 ] Line-filtering post compare
422 Src: DiffWrapper.cpp DiffWrapper.h MainFrm.cpp MainFrm.h Merge.dsp MergeDoc.cpp
423 Src new files: FilterList.cpp FilterList.h
426 BUG: [ 1597939 ] Rename Edits Wrong Field in Folder Compare List
430 BUG: [ 1567749 ] "Unable to compare files" needs short result
431 Src: DirViewColItems.cpp Merge.rc resource.h
432 Src/Languages/*: Merge*.rc
435 TODO: [ 1489875 ] Mimimum height for location pane visible area indicator
436 Src: LocationView.cpp
437 TODO: [ 1485038 ] Rename DIFFITEM::IsSideLeft() and IsSideRight()
438 Src: CompareStats.cpp DiffContext.cpp DiffFileData.cpp DiffItem.cpp DiffItem.h
439 DirActions.cpp DirDoc.cpp DirScan.cpp DirView.cpp DirViewColHandler.cpp
441 PATCH: [ 1567773 ] Change "Only in xxxxxxxxxx" to "Right Only: xxxxxxxxxx"
442 Src: DirViewColItems.cpp Merge.rc resource.h
443 Src/Languages/*: Merge*.rc
444 ConvertFilter() function in FileOrFolderSelect can be a static function
445 Src: FileOrFolderSelect.cpp FileOrFolderSelect.h
448 PATCH: [ 1628203 ] Reduce options caching in MergeEditView
449 Src: MergeEditView.cpp MergeEditView.h
450 PATCH: [ 1628299 ] Use OptionsMgr for archive options
452 PATCH: [ 1628263 ] Add debug-menuitem for resetting options
453 Src: MainFrm.cpp MainFrm.h Merge.rc resource.h
454 Src/Languages/*: Merge*.rc
457 PATCH: [ 1625344 ] Move OptionsMgr from MainFrame to MergeApp
458 Src: FileActionScript.cpp MainFrm.cpp MainFrm.h Merge.cpp Merge.h
459 OptionsInit.cpp PropRegistry.cpp PropTextColors.cpp SourceControl.cpp
460 Src/Common: OptionsMgr.h
461 Use Empty() method for CString instead of assigning empty string into it
462 Src/Common: varprop.h
465 PATCH: [ 1625022 ] Constify OptionsManager parameters
466 Src/Common: OptionsMgr.cpp OptionsMgr.h
469 PATCH: [ 1623772 ] Constify PathContext parameter strings
470 Src: PathContext.cpp PathContext.h
472 2006-12-21 WinMerge experimental release 2.7.1.4 (SVN revision 3991)
475 BUG: [ 1603061 ] "Copy Left/Right To .." doesn't work correctly(2)
476 Src: FileActionScript.cpp DirActions.cpp
479 BUG: [ 1606583 ] VC6 build is broken
480 Backout of patch [ 1603769 ] Send MergeCmdLineInfo between instances
481 Src: MainFrm.cpp Merge.cpp MergeCmdLineInfo.cpp MergeCmdLineInfo.h
482 Bump ShellExtension version to 1.10
483 ShellExtension: ShellExtension.rc
484 BUG: [ 1619689 ] Filefilter: ASP.NET Devel
488 PATCH: [ 1618358 ] Fix warning about non-standard extension with enum
490 PATCH: [ 1618364 ] Make GPL URL const string
494 PATCH: [ 1617502 ] Cleanup use of enum in MovedLines
498 BUG: [ 1614558 ] Goto line doesn't work when word wrap is enabled
499 Src: MergeEditView.cpp
502 BUG: [ 1602219 ] Crappy save of project files
503 Src: MainFrm.cpp ProjectFilePathsDlg.cpp
506 PATCH: [ 1614442 ] Swedish translation update for WinMerge 2.6.2
507 Submitted by Hans Eriksson
508 Src/Languages/Swedish: MergeSwedish.rc
511 BUG: [ 1584068 ] location pane is inaccurate when word wrap is on (2)
512 Src: LocationView.cpp LocationView.h MergeEditView.cpp
515 Fix error in logical condition for checking if item is directory
517 PATCH: [ 1610998 ] Splash screen does not stop timer
519 PATCH: [ 1611060 ] Move constants from Merge.cpp to FileOrFolderSelect.cpp
520 Src: FileOrFolderSelect.cpp Merge.cpp
523 BUG: [ 1611542 ] "Wrap lines" does not work for diff pane
524 Src: MergeDiffDetailView.cpp MergeDiffDetailView.h
527 PATCH: [ 1447744 ] Match lines inside diff blocks (based on Perry's patch)
528 Src new files: MergeDocDiffSync.cpp
529 Src: DiffList.h Merge.dsp Merge.rc MergeDoc.cpp MergeDoc.h OptionsDef.h OptionsInit.cpp
530 PropCompare.cpp PropCompare.h resource.h
531 Src/Languages/*: Merge*.rc
534 BUG: [ 1584068 ] location pane is inaccurate when word wrap is on
535 Src: LocationView.cpp LocationView.h MergeEditView.cpp MergeEditView.h
538 BUG: [ 1604115 ] No copyright info in aboutbox for translations
542 BUG: [ 1610877 ] wrong shortcut (localizazion IT, italian)
543 Src/Languages/Italian: MergeItalian.rc
546 PATCH: [ 1610442 ] Make time getting faster for files
547 Src: DirScan.cpp FileInfo.cpp
548 PATCH: [ 1610477 ] Fix UniFile for weird filetimes
549 Src/Common: UniFile.cpp UniFile.h
552 Add missing include to fix ANSI build target
553 Src: FileOrFolderSelect.cpp
555 2006-12-05 WinMerge experimental release 2.7.1.3 (SVN revision 3919)
558 PATCH: [ 1608846 ] Create a class for moved blocks
559 Src: DiffWrapper.cpp DiffWrapper.h Merge.dsp MergeDoc.cpp MergeDoc.h
560 Src new files: MovedLines.cpp MovedLines.h
561 PATCH: [ 1557295 ] Exclude Source Control files and directories filter
562 Submitted by Paul Welter
563 Filters new file: SourceControl.flt
564 Add Peter Welter and Ivan Masár to contributors
565 Docs/Users: Contributors.txt
568 PATCH: [ 1607193 ] INI Syntax Improvements
570 PATCH: [ 1608541 ] Use INI highlighter for VB6 project files
571 Src/editlib: ccrystaltextview.cpp
574 PATCH: [ 1607823 ] Remove manifest loading from lang dlls
575 Src/Languages/*: Merge*.rc
578 PATCH: [ 1597814 ] 'Wrap Lines' + 'Next Diff' Bug (2)
579 Src: MergeEditView.cpp
582 PATCH: [ 1556688 ] Fix maketstring to check for zero-term by MultiByteToWideCha
583 Src: Common/unicoder.cpp
584 PATCH: [ 1606496 ] Slovak translation (update)
585 Submitted by Ivan Masár
586 Src/Languages/Slovak: MergeSlovak.rc
589 Remove commented out code
593 BUG: [ 1589324 ] WinMegee crashes on copy
594 Src: FileFilterMgr.cpp
597 Fix filefilter regexp uppercasing for trunk
598 Src: FileFilterMgr.cpp
601 BUG: [ 1603077 ] Doesn't filter the file vc60.idb using "Merge_VC_loose.flt"
602 Filters: Merge_VC_loose.flt
605 BUG: [ 1603061 ] "Copy Left/Right To .." doesn't work correctly
609 PATCH: [ 1606496 ] Slovak translation
610 Submitted by Ivan Masár
611 ShellExtension/Languages: ShellExtensionSlovak.rc
612 Src/Languages/Slovak: MergeSlovak.rc
615 PATCH: [ 1597814 ] 'Wrap Lines' + 'Next Diff' Bug
616 Src: MergeEditView.cpp
619 PATCH: [ 1605682 ] Add Syntax Highlight option to config log
620 Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
621 PATCH: [ 1556685 ] Avoid infinite loop in character loop in crystal c++ parser
623 Src/editlib: asp.cpp basic.cpp batch.cpp cplusplus.cpp csharp.cpp dcl.cpp fortran.cpp
624 html.cpp innosetup.cpp is.cpp java.cpp lisp.cpp nsis.cpp. pascal.cpp perl.cpp php.cpp
625 python.cpp rexx.cpp rsrc.cpp ruby.cpp sgml.cpp sh.cpp siod.cpp sql.cpp tcl.cpp tex.cpp
629 BUG: [ 1603230 ] DirView icons isn't shown correctly on NT4.0
630 Src/res: equalfile.ico fileskip.ico lfile.ico notequalfile.ico rfile.ico
633 PATCH: [ 1604078 ] Hide skipped items by default
637 PATCH: [ 1603769 ] Send MergeCmdLineInfo between instances
638 Src: MainFrm.cpp Merge.cpp MergeCmdLineInfo.cpp MergeCmdLineInfo.h
641 BUG: [ 1602214 ] Incorrect work with associated files in WinMerge 2.7.1.2
643 PATCH: [ 1603196 ] Allow Open-dialog kind of folder selection for project files
644 Src: FileOrFolderSelect.cpp FileOrFolderSelect.h OpenDlg.cpp OpenDlg.h
647 BUG: [ 1603562 ] Location pane's bar outlines
648 Src: LocationView.cpp
651 Perry is not active developer
652 Docs/Users: Contributors.txt
655 PATCH: [ 1602365 ] Move SelectFile and SelectFolder routines to separate file
656 Src: DirActions.cpp DirCmpReportDlg.cpp FileFiltersDlg.cpp MainFrm.cpp Merge.cpp
657 Merge.dsp Merge.h MergeDoc.cpp OpenDlg.cpp PatchDlg.cpp ProjectFilePathsDlg.cpp
658 PropRegistry.cpp PropVss.cpp
659 Src/Common: PreferencesDlg.cpp
660 Src new files: FileOrFolderSelect.cpp FileOrFolderSelect.h
663 Fix bunch of doxygen warnings (wrong parameter names etc)
664 Src: CmdLineParser.h DiffWrapper.cpp DirDoc.cpp FilepathEdit.cpp files.cpp
665 paths.cpp PropEditor.cpp WMGotoDlg.h
667 2006-11-23 WinMerge experimental release 2.7.1.2 (SVN revision 3844)
670 PATCH: [ 1512881 ] Fix memleak from charsets.c
671 Src: charsets.cp charsets.h Merge.cpp
672 PATCH: [ 1596285 ] Unresolved external symbol __abs64 with VC7.1
673 Submitted by Gal, minor edit by Kimmo
674 Src: StdAfx.cpp StdAfx.h
675 BUG: [ 1584068 ] location pane is inaccurate when word wrap is on
677 Src: LocationView.cpp
680 PATCH: [ 1600714 ] Allow canceling when started from commandline
681 Src: Merge.cpp Merge.h
684 PATCH: [ 1600000 ] Fix project file Has*() functions
685 Src: ProjectFile.cpp ProjectFile.h
688 BUG: [ 1599631 ] WinMerge 2.7.1.1 ignores left dir in project file
692 PATCH: [ 1590831 ] Handle minimize argument (Bug 1570351)
693 Src: MergeDiffDetailView.cpp
694 Src/Common: SplitterWndEx.cpp
697 PATCH: [ 1598194 ] New command line parser
698 Src: MainFrm.cpp Merge.cpp Merge.dsp Merge.h
699 Src added files: ClearCaseCmdLineParser.cpp ClearCaseCmdLineParser.h
700 CmdLineParser.h MergeCmdLineInfo.cpp MergeCmdLineInfo.h
701 WinMergeCmdLineParser.cpp WinMergeCmdLineParser.h
702 Src removed files: CmdArgs.cpp CmdArgs.h MergeArgs.cpp
705 PATCH: Moved white-space trimming to FileFilterHelper class
706 Src: FileFilterHelper.cpp
708 2006-11-16 WinMerge experimental release 2.7.1.1 (SVN revision 3810)
711 PATCH: [ 1596692 ] Change the way modified docs are saved to fix several issues
712 Src: MainFrm.cpp MergeDiffDetailView.cpp MergeDoc.cpp MergeDoc.h
715 BUG: [ 1596285 ] Unresolved external symbol __abs64 with VC7.1
716 Src: StdAfx.cpp StdAfx.h
719 BUG: [ 1594188 ] /x option does not work
723 PATCH: [ 1586689 ] True color bookmark icon
724 Src/editlib: ccrystaltextview.cpp
725 Src/res: mg_icons.bmp
728 PATCH: [ 1590737 ] BCMenu update to v3.036
729 Src: BCMenu.cpp BCMenu.h
732 PATCH: [ 1591532 ] Remove unused XmlDoc class
734 Src removed files: XmlDoc.cpp XmlDoc.h
737 Add PCRE 6.7 (with windows build files from ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Contrib/)
738 New folder: /Externals/pcre
739 PATCH: [ 1591605 ] Add PCRE regexps and convert file filtering to PCRE
740 Src: FileFilterMgr.cpp FileFilterMgr.h Merge.dsp Plugins.cpp
741 Src new files: Ucs2Utf8.cpp Ucs2Utf8.h
744 PATCH: [ 1586705 ] DirView icons (Tim made [not]equalfile.ico)
745 Src/res: equalfile.ico fileskip.ico lfile.ico notequalfile.ico rfile.ico
748 PATCH: [ 1590892 ] Handle unicode paths for project files
752 PATCH: [ 1589427 ] Add back read-only handling for project files
754 PATCH: [ 1589438 ] Add read-only info to ProjectFile dialog
756 PATCH: [ 1589563 ] Fix crash with weird filetimes (and cleanup the code)
757 Src: DiffFileInfo.cpp DiffFileInfo.h DirScan.cpp DirViewColHandler.cpp
758 DirViewColItems.cpp FileInfo.cpp FileInfo.h
761 PATCH: [ 1589601 ] Add "ReDim" keyword to Visual Basic highlighter
762 Src\editlib: basic.cpp
765 Add Expat version 2.0.0 to /Externals/expat (revision: 3749)
766 New folder: /Externals/Expat
767 Add SCEW version 0.4.0 to /Externals/scew (revision: 3750)
768 New folder: /Externals/scew
769 PATCH: [ 1587574 ] Convert project files code to use expat+SCEW
770 Src: Merge.dsp ProjectFile.cpp ProjectFile.h
771 Remove folder: Src/ExpatLib/*
772 PATCH: [ 1588212 ] Add manifest file to resource file
774 Src/Languages/*: Merge*.rc
775 Move files from Installer/InnoSetup: WinMerge.exe.manifest WinMergeU.exe.manifest
779 PATCH: [ 1586869 ] Fix File Select -dialog modality (commit the file I missed in previous commit)
780 Src/Common: PreferencesDlg.cpp
783 PATCH: [ 1586869 ] Fix File Select -dialog modality
784 Src: DirCmpReportDlg.cpp FileFiltersDlg.cpp MainFrm.cpp Merge.cpp Merge.h
785 MergeDoc.cpp PatchDlg.cpp ProjectFilePathsDlg.cpp PropRegistry.cpp PropVss.cpp
786 PATCH: [ 1586892 ] Remove unused unknown.ico and code loading it
787 Src: DirView.cpp Merge.rc resource.h
788 Src/Languages/*: Merge*.rc
789 Remove file: Src/Res: unknown.ico
792 BUG: [ 1418805 ] Menu colors incorrect with non-standard color scheme
796 PATCH: [ 1584004 ] Delete "Toolbar.bmp"
797 Src/res deleted file: Toolbar.bmp
800 Fix compile warnings (some of them 64-bit), remove unused variables and code, fix types
802 Remove unused function, fix improper pointer usage
803 Src: FileFilterHelper.cpp
804 Fix casting a pointer type to DWORD (not 64-bit compatible)
805 Src: DirView.cpp DirView.h
808 PATCH: [ 1578419 ] Fix creating WinMerge folder to MyFolders always
809 Src: MainFrm.cpp MainFrm.h
810 Trivial type fixes, coding style fixes and converting comments to doxygen
811 Src: StdAfx.cpp StdAfx.h
812 Fix misuse of reference parameters (compiler warning)
816 PATCH: [ 1574696 ] Fix problem in saving filefilter to project file
817 Src: ProjectFilePathsDlg.cpp
820 BUG: [ 1573240 ] Crash in subversion trunk
821 Src: MainFrm.cpp MainFrm.h OptionsInit.cpp
824 BUG: [ 1570259 ] Bookmarks GUI get reset after save
825 Src/editlib: ccrystaltextview.cpp
828 BUG: [ 1570173 ] Crash when merging all differences
832 PATCH: [ 1555344 ] Separate active/inactive developers in Contributors.txt
833 Docs/Users: Contributors.txt
836 PATCH: [ 1572359 ] Various Updates in German Translation for WinMerge 2.6
837 Src/Languages/German: MergeGerman.rc
840 PATCH: [ 1570241 ] Various Updates in German Translation for WinMerge 2.6
841 Src/Languages/German: MergeGerman.rc
844 BUG: [ 1566783 ] Crash on Save Project when no file is selected
848 PATCH: [ 1567874 ] Change manual URL to point to 2.6 manual
852 BUG: [ 1564572 ] Leak memory on undoing
853 Src: GhostTextBuffer.h
854 Src/editlib: ccrystaltextbuffer.h
857 PATCH: [ 1565917 ] Register.bat to register ShellExt for 64-bit Windows
858 ShellExtension: Register.bat
859 BUG: [ 1563187 ] Can't close a file compare with -e switch
863 PATCH: [ 1565359 ] Various Updates in German Translation for WinMerge 2.6
864 Src/Languages/German: MergeGerman.rc
867 PATCH: [ 1564857 ] FindAnyFile function doesn't compile with VC6
868 Src/Common: coretools.cpp
871 PATCH: [ 1563171 ] Catalan translation update (Open-dialog)
872 Submitted by Jordi Vilar
873 Src/Languages/Catalan: MergeCatalan.rc
876 BUG: [ 1564283 ] Parameter -x causes files to be closed after merging
880 PATCH: [ 1564280 ] Stack corruption in LanguageSelect
881 Src/Common: LanguageSelect.cpp
884 Couple of type fixes to CMoveConstraint
885 Src/Common: CMoveConstraint.cpp CMoveConstraint.h
886 Fix check for pointer/value by using bit-shift instead of a cast + add trivial typecasts
887 Src: GhostTextBuffer.cpp
888 Src/editlib: ccrystaltextbuffer.cpp
891 PATCH: [ 1563157 ] Fix coretools.cpp for 64-bit
892 Src/Common: coretools.cpp coretools.h
893 Fix type in ccrystaltextbuffer.h
894 Src/editlib: ccrystaltextbuffer.h
895 PATCH: [ 1563171 ] Catalan translation update
896 Submitted by Jordi Vilar
897 Src/Languages/Catalan: MergeCatalan.rc
898 PATCH: [ 1563386 ] Spanish translation update
899 Submitted by Jesus M. Delgado 'Mack'
900 Src/Languages/Spanish: MergeSpanish.rc
901 Quiet warnings from DiffList.cpp
903 Some SPECIAL_ITEM_POS cleanups
904 Src: DirActions.cpp DirDoc.cpp DirView.cpp DirView.h
905 Fix check for pointer/value by using bit-shift instead of a cast
906 Src: GhostTextBuffer.h
907 Src/editlib: ccrystaltextbuffer.h
909 2006-09-21 WinMerge experimental release 2.5.7.1 (SVN revision 3600)
912 PATCH: [ 1558213 ] Tweak text positions in splash screen
914 Bump ShellExtension version to 1.9.0 (first 64-bit Windows version)
915 ShellExtension: ShellExtension.rc
916 Fix 64-bit typecast warning
917 Src: GhostTextBuffer.h
918 Fix 64-bit pointer truncation in SetWindowLongPtr call (the last I hope)
920 Minor tweaks to 64-bit ShellExtension project file
921 ShellExtension: ShellExtensionX64.vcproj
924 PATCH: [ 1561788 ] Fix 64-bit CFile constructor usage
925 Src/Common: UniFile.cpp
926 PATCH: [ 1561796 ] Get/SetWindowLong not supported in 64-bit Windows
927 Src: 7zCommon.cpp ChildFrm.cpp
928 Src/Common: CSubclass.cpp sizecbar.cpp
929 BUG: [ 1561781 ] 64-bit compile errors from 7zCommon.cpp
931 PATCH: [ 1561650 ] Separate FilterCommentsManager code from DiffWrapper
932 Src: DiffWrapper.cpp DiffWrapper.h Merge.dsp
933 Src new files: FilterCommentsManager.cpp FilterCommentsManager.h
934 Fix 64-bit compile warning by casting last SendMessage() param to LPARAM
936 Fix hex number used instead of INVALID_HANDLE_VALUE
937 Src/Common: sinstance.cpp
938 Fix 64-bit pointer truncation in SetWindowLongPtr call
942 PATCH: [ 1561001 ] Fix FileActionScript type in running actions
943 Src: FileActionScript.cpp
944 PATCH: [ 1561008 ] Warning fix for FileActionScript
946 PATCH: [ 1561080 ] Cleanup for loglevel definition
947 Src: DirDoc.cpp DirScan.cpp MainFrm.cpp Plugins.cpp StdAfx.cpp
948 Src/Common: LogFile.cpp LogFile.h
951 Cleanup 64-bit ShellExtension projectfile, add a debug target
952 ShellExtension: ShellExtensionX64.vcproj
955 PATCH: [ 1559619 ] 64-bit shellextension project file
956 ShellExtension new files: ShellExtensionX64.def ShellExtensionX64.vcproj
957 Remove unused variable
958 Src/editlib: memcombo.cpp
959 Remove unused variable
961 Fix typecasting warnings
962 Src: locality.cpp locality.h MergeDoc.cpp
963 Remove unused variable
964 Src: FileActionScript.cpp
965 Remove unused variable
966 Src: FileFiltersDlg.cpp
969 BUG: [ 1558839 ] ShellExtension does not compile as 64-bit
970 ShellExtension: WinMergeShell.cpp WinMergeShell.h
971 PATCH: [ 1558893 ] Fix incompatible prototype in MessageBoxDialog
972 Src/Common: MessageBoxDialog.cpp MessageBoxDialog.h
973 PATCH: [ 1558913 ] Fix OnTimer prototypes (64-bit compatibility)
974 Src: ChildFrm.cpp ChildFrm.h DircompProgressDlg.cpp DirCompProgressDlg.h DirView.cpp
975 Dirview.h MainFrm.cpp MainFrm.h MergeEditview.cpp MergeEditView.h OpenDlg.cpp
976 Opendlg.h Splash.cpp Splash.h
977 Src/Common: MessageBoxDialog.cpp MessageBoxDialog.h
978 Src/editlib: ccrystaltextview2.cpp ccrystaltextview.h
981 BUG: [ 1547247 ] WinMerge ANSI target does not compile with VS2005
983 Src: Common/SuperComboBox.cpp
984 PATCH: [ 1558152 ] Italian translation updated
985 Submitted by Andrea Decorte
986 Src/Languages/Italian: MergeItalian.rc
989 PATCH: [ 1555764 ] prevent from shaking in view when pressing F5 down
990 Src: GhostTextView.cpp MergeDiffDetailView.cpp
993 PATCH: [ 1556851 ] An Swedish translation update
994 Submitted by Hans Eriksson
995 Src/Languages/Swedish: MergeSwedish.rc
997 2006-09-11 WinMerge beta release 2.5.6 (revision 3552)
1000 Japanese translation - update
1001 Src/Languages/Japanese: MergeJapanese.rc
1004 PATCH: [ 1555764 ] prevent from shaking in view when pressing F5 down
1005 Src: GhostTextView.cpp GhostTextView.h MergeDiffDetailView.cpp MergeDiffDetailView.h
1008 BUG: [ 1555664 ] fail to copy all to right when enabling moved block detect
1012 Czech translation update from Jan Hryz
1013 Src/Languages/Czech/MergeCzech.rc
1014 PATCH: [ 1553714 ] Add new commandine switches to help dialog
1015 Src: Merge.rc MergeArgs.cpp resource.h
1016 Src/Languages/*: Merge*.rc
1017 PATCH: [ 1552228 ] Don't use 'export' as variable name
1021 RFE: [ 1533506 ] Need commandline switch for single-instance
1025 PATCH: [ 1552901 ] Update VC loose filefilter
1026 Filters: Merge_VC_loose.flt
1027 PATCH: [ 1552917 ] Fix GUI for autocompletion option
1029 Src/Languages/*: Merge*.rc
1032 PATCH: [ 1552095 ] Fix last compare method not visible in GUI list
1034 Src/Languages/*: Merge*.rc
1037 PATCH: [ 1551332 ] defer loading plugin
1038 Src: MainFrm.cpp Merge.rc MergeDoc.cpp MergeEditView.cpp MergeEditView.h
1039 Src/Languages/*: Merge*.rc
1042 BUG: [ 1550427 ] WinMerge 2.5.5.7 don't save "Include subfoders by default"
1043 Src: PropRegistry.cpp
1046 Japanese translation - update
1047 Src/Languages/Japanese: MergeJapanese.rc
1050 PATCH: [ 1544777 ] Compare by size
1051 Forgot to commit Options-dialog changes last time so option for this wasn't visible
1052 Src: PropCompare.cpp
1053 BUG: [ 1547262 ] Suspicious bit shift warning
1055 Src/Common: UniFile.cpp
1058 PATCH: [ 1547190 ] Fix VS2005 compile
1062 BUG: [ 1546938 ] New toolbar icons only works for 'disabled' icons
1063 Src/Languages/*/Merge*.rc
1066 Fix compiling WinMerge after moving folders around (Merge7z moved under ArchiveSupport)
1069 ***** Switch to Subversion *****
1071 2006-08-24 WinMerge experimental release 2.5.5.7 (cvs)
1074 PATCH: [ 1545411 ] Add some missing options to configlog
1075 Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
1076 PATCH: [ 1545165 ] WinMarge Bulgarian Translation
1077 Submitted by tigertron
1078 Src/Languages/Bulgarian: MergeBulgarian.rc
1079 Docs/Users/Languages: Readme-Bulgarian.txt
1080 Docs/Users/Contributors.txt
1081 InnoSetup: WinMerge.iss
1082 ShellExtension: ShellExtension.rc
1083 ShellExtension/Languages: ShellExtensionBulgarian.rc
1084 PATCH: [ 1545890 ] Swedish translation for update for WinMerge 2.5.5.7+
1085 Submitted by Hans Eriksson
1086 Src/Languages/Swedish: MergeSwedish.rc
1087 BUG: [ 1545082 ] Crash when comparing .rc files
1088 Fix submitted by Takashi
1089 Src/editlib: ccrystaltextview.cpp
1092 PATCH: [ 1544905 ] Use stat() to check if file is read-only
1093 Src: files.cpp files.h
1094 PATCH: [ 1544777 ] Compare by size
1095 Src: DiffWrapper.h DirScan.cpp Merge.rc resource.h
1096 Src/Languages/*: Merge*.rc
1099 PATCH: [ 1541427 ] Using as an external diff tool (RFE 1454623)
1100 Src: MainFrm.cpp MainFrm.h MergeArgs.cpp MergeDoc.cpp
1103 PATCH: [ 1544784 ] Use as ClearCase external merge tool
1107 BUG: [ 1543783 ] Misbehave margin draw
1108 Src/editlib: ccrystaltextview.cpp
1111 PATCH: [ 1544147 ] Add Install-feature for file filters
1112 Src: FileFiltersDlg.cpp FileFiltersDlg.h Merge.rc resource.h
1113 Src/Languages/*: Merge*.rc
1114 BUG: [ 1534429 ] Message IDS_SUGGEST_IGNOREEOL incorrect
1118 PATCH: [ 1424673 ] Widen labels on OpenDialog
1121 Src/Languages/*: Merge*.rc
1124 PATCH: [ 1542201 ] Change default user filter folder to WinMerge/Filters
1126 PATCH: [ 1542829 ] Rename Format-item in File-menu to Convert
1128 Src/Languages/*: Merge*.rc
1131 PATCH: [ 1540090 ] Change horizontal scroll synch from relative to absolute
1132 Src/Common: SplitterWndEx.cpp
1135 PATCH: [ 1541158 ] New high-color toolbar icons
1136 Src: BCMenu.cpp MainFrm.cpp MainFrm.h Merge.rc resource.h
1137 Src/res: ToolbarDisabled.bmp ToolbarEnabled.bmp
1140 PATCH: [ 1539568 ] draw icon at modified line (it was changed to line revision marks)
1141 Src: GhostTextBuffer.cpp GhostTextBuffer.h MergeDoc.cpp MergeDoc.h
1142 Src/editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h ccrystaltextview.cpp
1145 PATCH: [ 1456356 ] Scrollbars sometimes not initially active
1149 PATCH: [ 1540129 ] Fix indentation of diffutils io.c
1150 Src/diffutils/src: IO.C
1151 PATCH: [ 1540054 ] Remove Copy All -items from folder compare menu
1153 Src/Languages/*: Merge*.rc
1154 PATCH: [ 1535558 ] Add GUI for shell extension folder include
1155 Src: Merge.rc PropRegistry.cpp PropRegistry.h resource.h
1156 Src/Languages/*: Merge*.rc
1159 BUG: [ 1538340 ] Undo enabled for folder compare.
1160 Src: DirView.h DirView.cpp
1163 Japanese translation - update
1164 Src/Languages/Japanese: MergeJapanese.rc
1167 PATCH: [ 1539204 ] Remove '#' from '#differences' column
1169 Src/Languages/*: Merge*.rc
1172 PATCH: [ 1538264 ] Split DiffFileData class to own files
1173 Src: DiffWrapper.cpp DiffWrapper.h DirScan.cpp DirViewColItems.cpp Merge.dsp
1174 Src new files: DiffFileData.cpp DiffFileData.h
1175 PATCH: [ 1537261 ] Swedish 2.5.5.6+ translation update
1176 Submitted by Hans Eriksson
1177 Src/Languages/Swedish: MergeSwedish.rc
1180 Fix doxygen comment for ImportOptions()
1181 Src/Common: OptionsMgr.cpp
1184 PATCH: Code cleanup. Removed commented out code.
1185 Src/Common: SuperComboBox.cpp
1187 BUG: [ 1531965 ] Crash undoing empty (?) event
1188 Src/editlib: ccrystaleditview.cpp
1191 Czech translation - update
1192 Src/Languages/Czech/MergeCzech.rc
1195 PATCH: [ 1310951 ] Option to copy DirCmpReport to clipboard
1196 Src: DirCmpReport.cpp DirCmpReport.h DirCmpReportDlg.cpp DirCmpReportDlg.h
1198 Src/Languages/*: Merge*.rc
1201 Czech translation - update
1202 Src/Languages/Czech/MergeCzech.rc
1204 2006-08-08 WinMerge experimental release 2.5.5.6 (cvs)
1207 BUG: [ 1535835 ] Import settings from the file
1208 Src/Common: PreferencesDlg.cpp PreferencesDlg.h
1209 PATCH: [ 1536240 ] Fix diff count numbers for real
1210 Src: DiffWrapper.cpp DirScan.cpp
1211 Src/diffutils/src: analyze.c UTIL.c
1214 PATCH: [ 1514487 ] Merge7z DllBuild 0018
1215 Merge7z: Merge7z311.cpp Merge7z409.cpp Merge7zCommon.cpp Merge7zCommon.h
1216 revision.txt Merge7z*.dsp
1217 Merge7z new files: Merge7z433.dsp Merge7z434.dsp Merge7z435.dsp Merge7z436.dsp
1218 Merge7z437.dsp Merge7z438.dsp Merge7z439.dsp Merge7z440.dsp Merge7z442.dsp
1219 Merge7zInstaller: Installer.cpp Installer.rc Files.rc2
1220 Change recommended version of 7-Zip to 4.42
1224 PATCH: [ 1535175 ] Shell ext: Add flag for subfolder inclusion
1225 ShellExtension: WinMergeShell.cpp WinMergeShell.h
1226 Bump ShellExtension version to 1.8.0
1227 ShellExtension: ShellExtension.rc
1230 BUG: [ 1533292 ] crash when specifying nonexistent project file.
1234 PATCH: [ 1534770 ] Add "don't wrap end of file" option for Find
1235 Src: Merge.rc resource.h
1236 Src/editlib: ccrystaleditview.cpp ccrystaltextview.cpp ccrystaltextview.h
1237 ceditreplacedlg.cpp cfindtextdlg.cpp cfindtextdlg.h
1238 Src/Languages/*: Merge*.rc
1239 BUG: [ 1534461 ] WinMerge 2.5.5.5 ingoring subfolders option in project files
1240 Src: MainFrm.cpp Merge.cpp
1243 Czech translation - update
1244 Src/Languages/Czech/MergeCzech.rc
1246 2006-08-03 WinMerge experimental release 2.5.5.5 (cvs)
1249 PATCH: [ 1533457 ] Add Refresh Selected -item to Folder compare main menu
1250 Src: DirActions.cpp DirView.cpp DirView.h Merge.rc
1251 Src/Languages/*: Merge*.rc
1254 PATCH: [ 1532743 ] Improve difference count columns in folder compare
1255 Src: DiffItem.h DiffItemList.cpp DirScan.cpp DirVierwColItems.cpp
1257 Src/Languages/*: Merge*.rc
1258 PATCH: [ 1529864 ] Stop using Application Data folders as filefilter folders
1259 Src: FileFilterHelper.cpp FileFilterHelper.h
1262 PATCH: [ 1531845 ] Fix memory leak after find
1263 Src/editlib: ccrystaltextview.cpp
1264 PATCH: [ 1531957 ] Fix imagelist memory leak in editor
1265 Src/editlib: ccrystaltextview.cpp
1266 PATCH: [ 1430331 ] New Debug menu
1267 Submitted by Perry, modified by me
1268 Src: MainFrm.cpp MainFrm.h Merge.rc resource.h
1269 Src/Languages/*: Merge*.rc
1270 PATCH: [ 1531319 ] Tidy Folder compare progress dialog
1272 Src/Languages/*: Merge*.rc
1275 PATCH: [ 1531293 ] Fix wrong cursor position after find
1276 Src: ccrystaltextview.cpp ccrystaltextview.h cfindtextdlg.cpp
1277 PATCH: [ 1406051 ] code cleanup for ScriptFileActions
1279 Src: DirActions.cpp FileActionScript.cpp FileActionScript.h
1280 PATCH: [ 1530459 ] Add some doxygen comments for ViewableWhitespace
1281 Src: ViewableWhitespace.cpp ViewableWhitespace.h
1284 BUG: [ 1528322 ] Crash when using F6 / Bugg for file differences
1285 Src: MergeEditView.cpp
1288 PATCH: [ 1530352 ] Start flashing WinMerge window when folder compare is ready
1289 Src: DirView.cpp MainFrm.cpp MainFrm.h
1290 PATCH: [ 1529995 ] Swedish translation update for 2.5.5.4+
1291 Submitted by Hans Eriksson
1292 Src/Languages/Swedish: MergeSwedish.rc
1293 PATCH: [ 1530655 ] Catalan translation update
1294 Submitted by Jordi Vilar
1295 Src/Languages/Catalan: MergeCatalan.rc
1298 PATCH: [ 1529915 ] Refresh menu on DirView does not work correctly
1299 Src: DirActions.cpp DirScan.cpp
1302 PATCH: [ 1529599 ] Cleanup DiffWrapper
1303 Src: DiffWrapper.cpp DiffWrapper.h MergeDoc.cpp PatchTool.cpp
1304 PATCH: [ 1529965 ] Add error messages for managing file filters
1305 Src: FileFiltersDlg.cpp FileFiltersDlg.h Merge.rc resource.h
1306 Src/Languages/*: Merge*.rc
1309 PATCH: [ 1527843 ] prevent dialog from flickering
1310 Src: DirCompProgressDlg.cpp DirView.cpp
1311 Src/Common: CMoveConstraint.cpp
1314 PATCH: [ 1528841 ] Cleanup ByteComparator
1315 Src: ByteComparator.cpp ByteComparator.h FileTextStats.h
1316 PATCH: [ 1528987 ] Use 64-bit variable as file position in Bytecompare
1317 Src: ByteComparator.cpp ByteComparator.h DiffWrapper.cpp FileTextStats.h
1318 PATCH: [ 1529053 ] Success message for loading/saving project file
1319 Src: Merge.rc ProjectFilePathsDlg.cpp resource.h
1320 Src/Languages/*: Merge*.rc
1323 PATCH: [ 1528444 ] Cleanup for AppSerialize
1324 Src: AppSerialize.cpp AppSerialize.h
1327 PATCH: [ 1527771 ] Remove Apply syntax highlight to other side option
1328 Src: Merge.rc MergeDoc.cpp OptionsDef.h OptionsInit.cpp PropEditor.cpp
1329 PropEditor.h resource.h
1330 Src/Languages/*: Merge*.rc
1333 PATCH: [ 1527947 ] Various Updates in German Translation for WinMerge 2.5
1334 Src/Languages/German: MergeGerman.rc
1337 PATCH: [ 1526918 ] Detect which side file is binary file
1338 Src: DiffItem.h DiffWrapper.cpp DiffWrapper.h
1339 Src/diffutils/src: DIFF.H IO.c analyze.c
1341 2006-07-20 WinMerge experimental release 2.5.5.4 (cvs)
1344 PATCH: [ 1525013 ] Add description for ASP.NET filter
1346 PATCH: [ 1525417 ] Move MovedBlock code to own file
1347 Src: DiffWrapper.cpp Merge.dsp
1348 Src new file: MovedBlocks.cpp
1349 PATCH: [ 1525531 ] Allow comparing project files from Open-dialog
1351 Config log files are .txt files (not .log)
1353 BUG: [ 1495212 ] Wrong cursor position after selecting wordwrapped line
1355 Src/editlib: ccrystaltextview.cpp
1358 Czech translation - update
1359 Src/Languages/Czech/MergeCzech.rc
1362 BUG: [ 1198248 ] version copyright symbol needs review
1363 Src/Languages/*: MergeChineseSimplified.rc MergeChineseTraditional.rc MergeJapanese.rc
1367 BUG: [ 1525451 ] ASSERT in CCrystalTextView::DrawSingleLine()
1368 Src/editlib: ccrystaltextview.cpp
1369 BUG: [ 1525466 ] ASSERT in CCrystalTextView::AssertValidTextPos()
1370 Src/editlib: ccrystaltextview2.cpp
1373 BUG: [ 1524832 ] Bogus include's
1374 Src: DirColsDlg.cpp PropEditor.cpp
1375 PATCH: [ 1522037 ] Add read-only option for paths in Project file
1376 Src: MainFrm.cpp Merge.cpp Merge.rc OpenDlg.cpp OpenDlg.h ProjectFile.cpp
1377 ProjectFile.h ProjectFilePathsDlg.cpp ProjectFilePathsDlg.h resource.h
1378 Src/Languages/*: Merge*.rc
1379 PATCH: [ 1525025 ] Copy/paste error in MainFrm.cpp
1381 PATCH: [ 1525198 ] Version info misses copyright (c) char
1385 Fix and improve comment for folder compare columns table
1387 BUG: [ 1524251 ] File filter does not work on 2.5.5.3
1388 Original fix from Takashi, modified by Kimmo
1389 Src: FileFilterMgr.cpp
1392 PATCH: [ 1517057 ] Option to Ignore Multiline Comments (bugfix for single-line comments)
1393 Submitted by David Maisonave
1394 Src: DiffWrapper.cpp
1397 Strip SuperComboBox strings before saving
1398 Src/Common: SuperComboBox.cpp
1400 2006-07-14 WinMerge experimental release 2.5.5.3 (cvs)
1403 BUG: [ 1521555 ] Location Pane - can't see current location because of color
1404 Use 3d-color instead of scrollbar color in location pane
1405 Src: LocationView.cpp
1406 PATCH: [ 1521696 ] Improve Text color option dialog
1407 Src: Merge.rc PropTextColors.cpp PropTextColors.h
1408 Src/Languages/*: Merge*.rc
1411 PATCH: [ 1521352 ] Cleanup char constants for CRegExep
1412 Src/Common: RegExp.cpp
1413 PATCH: [ 1521392 ] Fix reading last line in linefilter file
1414 Src: FileFilterMgr.cpp
1415 BUG: [ 1498511 ] Conflict accelerator key in IDR_DIRVIEWMENU
1417 Src/Languages/*: Merge*.rc
1418 PATCH: [ 1517057 ] Option to Ignore Multiline Comments (bugfix + rename to filtering)
1419 Submitted by David Maisonave
1420 Src: DiffWrapper.cpp DiffWrapper.h DirDoc.cpp MainFrm.cpp Merge.rc MergeDoc.cpp
1421 OptionsDef.h OptionsInit.cpp PropCompare.cpp Propcompare.h resource.h
1422 Src/Languages/*: Merge*.rc
1423 PATCH: [ 1517057 ] Option to Ignore Multiline Comments (bugfix)
1424 Submitted by David Maisonave
1425 Src: DiffWrapper.cpp
1428 PATCH: [ 1517057 ] Option to Ignore Multiline Comments
1429 Submitted by David Maisonave
1430 Src: DiffWrapper.cpp DiffWrapper.h DirDoc.cpp MainFrm.cpp Merge.rc MergeDoc.cpp
1431 OptionsDef.h OptionsInit.cpp PatchTool.cpp PropCompare.cpp Propcompare.h
1433 Src/Languages/*: Merge*.rc
1434 Add Ed_K and David Maisonave to Contributors
1435 Docs/Users: Contributors.txt
1436 Document UniMemFile::ReadString() function parameters and return values
1437 Src/Common: UniFile.cpp
1440 Quiet warning about deprecated function for VS2003 and later
1444 PATCH: [ 1517362 ] Ensure diff is visible in location view
1445 Src: LocationView.cpp
1446 Fix codinstyle in LocationView.cpp (messed up by patch #1517362)
1447 Src: LocationView.cpp
1448 Make VS2005 build less noisy by defining _CRT_SECURE_NO_DEPRECATE for it
1452 PATCH: [ 1516626 ] Enable double-click in column customization dialog
1453 Src: DirColsDlg.cpp DirColsDlg.h
1454 PATCH: [ 1514435 ] Optimize versioninfo reading
1455 Src: AboutDlg.cpp ConfigLog.cpp Splash.cpp
1456 Src/Common: version.cpp version.h
1459 BUG: [ 1303166 ] crash or freeze on closing all window
1462 2006-07-03 WinMerge experimental release 2.5.5.2 (cvs)
1465 PATCH: [ 1515380 ] Page Up/Down Anomaly
1467 Src/editlib: ccrystaltextview2.cpp
1468 PATCH: [ 1515966 ] Use View-IDs in MergeDoc.cpp
1469 Src: MergeDoc.cpp MergeDoc.h
1470 PATCH: [ 1516016 ] Fix poor handling of invalid tab size in Options-dialog
1471 Src: Merge.rc PropEditor.cpp PropEditor.h resource.h
1472 Src/Languages/*: Merge*.rc
1473 Fix comment in DiffList.cpp
1477 PATCH: [ 1515669 ] Add selected difference marker for locationview
1478 Src: LocationView.cpp LocationView.h
1481 PATCH: [ 1514459 ] Cleanup for LocationView code (use view ID)
1482 Src: LocationView.cpp LocationView.h StdAfx.h
1483 PATCH: [ 1514580 ] Tweak location view bar look
1484 Src: LocationView.cpp
1487 PATCH: [ 1514645 ] Various Updates in German Translation for WinMerge 2.5
1488 Src/Languages/German: MergeGerman.rc
1491 PATCH: [ 1513618 ] Fix Merge.rc translation id
1495 PATCH: [ 1512708 ] Fix compile with VS2005
1496 Also additional cleanup for CCrystalTextView::GetMarginWidth()
1497 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
1498 PATCH: [ 1512726 ] Fix combining filesize from two values
1499 Src: DiffFileInfo.cpp DirScan.cpp FileInfo.cpp FileInfo.h
1500 PATCH: [ 1512775 ] Fix encoding columns showing -1
1501 Src: FileTextEncoding.cpp FileTextEncoding.h
1504 PATCH: [ 1510596 ] Updated Readme-Swedish.txt
1505 Submitted by Hans Eriksson
1506 Docs/Users/Languages: ReadMe-Swedish.txt
1507 PATCH: [ 1510600 ] Updated MergeSwedish.rc file for 2.5.5.1+
1508 Submitted by Hans Eriksson
1509 Src/Languages/Swedish: MergeSwedish.rc
1510 BUG: [ 1483242 ] Needless resource file 'MergeSwedish_LastTranslation.rc'?
1511 Remove unneeded file
1512 Removed: Src/Languages/Swedish: MergeSwedish_LastTranslation.rc
1513 BUG: [ 1489034 ] Src/Common/LanguageSelect.rc unused?
1514 Remove unneeded file
1515 Removed: Src/Common/LanguageSelect.rc
1516 Remove unused files (language.h & language.c)
1517 Removed: Src: language.c language.h
1519 2006-06-21 WinMerge experimental release 2.5.5.1 (cvs)
1522 PATCH: [ 1509505 ] Manual: new compare method and options export/import
1523 Docs/Users/Manual: Configuration.xml
1524 Bump manual revision to 1.2.4
1525 Docs/Users/Manual: WinMerge_help.xml
1526 Bump ShellExtension version to 1.7.2
1527 ShellExtension: ShellExtension.rc
1530 BUG: [ 1505763 ] Crash after closing file compare window
1531 Src: MergeEditView.cpp
1532 PATCH: [ 1508865 ] Improve error handling for loading file filters
1533 Src: FileFilterHelper.cpp FileFilterMgr.cpp FileFilterMgr.h FileFiltersDlg.cpp
1535 PATCH: [ 1508898 ] Show binary as one of EOL types
1536 Src: DirViewColItems.cpp Merge.rc resource.h
1537 Src/Languages/*: Merge*.rc
1538 PATCH: [ 1506184 ] Polish translation update for WM 2.5.4.0
1539 Submitted by dr_prozac
1540 Src/Languages/Polish: MergePolish.rc
1541 PATCH:[ 1509495 ] Polish translation for ShellExtension
1542 Submitted by dr_prozac
1543 ShellExtension/Languages: ShellExtensionPolish.rc
1546 RFE: [ 1499245 ] Ruby Syntax Highlighting
1548 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h ruby.cpp
1551 BUG: [ 1494776 ] Can't rename files if '|' seperator exists
1552 Src: DirView.h DirView.cpp DirActions.cpp
1555 BUG: [ 1486434 ] Copy Pathnames for right-only dir copies parent dir only
1559 PATCH: [ 1483544 ] New compare method: by date and size
1560 Src: DiffWrapper.h DirScan.cpp Merge.rc PropCompare.cpp resource.h
1561 Src/Languages/*: Merge*.rc
1564 BUG: [ 1496066 ] WinMerge crashed with those files
1565 Src: GhostTextView.cpp GhostTextView.h
1568 BUG: [ 1494610 ] Wrong selection in ccrystalview2.cpp
1569 Src/editlib: ccrystaltextview2.cpp
1570 PATCH: [ 1497817 ] Cleanup CCrystalTextView::GetLineBySubLine
1571 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
1574 PATCH: [ 1497154 ] Fix memory leak in wordwrap code
1575 Src/editlib: ccrystaltextview.cpp
1576 PATCH: [ 1497068 ] Initialize cursorpositions in GhostTextView
1577 Src: GhostTextView.h
1578 PATCH: [ 1497147 ] Cleanup CCrystalTextView::ClientToText
1579 Src/editlib: ccrystaltextview.cpp
1582 BUG: [ 1494610 ] Wrong selection in ccrystalview2.cpp
1584 Src/editlib: ccrystaltextview2.cpp
1587 PATCH: [ 1495017 ] Translate 'Textcolors' options to German
1588 Src/Languages/German: MergeGerman.rc
1591 PATCH: [ 1494627 ] Skip processing empty paths in Open dialog
1593 Doxygen comments and trivial cleanups for paths.cpp & paths.h
1594 Src: paths.cpp paths.h
1597 PATCH: [ 1493742 ] Limit vertical scrolling to last line of files
1598 Src/editlib: ccrystaltextview.cpp
1599 PATCH: [ 1493868 ] Add bookmark by double-clicking selection frame
1600 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h ccrystaltextview2.cpp
1601 PATCH: [ 1492458 ] Swedish translation update for 2.5.4.0
1602 Submitted by Hans Eriksson
1603 Src/Languages/Swedish: MergeSwedish.rc
1604 Add some const keywords and fix comments, remove unused function.
1605 Src: DiffList.cpp DiffList.h
1606 BUG: [ 1488797 ] ASSERT in CMergeEditView::OnPrevdiff
1608 Src: MergeEditView.cpp
1611 PATCH: [ 1493713 ] Translate 'Bookmarks' feature to German
1612 Src/Languages/German: MergeGerman.rc
1615 PATCH: [ 1491436 ] Spanish Readme.txt
1616 Submitted by Jesus M. Delgado 'Mack'
1617 Docs/Users/Languages new file: ReadMe-Spanish.txt
1618 InnoSetup: WinMerge.iss
1621 PATCH: [ 1491993 ] Ability to rename files (RFE 1380228)
1622 Src: DirActions.cpp DirView.cpp DirView.h Merge.rc resource.h
1625 PATCH: [ 1491212 ] Czech Translation
1626 Submitted by: Jan Hryz
1627 Src/Languages/Czech/MergeCzec.rc
1628 PATCH: [ 1492025 ] Catalan translation update
1629 Submitted by Jordi Vilar
1630 Src/Languages/Catalan: MergeCatalan.rc
1631 PATCH: [ 1491424 ] Spanish translation for v2.5.3.7
1632 Submitted by Jesus M. Delgado 'Mack'
1633 Languages/Spanish: MergeSpanish.rc
1635 2006-05-18 WinMerge beta release 2.5.4
1638 PATCH: [ 1490540 ] Manual: add picture and explanation about our version tree
1639 Docs/Users/Manual: Introduction.xml
1640 Docs/Users/Manual/build: build_html.bat build_htmlhelp.bat
1641 Docs/Users/Manual/Art new files: WinMerge_versions.gif WinMerge_versions.odg
1644 PATCH: [ 1489824 ] Better default folder for user filters
1646 BUG: [ 1445975 ] BuildDll.bat exit is not good
1647 Src/Languages: BuildDll.bat
1648 PATCH: [ 1488387 ] Russian translation update for 2.4.6
1649 Submitted by Dmitriy Aleshkowskiy
1650 Src/Languages/Russian: MergeRussian.rc
1653 PATCH: [ 1489133 ] Manual: document new filter location(s)
1654 Docs/Users/Manual: Filters.xml
1655 PATCH: [ 1489091 ] Enable Help/Index
1657 PATCH: [ 1489098 ] Doesn't open Help TOC correctly
1659 BUG: [ 1487856 ] Long delay if many language dlls
1661 Src/Common: LanguageSelect.cpp LanguageSelect.h
1662 BUG: [ 1487854 ] ASSERT in CCrystalTextView::OnPrint
1663 Fix suggested by Mallato
1664 Src/editlib: ccrystaltextview.cpp
1665 Graphic Design: Alexander Skinner
1666 Docs/Users: Contributors.txt
1667 BUG: [ 1478057 ] Memory leak when cancelling print preview
1668 Fix suggested by Mallato
1669 Src/editlib: ccrystaltextview.cpp
1672 PATCH: [ 1488637 ] PHP/ASP Syntax Highlighting Fix (Bug 1441643)
1673 Src/editlib: asp.cpp php.cpp
1676 PATCH: [ 1485861 ] Czech translation - update
1677 Submitted by: Jan Hryz
1678 Src/Languages/Czech/MergeCzec.rc
1679 PATCH: [ 1483553 ] Swedish MergeSwedish.rc 1.304 2.5.3.7 update
1680 Submitted by Hans Eriksson
1681 Src/Languages/Swedish: MergeSwedish.rc
1682 PATCH: [ 1484004 ] Manual: new Open-dialog screenshot and small fixes
1683 Docs/Users/Manual: Quick_start.xml
1684 Docs/Users/Manual/screenshots: OpenDlg1.gif
1685 PATCH: [ 1484013 ] Manual: small changes to Introduction chapter
1686 Docs/Users/Manual: Introduction.xml
1687 PATCH: [ 1484092 ] Manual: preliminary whats new list for 2.5
1688 Docs/Users/Manual: Whatsnew_2_1.xml
1689 PATCH: [ 1484101 ] Manual: Add index
1690 Docs/Users/Manual: WinMerge_help.xml
1691 PATCH: [ 1484142 ] Manual: update some options descriptions
1692 Docs/Users/Manual: Configuration.xml
1695 PATCH: [ 1483344 ] Fix creating private file filters
1696 Src: FileFiltersDlg.cpp
1697 PATCH: [ 1483486 ] Add commenting for CLogFile
1698 Src/Common: LogFile.cpp LogFile.h
1701 PATCH: [ 1483107 ] Remove dublicated code from folder compare progress dlg
1702 Src: DirCompProgressDlg.cpp DirCompProgressDlg.h
1703 PATCH: [ 1483088 ] Add GUI for user to select filter folder
1704 Src: FileFilterHelper.cpp FileFilterHelper.h FileFiltersDlg.cpp MainFrm.cpp Merge.rc
1705 OptionsDef.h OptionsInit.cpp paths.cpp paths.h PropRegistry.cpp PropRegistry.h
1707 Src/Languages/*: Merge*.rc
1710 BUG: [ 1481053 ] Options: Text Colors should use 3D-Look too
1712 Src/Languages/*: Merge*.rc
1713 PATCH: [ 1482352 ] Icons for 'Bookmarks' feature
1714 Src: MainFrm.cpp Merge.rc resource.h
1715 Src/res new files: clear_bookmarks.bmp next_bookmark.bmp prev_bookmark.bmp
1717 Src/Languages/*: Merge*.rc
1720 BUG: [ 1363364 ] DisplayBinaryFiles extension list wrong
1721 Also bump version of plugin to 1.0.3.0
1722 Plugins/src_VCPP/DisplayBinaryFiles: ChangeLog.txt DisplayBinaryFiles.rc WinMergeScript.cpp
1723 Plugins/dlls: DisplayBinaryFiles.dll
1726 PATCH: [ 1482411 ] Add line before 'Open Project' in main menu
1728 Src/Languages/*: Merge*.rc
1731 PATCH: [ 1482688 ] sgml.cpp contains "lt" twice
1732 Src/editlib: sgml.cpp
1733 PATCH: [ 1482694 ] xml.cpp contains "lt" twice
1734 Src/editlib: xml.cpp
1735 PATCH: [ 1482765 ] Fix closing folder compare progress dialog
1736 Src: DirCompProgressDlg.cpp DirCompProgressDlg.h DirView.cpp
1738 2006-05-04 WinMerge experimental release 2.5.3.7 (cvs)
1741 PATCH: [ 1481213 ] Fix foldercompare short-size suffixes and localize them
1742 Src: DirViewColItems.cpp Merge.rc resource.h
1743 Src/Languages/*: Merge*.rc
1744 PATCH: [ 1481391 ] Make LocationView update from MergeView more safe
1745 Src: LocationView.cpp MergeEditView.cpp MergeEditView.h
1746 BUG: [ 1456356 ] Scrollbars sometimes not initially active
1747 Another possible fix..
1748 Src/editlib: ccrystaltextview.cpp
1751 PATCH: [ 1480652 ] Small fix for XML syntax highlight
1752 Src/editlib: xml.cpp
1755 PATCH: [ 1479007 ] WinMerge Icon Set Revision 3
1756 Submitted by Alexander Skinner
1758 BUG: [ 1474782 ] Crash when comparing SQL with with binary data
1759 Fix suggested by anonymous submitter
1760 Src/editlib: asp.cpp basic.cpp batch.cpp cplusplus.cpp csharp.cpp dcl.cpp
1761 fortran.cpp html.cpp ini.cpp innosetup.cpp is.cpp java.cpp lisp.cpp nsis.cpp
1762 pascal.cpp perl.cpp php.cpp python.cpp rexx.cpp rsrc.cpp sgml.cpp sh.cpp
1763 siod.cpp sql.cpp tcl.cpp tex.cpp xml.cpp
1764 PATCH: [ 1471835 ] Fix setting filename in folder-compare report dialog
1765 Fix bug in the original patch
1766 Src: DirCmpReportDlg.cpp
1769 PATCH: [ 1475649 ] Enable selection margin and line numbers
1770 Src/res new file: mg_icons.bmp
1773 PATCH: [ 1475649 ] Enable selection margin and line numbers
1774 Src: GhostTextView.cpp GhostTextView.h Merge.rc MergeEditView.cpp
1775 MergeEditView.h OptionsDef.h OptionsInit.cpp resource.h
1776 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h editcmd.h
1777 Src/Languages/*: Merge*.rc
1780 PATCH: [ 1477957 ] Fix 'Help' button position in German translation
1781 Src/Languages/German: MergeGerman.rc
1784 PATCH: [ 1476279 ] Cleanup CDiffContext::UpdateInfoFromDiskHalf() and its usage
1785 Src: Diffcontext.cpp DiffContext.h DirScan.cpp DirViewColItems.cpp
1788 PATCH: [ 1475776 ] Optimize dirview UI updates
1789 Src: DirActions.cpp DirDoc.cpp DirDoc.h
1790 PATCH: [ 1472622 ] Czech translation - update (more dialog fixes)
1791 Submitted by: Jan Hryz
1792 Src/Languages/*: Merge*.rc
1795 PATCH: [ 1474884 ] Fix XmlDoc not releasing file handles
1796 Src: XmlDoc.cpp XmlDoc.h
1797 PATCH: [ 1475092 ] Add DocumentsLoaded() to MergeDiffDetailView
1798 Src: MergeDiffDetailView.cpp MergeDiffDetailView.h MergeDoc.cpp
1799 Gal Hammer is now a developer
1800 Docs/Users: Contributors.txt
1803 PATCH: [ 1473902 ] Add dialog for editing and saving project files
1804 Src: DirDoc.cpp DirDoc.h MainFrm.cpp MainFrm.h Merge.dsp Merge.rc MergeDoc.cpp
1805 MergeDoc.h resource.h
1806 Src new files: ProjectFilePathsDlg.cpp ProjectFilePathsDlg.h
1807 Src/Languages/*: Merge*.rc
1808 PATCH: [ 1472622 ] Czech translation - update
1809 Submitted by: Jan Hryz
1810 Src/Languages/Czech/MergeCzec.rc
1811 PATCH: [ 1472622 ] Czech translation - update (apply dialog fixes)
1812 Submitted by: Jan Hryz
1813 Src/Languages/*: Merge*.rc
1816 PATCH: [ 1473635 ] Move some results update code to DirDoc
1817 Src: DirActions.cpp DirDoc.cpp DirDoc.h
1818 PATCH: [ 1468691 ] Center folder compare status dialog to mainframe
1819 Adding line I missed previous time applying the patch (2006-04-12)
1823 TODO: [ 1469363 ] Need image for aborted status in folder compare
1825 Src: DirView.cpp Merge.rc resource.h
1826 Src/res new file: aborted.ico
1827 Src/Languages/*: Merge*.rc
1828 PATCH: [ 1400653 ] Write project files using objects
1830 Src: Merge.dsp ProjectFile.cpp ProjectFile.h
1831 Src new files: XmlDoc.cpp XmlDoc.h
1834 PATCH: [ 1471835 ] Fix setting filename in folder-compare report dialog
1835 Src: DirCmpReportDlg.cpp DirCmpReportDlg.h
1838 PATCH: [ 1445996 ] Fix wrong PgDown scrolling after mousescroll(2)
1839 Src/editlib: ccrystaltextview2.cpp
1841 2006-04-12 WinMerge experimental release 2.5.3.6 (cvs)
1844 PATCH: [ 1468691 ] Center folder compare status dialog to mainframe
1846 PaTCH: [ 1468783 ] Fix disabled scrollbars after loading files
1847 Src: MergeDoc.cpp MergeEditView.cpp MergeEditView.h
1850 PATCH: [ 1467872 ] Fix diff navigation for first-line of diff
1851 Src: MergeEditView.cpp
1852 PATCH: [ 1443719 ] xml output reports
1853 Submitted by Perry, modified by me
1854 Src: DirCmpReport.cpp DirCmpReport.h DirCmpReportDlg.cpp DirCmpReportDlg.h
1855 DirView.cpp DirView.h Merge.dsp Merge.rc resource.h
1856 Src new file: DirReportTypes.h
1859 PATCH: [ 1467305 ] Beep when long compare is ready
1860 Src: DirView.cpp DirView.h
1863 BUG: [ 1461375 ] Forgot old patch #981526 for sgml.cpp, sh.cpp and tcl.cpp?
1864 Src\editlib: sgml.cpp sh.cpp tcl.cpp
1867 BUG: [ 1383719 ] ShellExtension resources opening in IDE fails
1869 ShellExtension/Languages/*.rc
1870 BUG: [ 1465893 ] Compile error with VC6 (SuperComboBox.cpp)
1872 Src/Common: SuperComboBox.cpp
1875 BUG: [ 1463137 ] MergeArgs.h is empty file?
1878 Src removed file: MergeArgs.h
1881 PATCH: [ 1461896 ] Syntax highlighting of HTML for ASP not complete
1882 Src\editlib: asp.cpp
1885 PATCH: [ 1460749 ] Print relative paths to patch files
1886 Src: DiffWrapper.cpp DiffWrapper.h MainFrm.cpp MergeDoc.cpp PatchDlg.h
1887 PatchTool.cpp PatchTool.h
1888 BUG: [ 1461328 ] Commandline handling overwrites flags?
1891 BUG: [ 1460236 ] Splash localization is broken
1892 Src: Merge.rc resource.h Splash.cpp
1893 Src/Languages/*: Merge*.rc
1894 PATCH: [ 1445426 ] Clear PrivateBuild flag in SetResourceVersions.wsf
1896 Src: SetResourceVersions.wsf
1899 BUG: [ 1458714 ] [Replace All] doesn't work
1900 Src/editlib: ceditreplacedlg.cpp
1903 PATCH: [ 1459284 ] Update of MergeSwedish.rc for WinMerge 2.5.3.5+
1904 Submitted by Hans Eriksson
1905 Src/Languages/Swedish: MergeSwedish.rc
1906 PATCH: [ 1458852 ] Fix UI for multiple file patches
1907 Src: PatchDlg.cpp PatchDlg.h
1908 PATCH: [ 1441718 ] Auto Complete on files or folders selection
1909 Submitted by Gal Hammer
1910 Src/Common: SuperComboBox.cpp SupercompoBox.h
1911 Src: Merge.rc OpenDlg.cpp OptionsDef.h OptionsInit.cpp PropGeneral.cpp
1912 PropGeneral.h resource.h
1913 Src/Languages/*: Merge*.rc
1916 PATCH: [ 1458066 ] Use / as path delimiter in patch files
1917 Src: DiffWrapper.cpp
1918 PATCH: [ 1406944 ] Compute text statistics in QuickCompare
1919 Src new file: FileTextStats.h
1922 PATCH: [ 1457203 ] Create patch from multiple files in folder compare
1923 Src: DirView.cpp DirView.h MainFrm.cpp
1926 PATCH: [ 1457306 ] Revamped Visual Basic syntax highlighter
1927 Src\editlib: basic.cpp
1930 BUG: [ 1455656 ] GPL text still contains 'How to Apply These Terms...'
1933 2006-03-22 WinMerge experimental release 2.5.3.5 (cvs)
1936 PATCH: [ 1455706 ] Catalan translation update
1937 Submitted by Jordi Vilar
1938 Src/Languages/Catalan: MergeCatalan.rc
1939 PATCH: [ 1406944 ] Compute text statistics in QuickCompare
1940 Src: ByteComparator.cpp ByteComparator.h DiffFileInfo.cpp DiffFileInfo.h DiffWrapper.cpp
1941 Diffwrapper.h DirScan.cpp DirViewColItems.cpp Merge.dsp Merge.rc resource.h
1942 Src/diffutils/src: DIFF.H IO.C
1943 Src/Languages/*: Merge*.rc
1946 PATCH: [ 1455663 ] Add new keywords to Visual Basic highlighter
1947 Src\editlib: basic.cpp
1950 PATCH: [ 1448599 ] WinMerge Program Icon Set
1951 Submitted by Alexander Skinner
1953 PATCH: [ 1452288 ] Add ASP.NET filefilter
1954 By By Jon Galloway and Josh Blair
1955 Filters new file: ASPNET.flt
1956 PATCH: [ 1454720 ] Fix resizable dialogs missing captionbar close button
1958 Src/Languages/*: Merge*.rc
1959 PATCH: [ 1455430 ] New Splash Screen Revision 2
1960 Submitted by Alexander Skinner
1962 Remove obsolete splashscreen image (for old splashscreen)
1963 Src/res removed file: WinMergesplash.psd
1966 PATCH: [ 1449892 ] Add compare method to configlog
1967 Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
1968 PATCH: [ 1453252 ] Fix closing filecompare after error
1969 Src: MainFrm.cpp MergeDoc.cpp
1972 PATCH: [ 1449571 ] Add '*.pm' and '*.plx' to Perl highlighter
1973 Src/editlib: ccrystaleditview.cpp
1976 BUG: [ 1449947 ] Looks like diffutils bug for mac-style
1977 BUG: [ 1449949 ] crash comparing two simple test mac files
1978 Fix looping which missed mac case
1982 PATCH: [ 1449868 ] Fix difference counts
1983 Src: DiffWrapper.cpp
1986 PATCH: [ 1449038 ] Add Help-button to Open-dialog
1987 Src: FileFiltersDlg.cpp FileFiltersDlg.h Merge.rc OpenDlg.cpp OpenDlg.h
1988 PropLineFilter.cpp PropLineFilter.h
1989 Src/Common: PreferencesDlg.cpp
1990 Src/Languages/*: Merge*.rc
1993 PATCH: [ 1447927 ] Add Help Search to menu, open correct manual location
1994 Src: DirView.cpp DirView.h MainFrm.cpp MainFrm.h Merge.rc MergeEditView.cpp
1995 MergeEditView.h resource.h
1996 Src/Languages/*: Merge*.rc
1999 PATCH: [ 1447506 ] Don't include splash bitmap to lang files
2000 Src/Languages/*: Merge*.rc
2001 Remove Catalan localized splash screen
2002 Src/Languages/Catalan/res removed files: splash1.bmp WinMergeSplash.psd
2003 BUG: [ 1447851 ] Not enough space for version info in new splash screen
2005 PaTCH: [ 1445377 ] WinMerge Logos (72 DPI)
2006 Submitted by Alexander Skinner
2007 Add new folder Docs/Logos
2008 New Docs/Logos files: readme.txt WinMerge_logo_24bit.png
2009 WinMerge_logo_shadow_24bit.png WinMerge_logo_shadow_trans.tif
2010 WinMerge_logo_trans.gif
2011 Change Splashscreen text to according to Dean's wish
2013 Add Alexander Skinner to contributors list
2014 Docs/Users: Contributors.txt
2015 PATCH: [ 1447348 ] Build language files to Build directory
2016 Src/Languages: BuildDll.bat
2017 PATCH: [ 1447806 ] Use JPEG splashscreen
2018 Src: Merge.dsp Merge.rc resource.h Splash.cpp Splash.h
2019 Src/Common new files: Picture.cpp Picture.h
2020 Src/res new file: splash.jpg
2021 Src/res deleted file: splash1.bmp
2022 Src/Languages/*: Merge*.rc
2025 BUG: [ 1441389 ] Comparing root directory - mysterious
2026 Src: DiffWrapper.cpp
2029 PATCH: [ 1447539 ] Add explanatory comment to CCrystalTextBuffer::MoveLine
2030 Src/editlib: ccrystaltextbuffer.cpp
2031 PATCH: [ 1447547 ] Add more comments to CMergeDoc::PrimeTextBuffers
2035 Remove unneeded splash image (Splash2.bmp) as noted in Patch item #1441392
2036 Src/res removed file: Splash2.bmp
2039 PATCH: [ 1445434 ] SyntaxColors scrambling reg values
2040 Src: SyntaxColors.cpp
2042 2006-03-10 WinMerge experimental release 2.5.3.4 (cvs)
2045 PATCH: [ 1445996 ] Fix wrong PgDown scrolling after mousescroll
2046 Src/editlib: ccrystaltextview2.cpp
2047 BUG: [ 1446648 ] cvs trunk doesn't compile
2051 PATCH: [ 1441392 ] New Splash Screen
2052 Submitted by Alexander Skinner
2054 Src/res: splash1.bmp
2057 Update MakeResDll readme with current information (MSVC.Net 2003 works
2058 now), and better explanation of how to pick a specific version.
2059 MakeResDll: readme.txt
2060 PATCH: [ 1443391 ] Update MakeResDll for VS.NET 2005
2061 MakeResDll: MakeResDll.cpp MakeResDll.dsp MakeResDll.rc
2062 StdAfx.cpp StdAfx.h readme.txt resource.h
2063 New MakeResDll: Merge.ico VsVersionDlg.cpp VsVersionDlg.h
2064 Bump MakeResDll version from 1.0.6.0 to 1.0.7.0.
2065 MakeResDll: MakeResDll.rc
2066 PATCH: [ 1442844 ] Make GetFileExt easier to understand
2067 Src: MergeDoc.cpp MergeDoc.h
2068 Add two minor comments to PropRegistry.
2071 2006-03-06 WinMerge experimental release 2.5.3.3 (cvs)
2074 BUG: [ 1444211 ] bug in current SelectFile
2076 PATCH: [ 1443841 ] Add header comment to Src/Changes.txt
2080 BUG: [ 1442866 ] German RC format error
2081 Src/Languages/German: MergeGerman.rc
2082 BUG: [ 1442865 ] languages lack generate patch & report bitmaps
2083 Src/Languages/*: Merge*.rc
2086 PATCH: [ 1435361 ] Fix and cleanup project file code
2087 Src: DiffContext.cpp DiffContext.h DirDoc.cpp MainFrm.cpp
2088 Merge.cpp Merge.h Merge.rc MergeArgs.cpp ProjectFile.cpp
2090 Src/Languages/*: Merge*.rc
2093 PATCH: [ 1396506 ] customizable text colors
2094 Fix compilation (MSVC.NET 2003 correctly gave error that MSVC6 ignored)
2095 Src: PreferencesDlg.cpp
2096 PATCH: [ 1442125 ] Improvements for MakeResDll parsing
2097 MakeResDll: MakeResDll.cpp MakeResDll.rc resource.h
2098 Src\Common: RegKey.cpp RegKey.h
2099 PATCH: [ 1442134 ] MakeResDll: check that RC file exists
2100 MakeResDll: MakeResDll.cpp MakeResDll.rc resource.h
2101 PATCH: [ 1442238 ] Fix MakeResDll to work with VS.NET 2003
2102 MakeResDll: MakeResDll.cpp MakeResDll.rc
2103 PATCH: [ 1442791 ] Update MakeResDll project
2104 Add Changes.txt to project.
2105 Change version copyright from "2003" to "2003-2006"
2106 MakeResDll: MakeResDll.dsp MakeResDll.rc
2108 2006-03-04 Perry (MSVC6)
2109 Current selftests status: Failure count: 0 (of 756)
2112 PATCH: [ 1396506 ] customizable text colors
2113 Src: MainFrm.cpp MainFrm.h Merge.dsp Merge.rc MergeDoc.cpp
2114 OptionsDef.h OptionsInit.cpp PropArchive.cpp PropArchive.h
2115 PropCodepage.cpp PropCodepage.h PropColors.cpp PropColors.h
2116 PropCompare.cpp PropCompare.h PropEditor.h PropGeneral.h
2117 PropRegistry.h PropSyntaxColors.cpp PropSyntaxColors.h
2118 PropVss.h SyntaxColors.cpp SyntaxColors.h resource.h
2119 Src\Common: PreferencesDlg.cpp PreferencesDlg.h
2120 Src/Languages/*: Merge*.rc
2121 PATCH: [ 1439335 ] Reset cwd in Merge.cpp SelectFile
2122 Src: Merge.cpp OpenDlg.cpp
2123 PATCH: [ 1442082 ] Fix MakeDirs to not error if directory exists
2124 Src\Common: coretools.cpp
2125 PATCH: [ 1396506 ] customizable text colors
2127 Src: new PropTextColors.cpp PropTextColors.h
2130 PATCH: [ 1442699 ] New Changes.txt file for MakeResDll
2131 Add Changes.txt change log (this file).
2132 MakeResDll: new Changes.txt
2133 PATCH: [ 1424636 ] New BuildOneLanguage.vbs & fix MakeResDll exit
2134 MakeResDll: MakeResDll.cpp StdAfx.h
2135 Src\Languages: BuildDll.bat BuildOneLanguage.vbs
2138 PATCH: [ 1441387 ] Improve File Encoding dialog
2140 Src/Languages/*: Merge*.rc
2141 PATCH: [ 1442107 ] Move About-dialog code to separate files from Merge.cpp
2142 Src: Merge.cpp Merge.dsp
2143 Src new files: AboutDlg.cpp AboutDlg.h
2146 PATCH: [ 1437770 ] Icons for 'Generate Patch' and 'Generate Report'
2147 Src: MainFrm.cpp Merge.rc resource.h
2148 Src/res new files: patch.bmp report.bmp
2151 PATCH: [ 1441124 ] Improve filter test dialog
2153 Src/Languages/*: Merge*.rc
2156 PATCH: [ 1424535 ] Czech Translation, Submitted by Jan Hryz
2157 Improve unpacker selection dialog and new filter location selection dialog
2159 Src/Languages/*: Merge*.rc
2162 PATCH: [ 1438233 ] New icons for 'notequalfile', 'lfile' and 'rfile'
2163 Src/res: lfile.ico notequalfile.ico rfile.ico
2166 PATCH: [ 1436855 ] Typo in lang files (change pactch to patch)
2167 Src/Languages/*: Merge*.rc
2168 BUG: [ 1440774 ] Test button for file filters enabled for no filter
2169 Fix submitted by Gal Hammer
2170 Src: FileFiltersDlg.cpp
2171 PATCH: [ 1395847 ] Integration with Rational ClearCase
2172 Submitted by Gal Hammer
2173 Src: MainFrm.cpp MainFrm.h Merge.h MergeArgs.cpp MergeDoc.cpp MergeDoc.h
2174 Src/Common: coretools.cpp coretools.h
2177 BUG: [ 1439360 ] Native languages sometimes suppressed in Unicode Build
2178 Add note to CLanguageSelect::GetNativeLanguageNameString
2179 explaining why codepage check is done even for Unicode build.
2180 Src/Common: LanguageSelect.cpp
2183 BUG: [ 1439350 ] Russian language name in LanguageSelect?
2184 Src/Common: LanguageSelect.cpp
2187 PATCH: [ 1435470 ] Remove CTextFile
2189 Deleted Src\Common: textfile.cpp textfile.h
2190 PATCH: [ 1439229 ] Fix CMergeDoc::SanityCheckD not to dereference illegal lines
2191 BUG: [ 1438390 ] Crash when editting the attached files
2193 PATCH: [ 1434007 ] Move source control code out of MainFrm.cpp
2194 Src: MainFrm.cpp MainFrm.h Merge.dsp
2195 New Src: SourceControl.cpp
2198 PATCH: [ 1437758 ] Improve diff selection when selected diff not visible
2199 Src: MergeEditView.cpp MergeEditView.h
2200 PATCH: [ 1431607 ] Fix worddiff highlight error
2202 Src: stringdiffs.cpp
2205 PATCH: [ 1437677 ] Various Updates in German Translation for WinMerge 2.5
2206 Src/Languages/German: MergeGerman.rc
2209 PATCH: [ 1435431 ] Fix GenerateReport lines
2211 Src: DirCmpReport.cpp
2212 PATCH: [ 1395721 ] VS.NET 2003 warning of SEH bug
2214 PATCH: [ 1428686 ] Catalan translation update
2216 Src/Languages/Catalan: MergeCatalan.rc
2217 PATCH: [ 1430321 ] Swedish translation update and feedback on WinMerge 2.5.3.2
2219 Src\Languages\Swedish: MergeSwedish.rc
2220 PATCH: [ 1434270 ] Fix difference counts
2222 Src: DiffWrapper.cpp
2225 PATCH: [ 1435384 ] Add context menu for diff pane
2226 Src: Merge.rc MergeDiffDetailView.cpp MergeDiffDetailView.h resource.h
2227 Src/Languages/*: Merge*.rc
2228 PATCH: [ 1433125 ] Trap errors from filesystem during actions
2229 Src: FileActionScript.cpp
2232 PATCH: [ 1405603 ] New Test dialog for file filters
2233 (Forgot to do all the language resources)
2234 and misc RC file fixes (eg, many fixes in editor proppage)
2235 New: Src/Languages: WinMerge_Resource_Discrepencies.txt
2238 PATCH: [ 1405603 ] New Test dialog for file filters
2239 Src: FileFilterMgr.cpp FileFilterMgr.h FileFiltersDlg.cpp
2240 FileFiltersDlg.h Merge.dsp Merge.rc resource.h
2241 Src new: TestFilterDlg.cpp TestFilterDlg.h
2242 PATCH: [ 1433312 ] Add cvs tags to source files
2243 Src: ByteComparator.cpp SharedFilterDlg.cpp StdAfx.cpp
2244 TestFilterDlg.cpp TestFilterDlg.h ViewableWhitespace.cpp
2245 Src/Common: SortHeaderCtrl.cpp SortHeaderCtrl.h UniFile.cpp
2246 UniFile.h textfile.cpp textfile.h unicoder.cpp unicoder.h
2247 varprop.cpp varprop.h version.cpp version.h
2250 PATCH: [ 1178743 ] Disable lang menu if no additional langs installed
2251 Src: Merge.cpp Merge.h
2252 Src/Common: LanguageSelect.cpp LanguageSelect.h
2255 PATCH: [ 1433931 ] Add comment before isBin checks in DirView
2257 PATCH: [ 1424153 ] Remove VTS_PUI1 from lwdisp.h
2258 BUG: [ 1395475 ] VTS_UI1 & VTSPUI1 macro redefinition warnings (VS.NET)
2259 Src\Common: lwdisp.h
2260 PATCH: [ 1433927 ] Fix external editor default and messages
2261 BUG: [ 1433774 ] default editor is blank
2262 Src: MainFrm.cpp Merge.cpp Merge.rc OptionsInit.cpp resource.h
2263 Src/Languages/*: Merge*.rc
2264 PATCH: [ 1433353 ] Fix menu resources
2265 Src: MainFrm.cpp Merge.cpp Merge.rc resource.h
2266 Src/Languages/*: Merge*.rc
2268 2006-02-19 Christian
2269 PATCH: [ 1429125 ] Return number of diffs instead of true/false
2273 BUG: [ 1395483 ] Signed/unsigned mismatch warning from LocationView.cpp
2274 Src: LocationView.cpp
2277 BUG: [ 1395475 ] VTS_UI1 & VTSPUI1 macro redefinition warnings (VS.NET)
2278 Fixed VTS_PUI1 (which previous patch for this bug missed).
2279 Src\Common: lwdisp.h
2282 PATCH: [ 1424535 ] Czech Translation, Submitted by Jan Hryz
2283 Improve folder compare columns dialog (idea for new arrows from Catalan translation)
2285 Src/Languages/*: Merge*.rc
2288 PATCH: [ 1431771 ] Alter CheckTranslations.vbs to YesNoCancel
2289 Src/Languages: CheckTranslations.vbs
2290 PATCH: [ 1419582 ] Polish translation update for latest v2.5
2291 Contributed by dr_prozac
2292 Src/Languages/Polish: MergePolish.rc
2293 PATCH: [ 1431846 ] Update Czech Translation
2294 Contributed by Jan Hryz
2295 Src/Languages/Czech: MergeCzech.rc
2296 ShellExtension/Languages/ShellExtensionCzech.rc
2297 A few control adjustments matching Czech to English (many left)
2298 Src/Languages/Czech: MergeCzech.rc
2301 PATCH: [ 1431636 ] IgnoreEOL broken in cvs trunk
2302 Src: PropCompare.cpp
2305 PATCH: [ 1431768 ] Write paths to patch files as given
2306 Src: DiffWrapper.cpp
2309 PATCH: [ 1431205 ] Fix ViewWhitespace \r\n bug
2310 BUG: [ 1431012 ] View line differences adds additional EOL char
2311 Src/editlib: ccrystaltextview.cpp
2312 PATCH: [ 1431197 ] Fix off-by-one highlight error
2313 Src: stringdiffs.cpp
2314 Fix button movement on LanguageSelect (broken by PATCH#1423461).
2315 Also add cvs id comment at top, and doxygen file label.
2316 Src\Common: LanguageSelect.cpp
2319 BUG: [ 1197976 ] GeneratePatch file browse not intialized correctly
2320 Fix submitted by Perry
2324 PATCH: [ 1431131 ] Fix VS.NET 2003 compilation
2325 Src\Common: coretools.cpp scbarg.cpp scbarg.h sizecbar.cpp sizecbar.h
2326 Shrink Swedish dialog IDD_PROPPAGE_LARGE to same size as English
2327 (all controls already were the same size anyway)
2328 Src\Languages\Swedish: MergeSwedish.rc
2331 PATCH: [ 1212124 ] File encoding GUI
2332 Src: DiffContext.cpp DiffFileInfo.cpp DiffFileInfo.h DiffItem.cpp
2333 DiffItem.h DiffThread.cpp DiffWrapper.cpp DirActions.cpp
2334 DirScan.cpp DirView.cpp DirView.h DirViewColItems.cpp FileLocation.h
2335 MainFrm.cpp Merge.dsp Merge.rc MergeDoc.cpp MergeDoc.h OpenDlg.cpp
2336 codepage_detect.cpp codepage_detect.h resource.h
2337 NEW Src: FileTextEncoding.cpp FileTextEncoding.h IntToIntMap.h
2338 LoadSaveCodepageDlg.cpp LoadSaveCodepageDlg.h MergeDocEncoding.cpp
2339 dlgutil.cpp dlgutil.h
2342 Adjust whitespace to match English translation
2343 Also update Russian options/editor controls to match English
2344 Src\Languages\Russian: MergeRussian.rc
2345 Src\Languages\Slovak: MergeSlovak.rc
2346 Src\Languages\Swedish: MergeSwedish.rc
2347 Src\Languages\Turkish: MergeTurkish.rc
2348 PATCH: [ 1424681 ] Widen labels on unpacker dialog
2350 Src\Languages: Merge*.rc
2353 PATCH: [ 1429517 ] Fix coretools.cpp compilation (for MakeResDll)
2354 Src/Common: coretools.cpp
2355 PATCH: [ 1427838 ] code cleanup bottom of merge.cpp
2357 Synchronizing Turkish translation to English where feasible.
2358 Src/Languages/Turkish: MergeTurkish.rc
2359 Update Swedish Options/Editor to current English layout
2360 Src/Languages/Swedish: MergeSwedish.rc
2363 PATCH: [ 1428800 ] Fix ListCopy/AllLeft
2364 BUG: [ 1428791 ] All Left gave me a bunch of msgboxes
2365 Src: MergeDoc.cpp MergeDoc.h
2366 PATCH: [ 1428726 ] Fix for compilation under VS2005
2367 Src: BCMenu.cpp DiffWrapper.cpp DirCmpReport.cpp
2368 DirColsDlg.cpp DirViewColHandler.cpp GhostTextBuffer.cpp
2369 MergeArgs.cpp MergeDiffDetailView.cpp MergeDoc.cpp
2371 Src\Common: LanguageSelect.cpp SuperComboBox.cpp UniFile.cpp
2372 coretools.cpp multiformatText.cpp scbarg.cpp scbarg.h
2373 sizecbar.cpp sizecbar.h
2374 Src\editlib: asp.cpp basic.cpp batch.cpp ccrystaltextview.cpp
2375 cplusplus.cpp crystaltextblock.cpp csharp.cpp dcl.cpp
2376 fortran.cpp html.cpp ini.cpp innosetup.cpp is.cpp java.cpp
2377 lisp.cpp nsis.cpp pascal.cpp perl.cpp php.cpp python.cpp
2378 rexx.cpp rsrc.cpp sgml.cpp sh.cpp siod.cpp sql.cpp
2379 tcl.cpp tex.cpp xml.cpp
2380 PATCH: [ 1427563 ] Give descriptive name to CMergeDoc::SaveHelper
2381 Src: MainFrm.cpp MergeDiffDetailView.cpp MergeDoc.cpp
2382 MergeDoc.h MergeEditView.cpp
2383 PATCH: [ 1426593 ] Remove empty CMergeDoc::SetDiffViewMode()
2385 Src: MergeDoc.cpp MergeDoc.h
2387 2006-02-09 WinMerge experimental release 2.5.3.2 (cvs)
2390 PATCH: [ 1427851 ] Small cleanup for FileFilterMgr::AddFilter()
2391 Src: FileFilterMgr.cpp
2392 Add Jan Hryz as Czech translator and contributor
2393 Docs/Users: Contributors.txt
2396 PATCH: [ 1427845 ] Double-click fails to open, no message
2398 BUG: [ 1427956 ] Differences count in Folder Compare wrong?
2399 Make sure to set diff count to 0 just before counting them
2400 Src: DiffWrapper.cpp
2403 PATCH: [ 1426499 ] Move Save Projectfile to File menu
2404 Src: DirDoc.cpp DirDoc.h MainFrm.cpp MainFrm.h Merge.rc MergeDoc.cpp
2405 MergeDoc.h OpenDlg.cpp OpenDlg.h resource.h
2406 Src/Languages/*: Merge*.rc
2409 PATCH: [ 1424884 ] Fix UniStdioFile encoding of TCHAR
2410 BUG: [ 1402379 ] A character display and save error with encoding of unicode
2411 Src\Common: UniFile.cpp unicoder.cpp unicoder.h
2414 Current selftests status: Failure count: 0 (of 756)
2417 PATCH: [ 1426552 ] Add selftests between platform versions
2418 Src: Changes.txt ConfigLog.cpp DiffWrapper.cpp DiffWrapper.h
2419 DirDoc.cpp MainFrm.cpp MergeArgs.cpp MergeDoc.cpp
2420 MergeDocLineDiffs.cpp OptionsDef.h OptionsInit.cpp PatchTool.cpp
2421 PropCompare.cpp PropCompare.h
2422 Src\editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h
2425 Current selftests status: Failure count: 0 (of 588)
2428 PATCH: [ 1424867 ] Fix common prefix code for \r\n
2429 Src\diffutils\src: IO.C
2430 PATCH: [ 1426793 ] Fix diffutils that counts lines in suffix
2431 Src\diffutils\src: IO.C
2434 Current selftests status: Failure count: 0 (of 588)
2437 PATCH: [ 1424535 ] Czech Translation, Submitted by Jan Hryz
2438 Fix dir compare report dialog layout
2440 Src/Languages/*: Merge*.rc
2443 Synchronizing Slovak translation to English where feasible.
2444 Src/Languages/Slovak: MergeSlovak.rc
2445 Synchronizing Swedish translation to English where feasible.
2446 Src/Languages/Swedish: MergeSwedish.rc
2447 PATCH: [ 1392413 ] Track lossy encodings & warn user
2448 Src: FileFilterMgr.cpp Merge.rc MergeDoc.cpp files.h resource.h
2449 Src/Common: UniFile.cpp UniFile.h unicoder.cpp
2450 PATCH: [ 1392413 ] Track lossy encodings & warn user
2451 Src/Languages/*: Merge*.rc
2454 PATCH: [ 1414201 ] Cleanup Merge Line Flags
2455 Src: LocationView.cpp Merge.dsp MergeDiffDetailView.cpp MergeDoc.cpp
2456 MergeEditView.cpp MergeEditView.h
2457 NEW Src: MergeLineFlags.h
2460 PATCH: [ 1424264 ] Use 'Item' instead of file in View-menu
2462 Src/Language: */Merge*.rc
2465 Fix Italian Edit/Options/Editor line selection controls.
2466 Src/Languages/Italian/MergeItalian.rc
2467 PATCH: [ 1414904 ] updated italian translation for winmerge 2.5.3.1
2468 Submitted by A. Decorte
2469 New updates for selecting current diffs and wrap lines.
2470 Src/Languages/Italian/MergeItalian.rc
2473 BUG: [ 1422257 ] Wrong text in tooltip
2474 (Dutch translation had wrong shortcut keys in tooltip)
2475 Src/Languages/Dutch/MergeDutch.rc
2476 PATCH: [ 1424535 ] Czech Translation
2477 Submitted by Jan Hryz
2478 Src/Languages/Czech/MergeCzech.rc
2481 PATCH: [ 1424142 ] Wrap two lwdisp macros in ifndef
2482 Src/Common: lwdisp.h
2483 Undo PATCH: [ 1424142 ] Wrap two lwdisp macros in ifndef
2484 Src/Common: lwdisp.h
2485 BUG: [ 1383052 ] warning C4005: 'COMPILE_MULTIMON_STUBS' : macro redefinition
2486 (Wrap multimon def with ifndef
2488 PATCH: [ 1423461 ] Rearrange language select dialog
2489 Revise patch applied earlier: put Ok on left and Cancel on right.
2490 (Also fix French dialog which was left out before.)
2492 Src/Languages: */Merge*.rc
2493 PATCH: [ 1421199 ] Fix plugin menu for when location or diff detail view active
2494 Src: ChildFrm.cpp ChildFrm.h MainFrm.cpp MainFrm.h MergeDoc.cpp MergeDoc.h
2495 PATCH: [ 1414904 ] updated italian translation for winmerge 2.5.3.1
2496 Submitted by A. Decorte
2497 Src/Languages/Italian: MergeItalian.rc
2498 PATCH: [ 1423907 ] Fix diffutils hashing of \r
2499 Src/diffutils: IO.C UTIL.C
2500 Current selftests status: Failure count: 0 (of 480)
2501 Created branch "R_diffutils_branch"
2504 PATCH: [ 1409651 ] fix diffutils handling trailing whitespace
2505 Src/diffutils/src: IO.C UTIL.C
2506 Current selftests status: Failure count: 24 (of 480)
2507 Failing -b t002 (u & m platforms, all 4 builds)
2508 Failing -bi t002 (u & m platforms, all 4 builds)
2509 Failing -b bug1406950 (u & m platforms, all 4 builds)
2512 PATCH: [ 1423060 ] Modify perl selftest to test all 4 builds
2514 Current selftests status: Failure count: 36 (of 480)
2515 Failing -b t002 (all 3 platforms, all 4 builds)
2516 Failing -bi t002 (all 3 platforms, all 4 builds)
2517 Failing -b bug1406950 (all 3 platforms, all 4 builds)
2518 PATCH: [ 1421694 ] Widen comments label in Rational ClearCase dialog
2520 Src/Languages: */Merge*.rc
2521 PATCH: [ 1423461 ] Rearrange language select dialog
2522 Src: MainFrm.cpp MainFrm.h Merge.rc OpenDlg.cpp OpenDlg.h
2523 Src/Common: LanguageSelect.cpp LanguageSelect.h
2524 Src/Languages: */Merge*.rc
2527 PATCH: [ 1422052 ] Correction of Swedish for 2.5.3.1+
2528 Contributed by Hans Eriksson
2529 Src/Languages/Swedish: Merge Swedish
2532 PATCH: [ 1412386 ] Adding readme files
2533 New WinMerge/readme.txt
2534 (Various other directories affected -- readme.txt & Changes.txt files)
2537 PATCH: [ 1419329 ] Select Line Difference
2538 Src: Merge.rc MergeDiffDetailView.cpp MergeDiffDetailView.h MergeEditView.cpp
2539 MergeEditView.h resource.h
2540 Src/Language: */Merge*.rc
2543 BUG: [ 1419317 ] link error on 8-bit cvs trunk
2544 Add HtmlHelp.lib to link lines MergeRelease, MergeDebug, MergeUnicodeRelease.
2546 PATCH: [ 1419582 ] Polish translation update for latest v2.5
2547 Contributed by dr_prozac
2548 Src/Languages/Polish: MergePolish.rc
2549 PATCH: [ 1421018 ] Fix handle leak in GetOpenFileName
2550 BUG: [ 1418765 ] 2.4.4.0U maintain opened a handle on folders
2551 Adds new method paths_GetWindowsDirectory & resets current
2552 directory to WINDIR after GetOpenFileName call
2553 Src: MainFrm.cpp OpenDlg.cpp paths.cpp paths.h
2554 Cosmetic: synchronizing whitespace to English version
2555 Src/Languages/*: MergeTurkish.rc MergeSwedish.rc MergeSpanish.rc
2556 Cosmetic: synchronizing whitespace to English version
2557 Src/Languages/*: MergePolish.rc
2558 Updating Polish dialog control layout to English (except where
2559 would hinder appearance)
2560 Src/Languages/*: MergePolish.rc
2563 PATCH: [ 1419171 ] Various Updates in German Translation for WinMerge 2.5
2564 Src/Languages/German: MergeGerman.rc
2567 PATCH: [ 1415895 ] Split cmdline help string into chunks
2568 Src: Merge.cpp Merge.h Merge.rc MergeArgs.cpp resource.h
2569 Src/Languages: */*.rc
2572 PATCH: [ 1414904 ] updated italian translation for winmerge 2.5.3.1
2573 Submitted by A. Decorte
2574 InnoSetup\Languages: Italian.isl
2575 PATCH: [ 1415165 ] Updated Swedish translation for 2.5.3.1+
2576 Submitted by Hans Eriksson
2577 Src\Languages\Swedish: MergeSwedish.rc
2578 PATCH: [ 1414195 ] Delete two old TODO notes
2580 PATCH: [ 1414196 ] Delete useless CChildFrame::OnNotify method
2581 Src: ChildFrm.cpp ChildFrm.h
2582 PATCH: [ 1414199 ] Fix outdated comment on DirView.cpp :: NumToStr
2586 PATCH: [ 1413230 ] Use HtmlHelp API to open help
2587 Src: MainFrm.cpp Merge.dsp
2590 BUG: [ 1412237 ] InitOption return value wrong if RegCreateKey fails
2591 Fix unused wrong return value of InitOption & improve one comment
2592 Src/Common: OptionsMgr.cpp
2593 BUG: [ 1414868 ] Bug in byte_compare (early finish)
2594 (Also added some comments.)
2595 Src: DiffWrapper.cpp
2597 2006-01-24 WinMerge experimental release 2.5.3.1 (cvs)
2600 PATCH: [ 1406840 ] Use HTMLHelp locally
2602 PATCH: [ 1411727 ] Merge inactive diff when cursor is inside it
2603 Src: MergeDoc.cpp MergeDoc.h MergeEditView.cpp MergeEditView.h
2606 Add repro files to selftests from
2607 BUG [ 1406950 ] QuickCompare vs diffutils, disagree on trailing whitespace
2608 Current selftests status: Failure count: 9 (of 108)
2609 Failing -b t002 (all 3 platforms)
2610 Failing -bi t002 (all 3 platforms)
2611 Failing -b bug1406950 (all 3 platforms)
2612 PATCH: [ 1406950 ] QuickCompare vs diffutils, disagree on trailing whitespace
2613 Src: ByteComparator.cpp
2614 (selftests results unimproved, because selftest uses diffutils core, not QuickCompare)
2617 PATCH: [ 1405540 ] Cleanup filters dialog
2618 Src: FileFiltersDlg.cpp FileFiltersDlg.h
2621 PATCH: [ 1411102 ] Add '*.dsl' and '*.jsp' to syntax highlighter
2622 Src/editlib: ccrystaleditview.cpp
2625 PATCH: [ 1411406 ] self-tests and new arguments and new diff2winmerge.exe
2626 Src: Changes.txt MainFrm.cpp MainFrm.h Merge.cpp Merge.h MergeArgs.cpp
2627 Src/Common: OptionsMgr.cpp OptionsMgr.h
2628 New directory WinMerge/diff2winmerge, for diff2winmerge utility
2629 New directory WinMerge/selftests added
2630 Current selftests status: Failure count: 6 (of 108)
2631 Failing -b t002 (all 3 platforms)
2632 Failing -bi t002 (all 3 platforms)
2635 PATCH: [ 1411150 ] Add GetActiveMergeView for MergeDoc
2636 Src: MergeDoc.cpp MergeDoc.h
2639 PATCH: [ 1407740 ] Polish translation update (for version 2.4.4.0)
2640 Submitted by dr_prozac
2641 (Perry merging many of these to cvs trunk)
2642 Src/Language/Polish: MergePolish.rc
2645 BUG: [ 1408587 ] Unused DoScroll() function in Merge*View
2646 Remove DoScroll() from CMergeEditView and CMergeDiffDetailView
2647 Src: MergeDiffDetailView.cpp MergeDiffDetailView.h MergeEditView.cpp
2651 PATCH: [ 1406207 ] Fix error message for unique folders
2652 Src: DirView.cpp Merge.rc resource.h
2653 Src/Language: */Merge*.rc
2656 PATCH: [ 1401711 ] A hybrid of word diff and char diff
2657 Submitted by Takashi Sawanaka
2658 Src: MergeDocLineDiffs.cpp PropEditor.cpp
2659 stringdiffs.cpp stringdiffs.h
2662 PATCH: [ 1406203 ] Open unique files to external editor
2663 Src: DirView.cpp Merge.rc resource.h
2664 Src/Language: */Merge*.rc
2667 PATCH: [ 1333600 ] Get rid of global MainFrame pointer (part1)
2668 Src: DirActions.cpp DirDoc.cpp DirView.cpp FileActionScript.cpp
2669 MainFrm.cpp MainFrm.h Merge.cpp MergeDoc.cpp MergeEditView.cpp
2670 OpenDlg.cpp PropRegistry.cpp
2671 Src\Common: PreferencesDlg.cpp
2674 PATCH: [ 1403457 ] Support Unicode file filter files
2675 Src: FileFilterMgr.cpp
2678 PATCH: [ 1372044 ] Add FileActionScript for folder compare actions
2679 Src: DirActions.cpp DirView.h Merge.dsp
2680 Src new files: FileActionScript.cpp FileActionScript.h
2681 PATCH: [ 1385672 ] Replace some 'file's with 'item's
2683 Src/Language: */Merge*.rc
2684 PATCH: [ 1405340 ] Add XP shadow to folderskip.ico
2686 Src/res: folderskip.ico
2689 TODO: [ 1395638 ] CChildFrame::PreCreateWindow() does nothing
2690 Src: ChildFrm.cpp ChildFrm.h MainFrm.cpp
2693 PATCH: [ 1403454 ] Add comment to UniStdioFile.h
2695 Src/Common: UniFile.h
2696 PATCH: [ 1403893 ] Fix whitespace error in ByteCompare
2697 BUG: [ 1400779 ] Whitespace bug in ByteComparator
2698 Src: ByteComparator.cpp
2701 PATCH: [ 1039677 ] Alter text of Reset button label
2703 Src/Language: */Merge*.rc
2706 PATCH: [ 1399263 ] Captioned panes (new style)
2707 Src: ChildFrm.cpp DiffViewBar.h LocationBar.h Merge.dsp Merge.rc resource.h
2708 Src/Common new files: scbarcf.cpp scbarcf.h
2709 Src/Language: */Merge*.rc
2710 PATCH: [ 1399738 ] Filename bars to use caption colors
2711 Src: ChildFrm.cpp FilePathEdit.cpp FilePathEdit.h
2714 PATCH: [ 1403412 ] German: Option 'Line Difference Coloring' looks broken
2715 Src/Languages/German: MergeGerman.rc
2717 2006-01-11 WinMerge beta release 2.5.2
2720 PATCH: [ 1402774 ] Use dark red color for 'binarydiff.ico'
2722 Src/res: binarydiff.ico
2723 PATCH: [ 1400845 ] Allow Shift+Ctrl+F3 to search selected text backwards
2724 With addition from Takashi for Shift+F3 backwards search
2726 Src/editlib: ccrystaltextview.cpp
2727 Src/Language: */Merge*.rc
2728 BUG: [ 1400829 ] Crash trying to open location pane context menu
2729 Src: LocationView.cpp
2732 PATCH: [ 1401420 ] New 'MergeDir' icon
2733 Src/res: MergeDir.ico
2736 PATCH: [ 1400830 ] Fix drop to only do LoadProjectFile when 1 file dropped
2737 BUG: [ 1400797 ] Dropping two project files doesn't work to compare them
2738 (Also fixes extension test to be case-sensitive)
2742 BUG: [ 1396222 ] CDirView::MoveSelection() is confused
2743 (Rename MoveSelection to MoveFocus & add more commenting)
2744 Src: DirActions.cpp DirView.cpp DirView.h
2747 PATCH: [ 1398064 ] Catalan translation update
2749 Src/Languages/Catalan: MergeCatalan.rc
2750 PATCH: [ 1398959 ] Implement GuessEncoding in QuickCompare
2751 Src: codepage_detect.cpp DiffWrapper.cpp DiffWrapper.h
2753 2006-01-05 WinMerge experimental release 2.5.0.5 (cvs)
2756 PATCH: [ 1393635 ] Save pane sizes and positions when they change
2757 Src: ChildFrm.cpp ChildFrm.h DiffViewBar.cpp DiffViewBar.h LocationBar.cpp
2758 LocationBar.h LocationView.cpp LocationView.h MergeDiffDetailView.cpp
2759 MergeDiffDetailView.h StdAfx.h
2760 PATCH: [ 1396413 ] Update Open dialog controls when its activated
2761 Src: OpenDlg.cpp OpenDlg.h
2764 Cosmetic; normalizing blank lines to agree with English Merge.rc
2766 Brazilian\MergeBrazilian.rc
2767 ChineseSimplified\MergeChineseSimplified.rc
2768 Korean\MergeKorean.rc
2769 Norwegian\MergeNorwegian.rc
2772 PATCH: [ 1394877 ] Find selected text with Ctrl+F3
2774 Src/editlib: ccrystaltextview.cpp
2775 Src/Language: */Merge*.rc
2776 PATCH: [ 1395584 ] Update CSizingControlBar to latest version
2777 Src: DiffViewBar.cpp DiffViewBar.h LocationBar.cpp LocationBar.h Merge.dsp StdAfx.h
2778 Src/Common: sizecbar.cpp sizecbar.h
2779 Src/Common new files: scbarg.cpp scbarg.h
2780 Src/Common deleted files: sizecbarg.cpp sizecbarg.h
2781 PATCH: [ 1383262 ] Fix bitmap leak in ShellExtension
2782 Also bump version number to 1.7.1
2784 ShellExtension: ShellExtension.rc WinMergeShell.cpp WinMergeShell.h
2787 PATCH: [ 1390104 ] fix for BUG: [ 1384069 ] Wrapped lines have incorrect column
2788 Src: MergeEditView.cpp
2789 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
2792 BUG: [ 1390849 ] cvs trunk MergeChineseSimplified doesn't compile
2793 Src/Languages: ChineseSimplified: MergeChineseSimplified.rc
2794 PATCH: [ 1212161 ] Fix handling of \r\n in ByteComparator
2795 Src: ByteComparator.cpp
2798 PATCH: [ 1383802 ] Cleanup line difference options in Editor-options
2799 Src: Merge.rc PropEditor.cpp PropEditor.h resource.h
2800 PATCH: [ 1383802 ] Cleanup line difference options in Editor-options
2802 Src/Language: */Merge*.rc
2803 PATCH: [ 1391550 ] vbs script to check & optionally merge WinMerge resources
2804 Src: new CheckTranslations.vbs
2807 PATCH: [ 1395474 ] Define WINVER for compiling with VS.net
2809 PATCH: [ 1395018 ] Small cleanup for CMergeDoc::PrimeTextBuffers()
2810 Src: DiffList.cpp DiffList.h MergeDoc.cpp
2813 PATCH: [ 1395487 ] Unused local variable in UniStdioFile::DoOpen()
2814 (Delete unused variable)
2815 Src/Common: UniFile.cpp
2816 BUG: [ 1395497 ] Unused local variables in CMergeDoc::GetWordDiffArray()
2817 (Delete unused variables)
2818 Src: MergeDocLineDiffs.cpp
2819 BUG: [ 1395494 ] stringdiffs.cpp / LastChar() returning uninitialized value?
2820 Src: stringdiffs.cpp
2823 Remove unused variable from VSSHelper.cpp/VSSHelper::ReLinkVCProj()
2827 PATCH: [ 1392647 ] Prefix members with m_ in storage_for_plugins
2828 Src/Common: multiformatText.cpp multiformatText.h
2829 PATCH: [ 1394717 ] Fix resource.h include for translations
2830 Src/Languages: */Merge*.rc
2831 Src/Languages deleted: UpdateAll_resource_h.bat
2832 Src/Languages deleted: */resource.h (localized versions of resource.h)
2833 BUG: [ 1395107 ] MergeKorean.rc not compile in cvs trunk
2834 (resource.h => ..\..\resource.h fix missed Korean somehow)
2835 Src/Languages/Korean: MergeKorean.rc
2836 PATCH: [ 1394073 ] Fix ByteComparator: m_bol0
2837 (Change in ByteComparator.h is cosmetic typo fix in comment)
2838 (Fixes some bad tabbing as well)
2839 Src: ByteComparator.cpp ByteComparator.h
2842 PATCH: [ 1394759 ] Allows quotes in Rational ClearCase checkout comment
2843 Submitted by Gal Hammer
2845 Add Gal Hammer to contributors list
2846 Docs/Users: Contributors.txt
2849 BUG: [ 1394857 ] cvs trunk does not compile, ANSI, FindEncodingIdFromNameOrAl
2850 Src: codepage_detect.cpp
2853 PATCH: [ 1392347 ] Fix status after synching unique binary files
2855 PATCH: [ 1394464 ] Find again code doesn't recognize dos/mac EOLs
2856 Src/editlib: ccrystaltextview.cpp
2857 BUG: [ 1394851 ] cvs trunk does not compile (DirScan.cpp, sRule)
2861 PATCH: [ 1394247 ] Fix GuessEncoding recognition of codepages
2862 BUG: [ 1394234 ] GuessEncodings fails to recognize CP-437
2863 Src: codepage_detect.cpp
2864 PATCH: [ 1393979 ] Delete unused DiffWrapper fnc cleanup_script
2865 Src: DiffWrapper.cpp
2868 PATCH: [ 1391732 ] Do not offer to unify codepages in UNICODE build
2869 Also introduces new error IDS_DIFFERENT_UNICODINGS and new
2870 global function IsUnicodeBuild.
2872 Doing language synchronizations for this patch.
2874 Languages\Brazilian\MergeBrazilian.rc
2875 Languages\Bulgarian\MergeBulgarian.rc
2876 Languages\Catalan\MergeCatalan.rc
2877 Languages\ChineseSimplified\MergeChineseSimplified.rc
2878 Languages\ChineseTraditional\MergeChineseTraditional.rc
2879 Languages\Czech\MergeCzech.rc
2880 Languages\Danish\MergeDanish.rc
2881 Languages\Dutch\MergeDutch.rc
2882 Languages\German\MergeGerman.rc
2883 Languages\Hungarian\MergeHungarian.rc
2884 Languages\Italian\MergeItalian.rc
2885 Languages\Japanese\MergeJapanese.rc
2886 Languages\Korean\MergeKorean.rc
2887 Languages\Norwegian\MergeNorwegian.rc
2888 Languages\Polish\MergePolish.rc
2889 Languages\Russian\MergeRussian.rc
2890 Languages\Slovak\MergeSlovak.rc
2891 Languages\Spanish\MergeSpanish.rc
2892 Languages\Swedish\MergeSwedish.rc
2893 Languages\Turkish\MergeTurkish.rc
2894 PATCH: [ 1212368 ] Display correct paths in context patches
2896 Revising patched code, removing unneeded dispname added when patch applied
2897 Src: DiffWrapper.cpp
2898 diffutils\src: CONTEXT.C DIFF.H
2899 PATCH: [ 1393239 ] Split functions out of RunFileDiff
2900 Src: DiffWrapper.cpp DiffWrapper.h
2901 PATCH: [ 1392229 ] Fix Column item handling
2902 Src: DirView.h DirViewColHandler.cpp DirViewColItems.cpp
2906 PATCH: [ 1390774 ] Rename CRegOptions to CRegOptionsMgr
2907 Docs\Developers: Options.html
2908 Src\Common: OptionsMgr.cpp OptionsMgr.h
2909 Src: FileTransform.cpp MainFrm.cpp MainFrm.h SyntaxColors.cpp
2910 SyntaxColors.h codepage.h
2911 PATCH: [ 1392650 ] Fix locals of CDiffWrapper::RunFileDiff
2912 Src: DiffWrapper.cpp DiffWrapper.h MergeDoc.cpp PatchTool.cpp
2913 PATCH: [ 1392729 ] Cleanup variables in RunFileDiff
2914 Src: DiffWrapper.cpp
2915 BUG: [ 1369646 ] Confusing half-commented lines in DiffFileData::prepAndCompa
2916 Src: DiffWrapper.cpp
2917 BUG: [ 1392740 ] Clutter in debug output
2919 PATCH: [ 1391766 ] Sync language resources to English
2921 Languages\Brazilian\MergeBrazilian.rc
2922 Languages\Bulgarian\MergeBulgarian.rc
2923 Languages\Catalan\MergeCatalan.rc
2924 Languages\ChineseSimplified\MergeChineseSimplified.rc
2925 Languages\ChineseTraditional\MergeChineseTraditional.rc
2926 Languages\Czech\MergeCzech.rc
2927 Languages\Danish\MergeDanish.rc
2928 Languages\Dutch\MergeDutch.rc
2929 Languages\German\MergeGerman.rc
2930 Languages\Hungarian\MergeHungarian.rc
2931 Languages\Italian\MergeItalian.rc
2932 Languages\Japanese\MergeJapanese.rc
2933 Languages\Korean\MergeKorean.rc
2934 Languages\Norwegian\MergeNorwegian.rc
2935 Languages\Polish\MergePolish.rc
2936 Languages\Russian\MergeRussian.rc
2937 Languages\Slovak\MergeSlovak.rc
2938 Languages\Spanish\MergeSpanish.rc
2939 Languages\Swedish\MergeSwedish.rc
2940 Languages\Turkish\MergeTurkish.rc
2941 PATCH: [ 1212368 ] Display correct paths in context patches
2942 Src: DiffWrapper.cpp DiffWrapper.h
2943 diffutils\src: CONTEXT.C DIFF.H
2944 PATCH: [ 1390454 ] new commandline arguments (prediffer, ignorews...)
2945 Src: ConfigLog.cpp DirDoc.cpp DirDoc.h FileTransform.cpp
2946 MainFrm.cpp MainFrm.h Merge.cpp Merge.dsp Merge.h
2947 MergeEditView.cpp MergeEditView.h
2948 PluginManager.cpp PluginManager.h Plugins.cpp Plugins.h
2950 Src New files: MergeArgs.h MergeArgs.cpp
2951 Src/Common: CmdArgs.cpp CmdArgs.h OptionsMgr.cpp OptionsMgr.h
2954 PATCH: [ 1391732 ] Do not offer to unify codepages in UNICODE build
2955 Also introduces new error IDS_DIFFERENT_UNICODINGS and new
2956 global function IsUnicodeBuild.
2957 Src: ConfigLog.cpp MainFrm.cpp Merge.rc resource.h StdAfx.cpp StdAfx.h
2960 PATCH: [ 1390793 ] New global function GetOptionMgr
2961 Src: DirActions.cpp DirDoc.cpp DirView.cpp DirViewColHandler.cpp
2962 LocationView.cpp MainFrm.cpp MainFrm.h MergeDiffDetailView.cpp
2963 MergeDoc.cpp MergeEditView.cpp OpenDlg.cpp
2964 Src/Common: OptionsMgr.h
2967 PATCH: [ 1382130 ] New line-based RCLocalizationHelper
2971 PATCH: [ 1388704 ] Simplified Chinese language .rc file for RC1
2972 Src/Languages/ChineseSimplified: MergeChineseSimplified.rc
2973 Update language versions of resource.h
2974 Src/Languages/*: resource.h
2977 Update & synchronize translations: Danish Dutch French Hungarian Italian Japanese
2980 Danish: MergeDanish.rc
2981 Dutch: MergeDutch.rc
2982 French: MergeFrench.rc
2983 Hungarian: MergeHungarian.rc
2984 Italian: MergeItalian.rc
2985 Japanese: MergeJapanese.rc
2986 Remove needless cast
2987 Src/Common: unicoder.cpp
2988 Update & synchronize translations: Korean Norwegian Polish Russian
2991 Korean: MergeKorean.rc
2992 Norwegian: MergeNorwegian.rc
2993 Polish: MergePolish.rc
2994 Russian: MergeRussian.rc
2997 PATCH: [ 1388456 ] Convert rest of folder compare bitmaps to icons
2998 Icons from Tim (Thanks!)
2999 Src: CompareStatisticsDlg.cpp DirView.cpp Merge.dsp Merge.rc resource.h
3000 Src/res added files: binarydiff.ico equalbinary.ico equalfile.ico error.ico
3001 fileskip.ico folderup.ico folderup_disable.ico lfile.ico notequalfile.ico
3002 rfile.ico sigma.ico unknown.ico
3003 Src/res removed files: binary.bmp binarydiff.bmp error.bmp fileskip.bmp
3004 folderup.bmp folderup_disable.bmp lfile.bmp notequal.bmp rfile.bmp
3005 sigma.bmp unknown.bmp
3006 Src/Languages: *.rc resource.h
3008 2005-12-21 WinMerge experimental release 2.5.0.4 (cvs)
3011 BUG: [ 1385518 ] Batch file syntax highlighting weirdness
3013 Src/editlib: batch.cpp
3014 PATCH: [ 1387297 ] Swedish translation update for 2.5.0.3+
3015 Submitted by Hans Eriksson
3016 Src/Languages/Swedish: MergeSwedish.rc
3019 PATCH: [ 1386442 ] Local variable uses m_ prefix in CChildFrame
3023 PATCH: [ 1384646 ] Replace Question icons with warning icons in messageboxes
3024 Src: DirActions.cpp FileFiltersDlg.cpp MainFrm.cpp MergeDoc.cpp PatchDlg.cpp
3027 PATCH: [ 1383120 ] Fix background colors in WinMerge
3028 Src: SyntaxColors.cpp SyntaxColors.h
3029 Src/Common: OptionsMgr.cpp OptionsMgr.h
3030 PATCH: [ 1384181 ] Fix byte difference fencepost/infinite loop
3031 Src: CompareOptions.h ConfigLog.cpp DiffWrapper.cpp DiffWrapper.h
3032 Merge.dsp PatchDlg.cpp stringdiffs.cpp
3035 BUG: [ 1379277 ] typo fix for docs
3036 Docs/Developers: Plugins.html
3037 BUG: [ 1375661 ] Readme incomplete in WinMerge 2.5.0.3
3038 Docs/Users: ReadMe.txt
3039 PATCH: [ 1382966 ] Remove empty CMergeEditView::AddMod() and ResetMod()
3040 Src: MergeEditView.cpp MergeEditView.h
3043 PATCH: [ 1378771 ] Fix for BUG:[ 1376552 ] char offset not getting updated when...
3044 Src: ChildFrm.cpp MergeEditView.cpp
3047 PATCH: [ 1378795 ] The searched word is not highlighted correctly
3048 Src/editlib: ccrystaltextview.cpp
3051 PATCH: [ 1382955 ] Remove unused CompareStats.h include from DirFrame.cpp
3053 PATCH: [ 1376711 ] Change CFile::GetStatus to paths_DoesPathExist
3054 Src: files.cpp MainFrm.cpp MainFrm.h Merge.cpp MergeDoc.cpp OpenDlg.cpp
3056 Src/Common: coretools.cpp
3059 PATCH: [ 1381984 ] Folder compare progressdialog could be drawn off-screen
3060 Src: DirCompProgressDlg.cpp
3063 PATCH: [ 1380083 ] Fix EditBinaryFiles Plugin BuildTmp paths
3064 Plugins\src_VCPP\EditBinaryFiles: EditBinaryFiles.dsp
3067 PATCH: [ 1381975 ] Don't open Open-dialog outside screen
3068 Src: MainFrm.cpp OpenDlg.cpp
3069 Src removed file: multimon.h
3072 BUG: [ 1380019 ] Bulgarian translation has wrong language id
3073 Src/Languages/Bulgarian: MergeBulgarian.rc
3074 PATCH: [ 1382131 ] English rc file has numbers instead of symbols for language
3076 PATCH: [ 1379227 ] Fix ExpatLibs BuildTmp paths
3077 Src/ExpatLib: expat_static.dsp
3078 Src/ExpatMapLib: expat_maps_static.dsp
3079 PATCH: [ 1379228 ] Fix Merge7zInstaller BuildTmp paths
3080 Merge7zInstaller: Merge7zInstaller.dsp
3083 PATCH: [ 1381935 ] Simplify DirView icon loading
3087 BUG: [ 1382021 ] Merge7z432 missing?
3088 Merge7z new files: Merge7z431.dsp Merge7z432.dsp
3091 PATCH: [ 1188787 ] New Chinese translation rc file (from PATCH 1183476)
3092 Some more synchronizing from submitted patch
3093 Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
3094 PATCH: [ 1379226 ] Fix Display Plugins BuildTmp paths
3096 PATCH: [ 1188787 ] New Chinese translation rc file (from PATCH 1183476)
3097 Last updates from submitted patch
3098 Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
3099 BUG: [ 1381879 ] Unused variable in unicoder.cpp
3100 Src/common: unicoder.cpp
3103 Update & synchronize translations: ChineseTraditional Czech Danish Dutch
3105 ChineseTraditional: MergeChineseTraditional.rc
3106 Czech: MergeCzech.rc
3107 Danish: MergeDanish.rc
3108 Dutch: MergeDutch.rc
3109 Update & synchronize translations: French German Hungarian Italian Japanese
3111 French: MergeFrench.rc
3112 German: MergeGerman.rc
3113 Hungarian: MergeHungarian.rc
3114 Italian: MergeItalian.rc
3115 Japanese: MergeJapanese.rc
3118 PATCH: [ 1379894 ] Fix handling of unknown encoding
3120 Src/Common: unicoder.cpp
3121 Update & synchronize translations: Brazilian Bulgarian Catalan ChineseSimplified
3123 Brazilian: MergeBrazilian.rc
3124 Bulgarian: MergeBulgarian.rc
3125 Catalan: MergeCatalan.rc
3126 ChineseSimplified: MergeChineseSimplified.rc
3129 PATCH: [ 1378174 ] Share Src/res between translations
3131 Src/Languages/res: removed .bmp .cur and .ico files and WinMergeSplash.psd
3132 splash1.bmp and splash WinMergeSplash.psd not removed from Catalan
3135 PATCH: [ 1377545 ] Remove needless casts
3138 PATCH: [ 1372549 ] readme for Merge7z distributables
3142 PATCH: [ 1371994 ] Enable hi-color icons for folder compare
3143 Icons from Tim (Thanks!)
3144 Src: CompareStatisticsDlg.cpp DirView.cpp Merge.rc resource.h
3145 res new files: folder.ico folderskip.ico lfolder.ico rfolder.ico
3146 res deleted files: folder.bmp folderskip.bmp lfolder.bmp rfolder.bmp
3147 Src/Languages: *.rc resource.h
3148 Src/Languages/res: new and deleted files like in res above
3151 PATCH: [ 1371384 ] Move Expat maps into WinMerge src
3152 Plugins\src_VCPP\DisplayXMLFiles: DisplayXMLFiles.dsp
3153 Src\ExpatMapLib added
3154 Many files moved from DisplayXMLFiles to new ExpatMapLib
3155 PATCH: [ 1373020 ] Carry unicoding, codepage, & file path together
3156 & PATCH: [ 1377545 ] Remove needless casts
3157 Src: DiffWrapper.cpp DiffWrapper.h DirScan.cpp DirView.cpp
3158 MainFrm.cpp MainFrm.h Merge.dsp MergeDoc.cpp MergeDoc.h
3159 Src\Common: RegKey.cpp
3160 NEW Src\FileLocation.h
3163 PATCH: [ 1188787 ] New Chinese translation rc file (from PATCH 1183476)
3164 Remainder of dialogs
3165 Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
3166 BUG: [ 1376825 ] infinite loop bug in byte diffs
3167 Src: stringdiffs.cpp
3168 PATCH: [ 1188787 ] New Chinese translation rc file (from PATCH 1183476)
3169 A few string resources
3170 Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
3171 PATCH: [ 1249007 ] Short size column
3172 Src: DirViewColItems.cpp locality.cpp locality.h Merge.rc resource.h
3173 PATCH: [ 1377362 ] Fix coretools to MakeResDll compiles
3174 BUG: [ 1377361 ] MakeResDll broken b/c coretools broken
3175 Src/Common: coretools.cpp
3178 PATCH: [1374728 ] Fix filter dialog delete
3179 Src: FileFilterMgr.cpp
3182 PATCH: [ 1374782 ] fix for bug 1300957 Crash on save 'unique' file comparison
3183 Submitted by Oliver Mellet, some additional comment improvements by me.
3185 Takashi is now developer, Olivier Mellet submitted a patch
3186 Docs/Users: Contributors.txt
3189 PATCH: [ 1376457 ] Need clarification in platform test in ShellExtension
3190 ShellExtension: ShellExtension.cpp
3193 fix two-line-end-markers bug that was reported in:
3194 "PATCH: [ 1372716 ] patch for RFE:[ 922992 ] Word Wrap/split long lines"
3195 Src: stringdiffs.cpp
3198 PATCH: [ 1372716 ] patch for RFE:[ 922992 ] Word Wrap/split long lines
3199 Src: Merge.rc MergeDoc.cpp MergeEditView.cpp MergeEditView.h OptionsDef.h
3200 OptionsInit.cpp resource.h
3201 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h ccrystaltextview2.cpp
3202 crystalparser.cpp editcmd.h
3203 Src/Languages: *.rc resource.h
3206 PATCH [ 1374931 ] Bugfixes & upload binary for RCLocalizationHelper
3207 (RCLocalizationHelper plugin)
3210 PATCH [ 1372575 ] Fix link for DisplayXmlFiles plugin
3211 (DisplayXMLFiles plugin)
3212 TODO [ 1341058 ] ToDoDeleteThisValidateColumnOrdering()
3213 Src: DirView.cpp DirView.h DirViewColHandler.cpp
3215 2005-12-06 WinMerge experimental release 2.5.0.3 (cvs)
3218 PATCH: [ 1372589 ] Document tildas in config
3221 PATCH: [ 1373037 ] Fix filter dialog to correctly add new filters
3223 Src: FileFiltersDlg.cpp
3224 PATCH: [ 1370183 ] ShellExtension: better way to check for WinMerge executable
3225 ShellExtension: WinMergeShell.cpp
3226 Bump ShellExtension version to 1.7.0
3227 ShellExtension: ShellExtension.rc
3230 PATCH: [ 1372974 ] Make local function "GuessEncoding_from_bytes" static
3231 Src: codepage_detect.cpp
3232 PATCH: [ 1368762 ] Fix assignment in DirScan_GetItems
3233 Also add explanatory comment, for what variable does.
3237 CMarkdown::FileImage::GuessByteOrder(), GuessCodepageEncoding(): Fix UTF-8 signature detection
3238 CMarkdown::GetTagName(): Strip bogus trailing slash in name of empty tag
3239 Src: markdown.cpp codepage_detect.cpp
3242 PATCH: [ 1335128 ] Ignore uninstalled codepages
3243 Src: MergeDoc.cpp MergeDoc.h codepage.cpp codepage_detect.cpp
3244 Src/Common: unicoder.cpp
3247 PATCH: [ 1358408 ] Import and export for options
3248 Increase buffer size
3249 Src/Common: OptionsMgr.cpp
3252 PATCH: [ 1369660 ] Delete unused variables m_msgUpdateStatus
3254 Src: DirDoc.cpp DiffContext.cpp DiffContext.h DiffThread.cpp
3258 PATCH: [ 1369657 ] Delete unused variable DiffFuncStruct::msgStatusUpdate
3260 BUG: [ 1369856 ] Crashed when interface language is changed
3262 BUG: [ 1368755 ] Want comment on format line in 7ZCommon.cpp
3263 Cosmetic: adding explanatory comment to Merge7z::Proxy::operator->
3267 PATCH: [ 1369544 ] Catalan translation update
3268 Submitted by Jordi Vilar
3269 Docs/Users/Languages: ReadMe-Catalan.txt
3270 Src/Languages/Catalan: MergeCatalan.rc
3271 PATCH: [ 1265295 ] Swap file compare panes (use pointers for buffers)
3272 Forgot to update resource.h in language folders
3273 Src/Languages: resource.h
3276 Cosmetic: add comment to DiffThread giving value of msgID variable
3277 (to help debugging).
3281 BUG: [ 1368492 ] cvs ASSERT failing
3282 Fix reversion bug from Patch [ 1265295 ]
3285 PATCH: [ 1265295 ] Swap file compare panes (use pointers for buffers)
3286 Submitted by Takashi Sawanaka
3287 Src: ChildFrm.cpp DiffList.cpp DiffList.h DirDoc.cpp EditorFilepathBar.cpp
3288 EditorFilepathBar.h LocationView.cpp LocationView.h MainFrm.cpp Merge.rc
3289 MergeDiffDetailView.cpp MergeDiffDetailView.h MergeDoc.cpp MergeDoc.h
3290 MergeDocLineDiffs.cpp MergeEditView.cpp MergeEditView.h PathContext.cpp
3291 PathContext.h resource.h
3292 Src/Languages: *.rc resource.h
3295 PATCH: [ 1336598 ] Add extensions DisplayXMLFiles plugin
3296 Add several new extensions, bump version (1.0.2.0 -> 1.0.3.0)
3297 Plugins\src_VCPP\DisplayXMLFiles:
3298 DisplayXMLFiles.dsp DisplayXMLFiles.rc WinMergeScript.cpp
3303 PATCH: [ 1241935 ] Implement Line Diff coloring on byte diffs
3304 Src: MergeDoc.cpp MergeDoc.h MergeDocLineDiffs.cpp PropEditor.cpp
3306 2005-11-23 WinMerge experimental release 2.5.0.2 (cvs)
3309 PATCH: [ 1363114 ] Add '*.ctl;*.pag;*.dsr' to Visual Basic highlighter
3310 Src/editlib: ccrystaltextview.cpp
3313 PATCH: [ 1362882 ] Remove option for autoclosing compare statepane
3314 Src: Merge.rc OptionsDef.h OptionsInit.cpp PropGeneral.cpp PropGeneral.h resource.h
3315 Src/Languages: *.rc resource.h
3316 BUG: [ 1355884 ] 2.4.2 fails to open dvd files
3317 File/folder selection dialog couldn't open read-only folders
3321 PATCH: [ 1334277 ] Show asterisk in #diffs for QuickCompare results
3322 Src: DiffWrapper.cpp DiffWrapper.h DirViewColItems.cpp
3323 PATCH: [ 1334589 ] Encoding maps for Expat parser, for DisplayXmlFiles plugin
3324 Plugins/src_VCPP/DisplayXMLFiles
3325 BUG: [ 1277320 ] Plugins.txt not up-to-date
3326 Plugins/dll/IgnoreCommentsC
3329 Merge7z DllBuild 0017
3330 Merge7z: StdAfx.h Merge7zCommon.cpp Merge7zCommon.h revision.txt
3331 Merge7z new files: Merge7z430.dsp
3332 Merge7zInstaller: Files.rc2 Installer.cpp Merge7zInstaller.dsp
3335 PATCH: [ 1358408 ] Import and export for options
3336 Src: Merge.rc resource.h
3337 Src/Common: OptionsMgr.cpp OptionsMgr.h PreferencesDlg.cpp PreferencesDlg.h
3338 Src/Languages: *.rc resource.h
3341 PATCH: [ 1349645 ] Folder Compare Statistics dialog
3342 PATCH: [ 1347787 ] Use non-modal dialog for dir compare status
3343 Src: DirDoc.cpp DirDoc.h DirFrame.cpp DirFrame.h DirView.cpp DirView.h Merge.cpp Merge.dsp
3345 Src new files: CompareStatisticsDlg.cpp CompareStatisticsDlg.h DirCompProgressDlg.cpp
3346 DirCompProgressDlg.h
3347 Src deleted files: DirCompStateBar.cpp DirCompStateBar.h
3348 Src/res new file: sigma.bmp
3349 Src/Languages: *.rc resource.h
3352 PATCH: [ 1356783 ] Use OptionsMgr in SyntaxColors class
3353 Src: MainFrm.cpp SyntaxColors.cpp SyntaxColors.h
3356 PATCH: [ 1350638 ] Move options read/write code to options panels
3357 Src: MainFrm.cpp Merge.dsp PropArchive.cpp PropArchive.h PropCodepage.cpp PropCodepage.h
3358 PropColors.cpp PropColors.h PropCompare.cpp PropCompare.h PropEditor.cpp PropEditor.h
3359 PropGeneral.cpp PropGeneral.h PropRegistry.cpp PropRegistry.h PropVss.cpp PropVss.h
3360 Src new file: IOptionsPanel.h
3361 Src/Common: PreferencesDlg.cpp PreferencesDlg.h
3364 Merge Perry's fix for OpenDlg/SelectFile() to Merge.cpp/SelectFile() (PATCH #1348733)
3366 PATCH: [ 1350489 ] Use SelectFile() for external editor selection
3367 Src: PropRegistry.cpp
3370 PATCH: [ 1327413 ] Fix bug in CDirDoc::AllowUpwardDirectory()
3371 Change CDirView::AreItemsOpenable() to consider archive files as openable
3372 Src: DirActions.cpp DirDoc.cpp DirView.cpp
3375 PATCH: [ 1337905 ] Allow comparing binary files with binary unpacker
3377 PATCH: [ 1348733 ] Fix open dialog for cvs version 2.4
3381 PATCH: [ 1335072 ] Add text to Plugins.txt to cover DisplayXMLFiles
3382 Plugins/dlls: Plugins.txt
3384 2005-11-02 WinMerge experimental release 2.5.0.1 (cvs)
3387 BUG: [ 1341243 ] Current Find string is too fragile
3388 Was resetting find string after rescanning
3389 Src/editlib: ccrystaltextview.cpp
3390 PATCH: [ 1342550 ] Modernize file selection dialog
3391 PATCH: [ 1345110 ] Properly compare projectfile extension
3392 Src: Merge.cpp Merge.h OpenDlg.cpp
3393 Bump ShellExtension version to 1.6.2
3394 ShellExtension: ShellExtension.rc
3397 PATCH: [ 1345382 ] Translated Shell Extension to German
3398 ShellExtension/Languages: ShellExtensionGerman.rc
3401 RFE: [ 1324314 ] CTRL+W to close current diff
3404 PATCH: [ 1342871 ] Disable Copy Filenames for folders
3405 Src: DirView.cpp DirView.h
3406 PATCH: [ 1343059 ] Swedish translation update for 2.5.0.1 experimental
3407 Submitted by Hans Eriksson
3408 Src/Languages/Swedish: MergeSwedish.rc
3411 PATCH: [ 1341813 ] VSS project linking misdetects project files
3413 PATCH: [ 1310710 ] Fix bug #1309450
3415 Src: DiffContext.cpp DiffContext.h DiffFileInfo.cpp DiffFileInfo.h DirScan.cpp
3418 PATCH: [ 1341183 ] Fix VSS checkout canceling
3419 Src: DirActions.cpp MainFrm.cpp
3420 Open 2.4 manual (update link)
3424 PATCH: [ 1334444 ] Remove needless (& therefore confusing) cast
3425 Src: LocationView.cpp
3428 PATCH: [ 1334484 ] Skip location view paint if buffer not initialized
3429 Src: LocationView.cpp MergeDoc.cpp MergeDoc.h
3430 MergeEditView.cpp MergeEditView.h
3431 Cosmetic changes to GetFunctionsFromScript, to document
3432 arguments passed to GetTypeInfo.
3436 PATCH: [ 1333545 ] Small improvement to Open-dialog folder selection
3438 PATCH: [ 1333581 ] Increase quick compare limit and make it option
3439 Src: DiffContext.h DiffWrapper.cpp DirDoc.cpp OptionsDef.h OptionsInit.cpp
3442 PATCH: [ 1330179 ] Icon for 'Print'
3443 Src: MainFrm.cpp Merge.rc resource.h
3444 Src/res new file: print.bmp
3445 Src/Languages: *.rc resource.h
3446 Src/Languages/res new file: print.bmp
3449 PATCH: [ 1332365 ] Make some DirActions.cpp functions consts
3450 Src: DirActions.cpp DirView.h
3453 PATCH: [ 1329951 ] Readme.txt points to version 2.2 manual
3454 Docs/Users: ReadMe.txt
3455 Docs/Users/Languages: ReadMe-Catalan.txt ReadMe-Swedish.txt
3456 BUG: [ 1326621 ] Extention ".WinMerge" is omitted
3460 PATCH: [ 1330059 ] Translated 3 missing sentences to German
3461 Src/Languages/German: MergeGerman.rc
3464 PATCH: [ 1326813 ] Fix binary detection to allow archives
3468 PATCH: [ 1305541 ] Rational ClearCase support
3469 Submitted by Greg (rys1908)
3470 Src: CCPrompt.cpp CCprompt.h DirActions.cpp MainFrm.cpp MainFrm.h Merge.rc resource.h
3471 Src/Common: coretools.cpp
3472 Src/Languages: *.rc resource.h
3475 PATCH: [ 1323107 ] Patch for crash on save filenames with different cases
3476 From anonymous submitter
3478 PATCH: [ 1286629 ] print support
3479 Submitted by Markus Rollmann
3480 Src: MainFrm.cpp Merge.rc MergeEditView.cpp MergeEditView.h
3481 Src/Common: SplitterWndEx.cpp SplitterWndEx.h
3482 Src/editlib: ccrystaleditview.cpp
3484 Add Markus Rollmann to Contributors.txt
3485 Docs/Users/Contributors.txt
3488 PATCH: [ 1242008 ] Update status to binary if open fails because binary
3489 Follow on for 2nd case
3490 Src: DirView.cpp MergeDoc.cpp
3493 PATCH: [ 1302710 ] generating a report is slow
3494 Perry added comments explaining one code line
3495 Src: DirCmpReport.cpp
3498 PATCH: [ 1302710 ] generating a report is slow
3499 Submitted by Takashi Sawanaka
3500 Src: DirCmpReport.cpp
3501 PATCH: [ 1310214 ] Shell extension italian translation
3502 Submitted by Andrea Decorte
3503 ShellExtension/Languages: ShellExtensionItalian.rc
3506 PATCH: [ 1253949 ] cosmetic comment fix
3508 PATCH: [ 1253950 ] cosmetic--remove old code in InitInstance
3510 PATCH: [ 1253951 ] trivial cosmetic comment upgrade in arg parsing
3514 Merge7z DllBuild 0015
3515 Merge7z: Merge7zCommon.cpp Merge7zCommon.h revision.txt
3516 Merge7z new files: Merge7z427.dsp Merge7z428.dsp Merge7z429.dsp
3517 Merge7zInstaller update
3518 Merge7zInstaller: Files.rc2 Installer.cpp Installer.rc
3521 PATCH: [ 1309423 ] Small typo in MergeSwedish.rc
3522 Submitted by Hans Eriksson
3523 Src/Languages/Swedish: MergeSwedish.rc
3526 PATCH: [ 1229867 ] RFE [ 1205516 ], RFE [ 887948 ], and other issues
3527 Cosmetic, transcribing comment from patch discussion
3531 PATCH: [ 1302608 ] crash on generating a report
3532 Submitted by Takashi Sawanaka
3533 Src: DirCmpReport.cpp
3536 BUG: [ 1298687 ] The files marked as 'skipped' are compared
3537 Fix from Takashi Sawanaka, comment updates by me
3541 PATCH: [ 1301504 ] Danish ShellExtension translation
3542 Submitted by Christial List
3543 ShellExtension/Languages: ShellExtensionDanish.rc
3546 PATCH: [ 1297642 ] Japanese translation update
3547 Submitted by Takashi Sawanaka
3548 ShellExtension/Languages: ShellExtensionJapanese.rc
3549 Src/Languages/Japanese: MergeJapanese.rc
3552 PATCH: [ 1297406 ] updated hungarian translation
3553 Submitted by Márton Balázs
3554 Src/Languages/Hungarian: MergeHungarian.rc
3557 PATCH: [ 1295701 ] Scrolling for dir compare report filename
3560 PATCH: [ 1295758 ] Update URL for downloads page (archive options)
3561 Src: PropArchive.cpp
3564 PATCH: [ 1295767 ] German Translation for 'Highlight Line * Diff'
3565 Src/Languages/German: MergeGerman.rc
3568 PATCH: [ 1294514 ] Set file loading traces debug-only
3570 PATCH: [ 1295473 ] updated italian rc file for winmerge 2.3.6
3571 Submitted by Andrea Decorte
3572 Src/Languages/Italian: MergeItalian.rc
3575 PATCH: [ 1292120 ] More significant diff navigations fixes
3576 Src: DiffList.cpp DiffList.h MergeDoc.cpp MergeEditView.cpp
3577 BUG: [ 1290305 ] ShellExtensionU.dll info missing from config log
3581 PATCH: [ 1292279 ] Various Updates in German Translation
3582 Src/Languages/German: MergeGerman.rc
3585 PATCH: [ 1290477 ] Catalan translation update
3586 Submitted by Jordi Vilar
3587 Src/Languages/Catalan: MergeCatalan.rc
3590 PATCH: [ 1289037 ] Some (non)significant diff count fixes
3591 Src: DiffList.cpp DiffList.h MergeDoc.cpp MergeEditView.cpp
3594 PATCH: [ 1284150 ] Fix Shell Extension registering problem
3595 Also bump version to 1.6
3596 ShellExtension: ShellExtension.cpp ShellExtension.rc
3599 BUG: [ 1284304 ] StaticLink crashes after mouse over event
3600 Changed signature of CStaticLink::OnSetCursor to start with CWnd *
3601 Src\Common: StaticLink.cpp StaticLink.h
3604 PATCH: [ 1285404 ] Various Updates in German Translation
3605 Src/Languages/German: MergeGerman.rc
3608 PATCH: [ 1284890 ] Use Changes.txt instead of readme.txt for ChangeLog
3609 Added ChangeLogs folder to project, and put Changes.txt (this),
3610 readme.txt, and CHANGELO into new ChangeLogs folder.
3611 PATCH: [ 1283466 ] French translation
3612 New translation by Jean-F Jolin
3613 Src/Languages/French: MergeFrench.rc
3616 Previous change history is in file readme.txt