3 (This summarizes all changes to all files under Src, including Src\Languages.)
6 PATCH: [ 1675087 ] New copy confirmation dialog
7 Src: DirActions.cpp FileActionScript.h Merge.dsp Merge.rc resource.h
8 Src new files: ConfirmFolderCopyDlg.cpp ConfirmFolderCopyDlg.h
9 Src/Languages/*: Merge*.rc
12 PATCH: [ 1675211 ] Fix crash when hiding parent folder item on folder view
16 PATCH: [ 1673908 ] Update of Swedish translation for "View margins"
17 Submitted by Hans Eriksson
18 Src/Languages/Swedish: MergeSwedish.rc
21 PATCH: [ 1673082 ] Polish translation for WM CVS
22 Submitted by dr_prozac
23 Src/Languages/Polish: MergePolish.rc
26 BUG: [ 1668996 ] Two "Copy Right" buttons in Russian GUI.
27 Src/Languages/Russian: MergeRussian.rc
30 PATCH: [ 1664689 ] French translation (update)
31 Submitted by Jean-F Jolin
32 Src/Languages/French: MergeFrench.rc
34 2007-02-27 WinMerge beta release 2.7.2 (revision 4137)
37 Bump ShellExtension version to 1.11
38 ShellExtension: ShellExtension.rc
41 PATCH: [ 1664689 ] French translation
42 Submitted by Jean-F Jolin
43 Src/Languages/French: MergeFrench.rc
46 Czech translation - update
47 Src/Languages/Czech/MergeCzech.rc
50 PATCH: [ 1667564 ] Various Updates in German Translation
51 Src/Languages/German: MergeGerman.rc
54 Cleanup WMGotoDlg constructor
56 CleanUp VSS dialog class
60 BUG: [ 1664731 ] Margin and line numbers not separated
61 Src/editlib: ccrystaltextview.cpp
62 BUG: [ 1664727 ] Empty file compare looks broken
63 Fix revision marks for scratchpads
64 Src/editlib: ccrystaltextview.cpp
65 BUG: [ 1664832 ] Typo Error in the Registry
66 ShellExtension: WinMergeShell.rgs
67 BUG: [ 1666559 ] Error on save option (WinMerge 2.7.1.7)
71 BUG: [ 1664727 ] Empty file compare looks broken
72 Src/editlib: ccrystaltextview.cpp
74 2007-02-20 WinMerge experimental release 2.7.1.7 (SVN revision 4120)
77 PATCH: [ 1663798 ] Add option and menuitem for file compare selection margin
78 Src: Merge.rc MergeEditView.cpp MergeEditView.h OptionsDef.h OptionsInit.cpp
80 Src/editlib: ccrystaltextview.cpp
81 Src/Languages/*: Merge*.rc
82 Remove commented out lines
86 PATCH: [ 1663012 ] Fix total count for compare progress dialog
87 Src: DirCompProgressDlg.cpp DirCompProgressDlg.h
88 Bug: [ 1663197 ] s/inproper/improper [in Changes.txt]
90 PATCH: [ 1642876 ] Open manual for command line help
91 Src: Merge.cpp Merge.h Merge.rc resource.h
92 Src/Languages/*: Merge*.rc
95 Czech translation - update
96 Src/Languages/Czech/MergeCzech.rc
99 PATCH: [ 1662002 ] Use two threads for folder compare
100 Src: Diffcontext.cpp Diffcontext.h DiffThread.cpp DiffThread.h DirScan.cpp
104 PATCH: [ 1640274 ] Icons for folder compare popup menu
105 Src: MainFrm.cpp Merge.dsp Merge.rc resource.h
106 Src/res new files: both.bmp left.bmp left_to_browse.bmp left_to_right.bmp
107 move_left_to_browse.bmp move_right_to_browse.bmp right.bmp
108 right_to_browse.bmp right_to_left.bmp
109 Src/Languages/*: Merge*.rc
112 PATCH: [ 1659183 ] Add Vista security attributes to manifest files
113 Src/res: WinMerge.exe.manifest WinMergeU.exe.manifest
116 PATCH: [ 1657664 ] Swedish translation update for Backup options
117 Submitted by Hans Eriksson
118 Src/Languages/Swedish: MergeSwedish.rc
121 Fix compile with VC6 (doesn't have CString::Append() or CString::AppendChar())
122 Src: MainFrm.cpp PropBackups.cpp
125 PATCH: [ 1650831 ] Polish translation update for WinMerge 2.6.4
126 Submitted by dr_prozac
127 Src/Languages/Polish: MergePolish.rc
130 Add accelerator keys to new Backup options dialog
132 Src/Languages/*: Merge*.rc
135 PATCH: [ 1582537 ] CSS syntax highlighter
137 editlib: ccrystaltextview.cpp ccrystaltextview.h
138 editlib new file: css.cpp
141 PATCH: [ 1652696 ] Add more options for backup files
142 Src: FileActionScript.cpp MainFrm.cpp MainFrm.h Merge.dsp Merge.rc MergeDoc.cpp
143 OptionsDef.h OptionsInit.cpp PropGeneral.cpp PropGeneral.h resource.h
144 Src new files: PropBackups.cpp PropBackups.h
145 Src/Common: PreferencesDlg.cpp PreferencesDlg.h
146 Src/Languages/*: Merge*.rc
149 Remove unused enum definition
157 Remove unused parameter from CMainFrame::SyncFileToVCS()
158 Src: FileActionScript.cpp MainFrm.cpp MainFrm.h
160 2007-02-01 WinMerge experimental release 2.7.1.6 (SVN revision 4094)
163 PATCH: [ 1636314 ] Fix limiting to single file compare window (2)
166 PATCH: [ 1639493 ] Updated Bulgarian language files
167 Submitted by tigertron
168 Src/Languages/Bulgarian: MergeBulgarian.rc
169 Docs/Users/Languages: Readme-Bulgarian.txt
170 PATCH: [ 1650043 ] Convert CDiffWrapper to use CompareOptions
171 Src: CompareOptions.cpp CompareOptions.h DiffWrapper.cpp DiffWrapper.h
172 Remove commented out include line
176 PATCH: [ 1648182 ] Separate Compare options from DiffWrapper
177 Src: CompareOptions.h DiffWrapper.h DirDoc.cpp DirDoc.h Merge.dsp
178 Src new file: CompareOptions.cpp
179 PATCH: [ 1646638 ] Catalan translation update
180 Submitted by Jordi Vilar
181 Src/Languages/Catalan: MergeCatalan.rc
184 Merge7z DllBuild 0019 - Unassociate .exe filename extension from NSIS format
185 ArchiveSupport/Merge7z: Merge7zCommon.cpp Merge7zCommon.h revision.txt
186 Support 7-Zip versions 4.43 & 4.44
187 ArchiveSupport/Merge7z new files: Merge7z443.dsp Merge7z444.dsp
188 ArchiveSupport/Merge7zInstaller: Files.rc2
191 PATCH: [ 1640741 ] patch for BUG:[ 1635100 ] Inefficient word-wrap code
192 Src: MergeEditView.cpp MergeEditView.h
193 Src/edtlib: ccrystaltextview.cpp ccrystaltextview.h
196 PATCH: [ 1644668 ] Fix ANSI regexps(2)
197 Src: DiffWrapper.cpp FileFilterHelper.cpp FilterList.cpp
200 PATCH: [ 1644668 ] Fix ANSI regexps
201 Src: DiffWrapper.cpp FileFilterHelper.cpp FilterList.cpp FilterList.h
202 PATCH: [ 1644820 ] Implement post-compare linefilters for folder compare
203 Src: DiffContext.cpp DiffContext.h DiffThread.cpp DiffThread.h DirDoc.cpp
204 DirDoc.h FolderCmp.cpp FolderCmp.h
207 PATCH: [ 1644785 ] 24bit icons for "Window" menu
208 Based on icons by Alexander Skinner
209 Src/res: cascade.bmp change_pane.bmp close.bmp horizontally.bmp vertically.bmp
210 PATCH: [ 1644800 ] 24bit "Goto" icon
211 Based on icons by Alexander Skinner
215 PATCH: [ 1642809 ] Move compare code out from DiffFileData
216 Src: DiffFileData.cpp DiffFileData.h DiffWrapper.cpp DirScan.cpp
217 DirViewColItems.cpp Merge.dsp
218 Src new files: FolderCmp.cpp FolderCmp.h
221 BUG: [ 1637433 ] Forget selected filter after close
222 Src: Merge.cpp OptionsInit.cpp
225 PATCH: [ 1636314 ] Fix limiting to single file compare window
227 Move options function call out of if() (for easier debugging)
231 PATCH: [ 1620076 ] Add Bazaar and Mercurial to SourceControl.flt
232 Submitted by René Leonhardt
233 Filters: SourceControl.flt
234 Add René Leonhardt to Contributors.txt
235 Docs/Users: Contributors.txt
236 PATCH: [ 1634968 ] Swedish translation update for 2.7.1.5+
237 Submitted by Hans Eriksson
238 Src/Languages/Swedish: MergeSwedish.rc
241 Update manual URL point to 2.6 version manual in readme.txt
242 Docs/Users/ReadMe.txt
243 Docs/Users/Languages/ReadMe-*.txt
244 PATCH: [ 1633581 ] Restrict expanding env variables in open dialog
245 Src: OpenDlg.cpp OpenDlg.h paths.cpp paths.h
248 PATCH: [ 1633194 ] Add editor tab setting to configuration log
249 Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
251 2007-01-10 WinMerge experimental release 2.7.1.5 (SVN revision 4030)
254 PATCH: [ 1631796 ] Use PCRE for filemask filtering
255 Src: DiffWrapper.cpp DirDoc.h FileFilterHelper.cpp FileFilterHelper.h Merge.cpp
256 Merge.dsp Ucs2Utf8.cpp Ucs2Utf8.h
257 Src/Common removed files: Regexp.cpp RegExp.h
258 PATCH: [ 1631806 ] Fix Filterspath initialization
259 Src: MainFrm.cpp MainFrm.h Merge.cpp Merge.h OptionsInit.cpp
262 BUG: [ 1631613 ] WinMerge crashes when editing code files
263 Src/editlib: ccrystaleditview.cpp
266 BUG: [ 1630630 ] Unexpected selection of text after changing pane
267 Src: MergeEditView.cpp
270 PATCH: [ 1597814 ] 'Wrap Lines' + 'Next Diff' Bug (3)
271 Src: MergeEditView.cpp MergeEditView.h
274 PATCH: [ 1631215 ] Remove used files
276 Src/Common deleted: listvwex.cpp listvwex.h
279 PATCH: [ 1593810 ] Line-filtering post compare
280 Src: DiffWrapper.cpp DiffWrapper.h MainFrm.cpp MainFrm.h Merge.dsp MergeDoc.cpp
281 Src new files: FilterList.cpp FilterList.h
284 BUG: [ 1597939 ] Rename Edits Wrong Field in Folder Compare List
288 BUG: [ 1567749 ] "Unable to compare files" needs short result
289 Src: DirViewColItems.cpp Merge.rc resource.h
290 Src/Languages/*: Merge*.rc
293 TODO: [ 1489875 ] Mimimum height for location pane visible area indicator
294 Src: LocationView.cpp
295 TODO: [ 1485038 ] Rename DIFFITEM::IsSideLeft() and IsSideRight()
296 Src: CompareStats.cpp DiffContext.cpp DiffFileData.cpp DiffItem.cpp DiffItem.h
297 DirActions.cpp DirDoc.cpp DirScan.cpp DirView.cpp DirViewColHandler.cpp
299 PATCH: [ 1567773 ] Change "Only in xxxxxxxxxx" to "Right Only: xxxxxxxxxx"
300 Src: DirViewColItems.cpp Merge.rc resource.h
301 Src/Languages/*: Merge*.rc
302 ConvertFilter() function in FileOrFolderSelect can be a static function
303 Src: FileOrFolderSelect.cpp FileOrFolderSelect.h
306 PATCH: [ 1628203 ] Reduce options caching in MergeEditView
307 Src: MergeEditView.cpp MergeEditView.h
308 PATCH: [ 1628299 ] Use OptionsMgr for archive options
310 PATCH: [ 1628263 ] Add debug-menuitem for resetting options
311 Src: MainFrm.cpp MainFrm.h Merge.rc resource.h
312 Src/Languages/*: Merge*.rc
315 PATCH: [ 1625344 ] Move OptionsMgr from MainFrame to MergeApp
316 Src: FileActionScript.cpp MainFrm.cpp MainFrm.h Merge.cpp Merge.h
317 OptionsInit.cpp PropRegistry.cpp PropTextColors.cpp SourceControl.cpp
318 Src/Common: OptionsMgr.h
319 Use Empty() method for CString instead of assigning empty string into it
320 Src/Common: varprop.h
323 PATCH: [ 1625022 ] Constify OptionsManager parameters
324 Src/Common: OptionsMgr.cpp OptionsMgr.h
327 PATCH: [ 1623772 ] Constify PathContext parameter strings
328 Src: PathContext.cpp PathContext.h
330 2006-12-21 WinMerge experimental release 2.7.1.4 (SVN revision 3991)
333 BUG: [ 1603061 ] "Copy Left/Right To .." doesn't work correctly(2)
334 Src: FileActionScript.cpp DirActions.cpp
337 BUG: [ 1606583 ] VC6 build is broken
338 Backout of patch [ 1603769 ] Send MergeCmdLineInfo between instances
339 Src: MainFrm.cpp Merge.cpp MergeCmdLineInfo.cpp MergeCmdLineInfo.h
340 Bump ShellExtension version to 1.10
341 ShellExtension: ShellExtension.rc
342 BUG: [ 1619689 ] Filefilter: ASP.NET Devel
346 PATCH: [ 1618358 ] Fix warning about non-standard extension with enum
348 PATCH: [ 1618364 ] Make GPL URL const string
352 PATCH: [ 1617502 ] Cleanup use of enum in MovedLines
356 BUG: [ 1614558 ] Goto line doesn't work when word wrap is enabled
357 Src: MergeEditView.cpp
360 BUG: [ 1602219 ] Crappy save of project files
361 Src: MainFrm.cpp ProjectFilePathsDlg.cpp
364 PATCH: [ 1614442 ] Swedish translation update for WinMerge 2.6.2
365 Submitted by Hans Eriksson
366 Src/Languages/Swedish: MergeSwedish.rc
369 BUG: [ 1584068 ] location pane is inaccurate when word wrap is on (2)
370 Src: LocationView.cpp LocationView.h MergeEditView.cpp
373 Fix error in logical condition for checking if item is directory
375 PATCH: [ 1610998 ] Splash screen does not stop timer
377 PATCH: [ 1611060 ] Move constants from Merge.cpp to FileOrFolderSelect.cpp
378 Src: FileOrFolderSelect.cpp Merge.cpp
381 BUG: [ 1611542 ] "Wrap lines" does not work for diff pane
382 Src: MergeDiffDetailView.cpp MergeDiffDetailView.h
385 PATCH: [ 1447744 ] Match lines inside diff blocks (based on Perry's patch)
386 Src new files: MergeDocDiffSync.cpp
387 Src: DiffList.h Merge.dsp Merge.rc MergeDoc.cpp MergeDoc.h OptionsDef.h OptionsInit.cpp
388 PropCompare.cpp PropCompare.h resource.h
389 Src/Languages/*: Merge*.rc
392 BUG: [ 1584068 ] location pane is inaccurate when word wrap is on
393 Src: LocationView.cpp LocationView.h MergeEditView.cpp MergeEditView.h
396 BUG: [ 1604115 ] No copyright info in aboutbox for translations
400 BUG: [ 1610877 ] wrong shortcut (localizazion IT, italian)
401 Src/Languages/Italian: MergeItalian.rc
404 PATCH: [ 1610442 ] Make time getting faster for files
405 Src: DirScan.cpp FileInfo.cpp
406 PATCH: [ 1610477 ] Fix UniFile for weird filetimes
407 Src/Common: UniFile.cpp UniFile.h
410 Add missing include to fix ANSI build target
411 Src: FileOrFolderSelect.cpp
413 2006-12-05 WinMerge experimental release 2.7.1.3 (SVN revision 3919)
416 PATCH: [ 1608846 ] Create a class for moved blocks
417 Src: DiffWrapper.cpp DiffWrapper.h Merge.dsp MergeDoc.cpp MergeDoc.h
418 Src new files: MovedLines.cpp MovedLines.h
419 PATCH: [ 1557295 ] Exclude Source Control files and directories filter
420 Submitted by Paul Welter
421 Filters new file: SourceControl.flt
422 Add Peter Welter and Ivan Masár to contributors
423 Docs/Users: Contributors.txt
426 PATCH: [ 1607193 ] INI Syntax Improvements
428 PATCH: [ 1608541 ] Use INI highlighter for VB6 project files
429 Src/editlib: ccrystaltextview.cpp
432 PATCH: [ 1607823 ] Remove manifest loading from lang dlls
433 Src/Languages/*: Merge*.rc
436 PATCH: [ 1597814 ] 'Wrap Lines' + 'Next Diff' Bug (2)
437 Src: MergeEditView.cpp
440 PATCH: [ 1556688 ] Fix maketstring to check for zero-term by MultiByteToWideCha
441 Src: Common/unicoder.cpp
442 PATCH: [ 1606496 ] Slovak translation (update)
443 Submitted by Ivan Masár
444 Src/Languages/Slovak: MergeSlovak.rc
447 Remove commented out code
451 BUG: [ 1589324 ] WinMegee crashes on copy
452 Src: FileFilterMgr.cpp
455 Fix filefilter regexp uppercasing for trunk
456 Src: FileFilterMgr.cpp
459 BUG: [ 1603077 ] Doesn't filter the file vc60.idb using "Merge_VC_loose.flt"
460 Filters: Merge_VC_loose.flt
463 BUG: [ 1603061 ] "Copy Left/Right To .." doesn't work correctly
467 PATCH: [ 1606496 ] Slovak translation
468 Submitted by Ivan Masár
469 ShellExtension/Languages: ShellExtensionSlovak.rc
470 Src/Languages/Slovak: MergeSlovak.rc
473 PATCH: [ 1597814 ] 'Wrap Lines' + 'Next Diff' Bug
474 Src: MergeEditView.cpp
477 PATCH: [ 1605682 ] Add Syntax Highlight option to config log
478 Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
479 PATCH: [ 1556685 ] Avoid infinite loop in character loop in crystal c++ parser
481 Src/editlib: asp.cpp basic.cpp batch.cpp cplusplus.cpp csharp.cpp dcl.cpp fortran.cpp
482 html.cpp innosetup.cpp is.cpp java.cpp lisp.cpp nsis.cpp. pascal.cpp perl.cpp php.cpp
483 python.cpp rexx.cpp rsrc.cpp ruby.cpp sgml.cpp sh.cpp siod.cpp sql.cpp tcl.cpp tex.cpp
487 BUG: [ 1603230 ] DirView icons isn't shown correctly on NT4.0
488 Src/res: equalfile.ico fileskip.ico lfile.ico notequalfile.ico rfile.ico
491 PATCH: [ 1604078 ] Hide skipped items by default
495 PATCH: [ 1603769 ] Send MergeCmdLineInfo between instances
496 Src: MainFrm.cpp Merge.cpp MergeCmdLineInfo.cpp MergeCmdLineInfo.h
499 BUG: [ 1602214 ] Incorrect work with associated files in WinMerge 2.7.1.2
501 PATCH: [ 1603196 ] Allow Open-dialog kind of folder selection for project files
502 Src: FileOrFolderSelect.cpp FileOrFolderSelect.h OpenDlg.cpp OpenDlg.h
505 BUG: [ 1603562 ] Location pane's bar outlines
506 Src: LocationView.cpp
509 Perry is not active developer
510 Docs/Users: Contributors.txt
513 PATCH: [ 1602365 ] Move SelectFile and SelectFolder routines to separate file
514 Src: DirActions.cpp DirCmpReportDlg.cpp FileFiltersDlg.cpp MainFrm.cpp Merge.cpp
515 Merge.dsp Merge.h MergeDoc.cpp OpenDlg.cpp PatchDlg.cpp ProjectFilePathsDlg.cpp
516 PropRegistry.cpp PropVss.cpp
517 Src/Common: PreferencesDlg.cpp
518 Src new files: FileOrFolderSelect.cpp FileOrFolderSelect.h
521 Fix bunch of doxygen warnings (wrong parameter names etc)
522 Src: CmdLineParser.h DiffWrapper.cpp DirDoc.cpp FilepathEdit.cpp files.cpp
523 paths.cpp PropEditor.cpp WMGotoDlg.h
525 2006-11-23 WinMerge experimental release 2.7.1.2 (SVN revision 3844)
528 PATCH: [ 1512881 ] Fix memleak from charsets.c
529 Src: charsets.cp charsets.h Merge.cpp
530 PATCH: [ 1596285 ] Unresolved external symbol __abs64 with VC7.1
531 Submitted by Gal, minor edit by Kimmo
532 Src: StdAfx.cpp StdAfx.h
533 BUG: [ 1584068 ] location pane is inaccurate when word wrap is on
535 Src: LocationView.cpp
538 PATCH: [ 1600714 ] Allow canceling when started from commandline
539 Src: Merge.cpp Merge.h
542 PATCH: [ 1600000 ] Fix project file Has*() functions
543 Src: ProjectFile.cpp ProjectFile.h
546 BUG: [ 1599631 ] WinMerge 2.7.1.1 ignores left dir in project file
550 PATCH: [ 1590831 ] Handle minimize argument (Bug 1570351)
551 Src: MergeDiffDetailView.cpp
552 Src/Common: SplitterWndEx.cpp
555 PATCH: [ 1598194 ] New command line parser
556 Src: MainFrm.cpp Merge.cpp Merge.dsp Merge.h
557 Src added files: ClearCaseCmdLineParser.cpp ClearCaseCmdLineParser.h
558 CmdLineParser.h MergeCmdLineInfo.cpp MergeCmdLineInfo.h
559 WinMergeCmdLineParser.cpp WinMergeCmdLineParser.h
560 Src removed files: CmdArgs.cpp CmdArgs.h MergeArgs.cpp
563 PATCH: Moved white-space trimming to FileFilterHelper class
564 Src: FileFilterHelper.cpp
566 2006-11-16 WinMerge experimental release 2.7.1.1 (SVN revision 3810)
569 PATCH: [ 1596692 ] Change the way modified docs are saved to fix several issues
570 Src: MainFrm.cpp MergeDiffDetailView.cpp MergeDoc.cpp MergeDoc.h
573 BUG: [ 1596285 ] Unresolved external symbol __abs64 with VC7.1
574 Src: StdAfx.cpp StdAfx.h
577 BUG: [ 1594188 ] /x option does not work
581 PATCH: [ 1586689 ] True color bookmark icon
582 Src/editlib: ccrystaltextview.cpp
583 Src/res: mg_icons.bmp
586 PATCH: [ 1590737 ] BCMenu update to v3.036
587 Src: BCMenu.cpp BCMenu.h
590 PATCH: [ 1591532 ] Remove unused XmlDoc class
592 Src removed files: XmlDoc.cpp XmlDoc.h
595 Add PCRE 6.7 (with windows build files from ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Contrib/)
596 New folder: /Externals/pcre
597 PATCH: [ 1591605 ] Add PCRE regexps and convert file filtering to PCRE
598 Src: FileFilterMgr.cpp FileFilterMgr.h Merge.dsp Plugins.cpp
599 Src new files: Ucs2Utf8.cpp Ucs2Utf8.h
602 PATCH: [ 1586705 ] DirView icons (Tim made [not]equalfile.ico)
603 Src/res: equalfile.ico fileskip.ico lfile.ico notequalfile.ico rfile.ico
606 PATCH: [ 1590892 ] Handle unicode paths for project files
610 PATCH: [ 1589427 ] Add back read-only handling for project files
612 PATCH: [ 1589438 ] Add read-only info to ProjectFile dialog
614 PATCH: [ 1589563 ] Fix crash with weird filetimes (and cleanup the code)
615 Src: DiffFileInfo.cpp DiffFileInfo.h DirScan.cpp DirViewColHandler.cpp
616 DirViewColItems.cpp FileInfo.cpp FileInfo.h
619 PATCH: [ 1589601 ] Add "ReDim" keyword to Visual Basic highlighter
620 Src\editlib: basic.cpp
623 Add Expat version 2.0.0 to /Externals/expat (revision: 3749)
624 New folder: /Externals/Expat
625 Add SCEW version 0.4.0 to /Externals/scew (revision: 3750)
626 New folder: /Externals/scew
627 PATCH: [ 1587574 ] Convert project files code to use expat+SCEW
628 Src: Merge.dsp ProjectFile.cpp ProjectFile.h
629 Remove folder: Src/ExpatLib/*
630 PATCH: [ 1588212 ] Add manifest file to resource file
632 Src/Languages/*: Merge*.rc
633 Move files from Installer/InnoSetup: WinMerge.exe.manifest WinMergeU.exe.manifest
637 PATCH: [ 1586869 ] Fix File Select -dialog modality (commit the file I missed in previous commit)
638 Src/Common: PreferencesDlg.cpp
641 PATCH: [ 1586869 ] Fix File Select -dialog modality
642 Src: DirCmpReportDlg.cpp FileFiltersDlg.cpp MainFrm.cpp Merge.cpp Merge.h
643 MergeDoc.cpp PatchDlg.cpp ProjectFilePathsDlg.cpp PropRegistry.cpp PropVss.cpp
644 PATCH: [ 1586892 ] Remove unused unknown.ico and code loading it
645 Src: DirView.cpp Merge.rc resource.h
646 Src/Languages/*: Merge*.rc
647 Remove file: Src/Res: unknown.ico
650 BUG: [ 1418805 ] Menu colors incorrect with non-standard color scheme
654 PATCH: [ 1584004 ] Delete "Toolbar.bmp"
655 Src/res deleted file: Toolbar.bmp
658 Fix compile warnings (some of them 64-bit), remove unused variables and code, fix types
660 Remove unused function, fix improper pointer usage
661 Src: FileFilterHelper.cpp
662 Fix casting a pointer type to DWORD (not 64-bit compatible)
663 Src: DirView.cpp DirView.h
666 PATCH: [ 1578419 ] Fix creating WinMerge folder to MyFolders always
667 Src: MainFrm.cpp MainFrm.h
668 Trivial type fixes, coding style fixes and converting comments to doxygen
669 Src: StdAfx.cpp StdAfx.h
670 Fix misuse of reference parameters (compiler warning)
674 PATCH: [ 1574696 ] Fix problem in saving filefilter to project file
675 Src: ProjectFilePathsDlg.cpp
678 BUG: [ 1573240 ] Crash in subversion trunk
679 Src: MainFrm.cpp MainFrm.h OptionsInit.cpp
682 BUG: [ 1570259 ] Bookmarks GUI get reset after save
683 Src/editlib: ccrystaltextview.cpp
686 BUG: [ 1570173 ] Crash when merging all differences
690 PATCH: [ 1555344 ] Separate active/inactive developers in Contributors.txt
691 Docs/Users: Contributors.txt
694 PATCH: [ 1572359 ] Various Updates in German Translation for WinMerge 2.6
695 Src/Languages/German: MergeGerman.rc
698 PATCH: [ 1570241 ] Various Updates in German Translation for WinMerge 2.6
699 Src/Languages/German: MergeGerman.rc
702 BUG: [ 1566783 ] Crash on Save Project when no file is selected
706 PATCH: [ 1567874 ] Change manual URL to point to 2.6 manual
710 BUG: [ 1564572 ] Leak memory on undoing
711 Src: GhostTextBuffer.h
712 Src/editlib: ccrystaltextbuffer.h
715 PATCH: [ 1565917 ] Register.bat to register ShellExt for 64-bit Windows
716 ShellExtension: Register.bat
717 BUG: [ 1563187 ] Can't close a file compare with -e switch
721 PATCH: [ 1565359 ] Various Updates in German Translation for WinMerge 2.6
722 Src/Languages/German: MergeGerman.rc
725 PATCH: [ 1564857 ] FindAnyFile function doesn't compile with VC6
726 Src/Common: coretools.cpp
729 PATCH: [ 1563171 ] Catalan translation update (Open-dialog)
730 Submitted by Jordi Vilar
731 Src/Languages/Catalan: MergeCatalan.rc
734 BUG: [ 1564283 ] Parameter -x causes files to be closed after merging
738 PATCH: [ 1564280 ] Stack corruption in LanguageSelect
739 Src/Common: LanguageSelect.cpp
742 Couple of type fixes to CMoveConstraint
743 Src/Common: CMoveConstraint.cpp CMoveConstraint.h
744 Fix check for pointer/value by using bit-shift instead of a cast + add trivial typecasts
745 Src: GhostTextBuffer.cpp
746 Src/editlib: ccrystaltextbuffer.cpp
749 PATCH: [ 1563157 ] Fix coretools.cpp for 64-bit
750 Src/Common: coretools.cpp coretools.h
751 Fix type in ccrystaltextbuffer.h
752 Src/editlib: ccrystaltextbuffer.h
753 PATCH: [ 1563171 ] Catalan translation update
754 Submitted by Jordi Vilar
755 Src/Languages/Catalan: MergeCatalan.rc
756 PATCH: [ 1563386 ] Spanish translation update
757 Submitted by Jesus M. Delgado 'Mack'
758 Src/Languages/Spanish: MergeSpanish.rc
759 Quiet warnings from DiffList.cpp
761 Some SPECIAL_ITEM_POS cleanups
762 Src: DirActions.cpp DirDoc.cpp DirView.cpp DirView.h
763 Fix check for pointer/value by using bit-shift instead of a cast
764 Src: GhostTextBuffer.h
765 Src/editlib: ccrystaltextbuffer.h
767 2006-09-21 WinMerge experimental release 2.5.7.1 (SVN revision 3600)
770 PATCH: [ 1558213 ] Tweak text positions in splash screen
772 Bump ShellExtension version to 1.9.0 (first 64-bit Windows version)
773 ShellExtension: ShellExtension.rc
774 Fix 64-bit typecast warning
775 Src: GhostTextBuffer.h
776 Fix 64-bit pointer truncation in SetWindowLongPtr call (the last I hope)
778 Minor tweaks to 64-bit ShellExtension project file
779 ShellExtension: ShellExtensionX64.vcproj
782 PATCH: [ 1561788 ] Fix 64-bit CFile constructor usage
783 Src/Common: UniFile.cpp
784 PATCH: [ 1561796 ] Get/SetWindowLong not supported in 64-bit Windows
785 Src: 7zCommon.cpp ChildFrm.cpp
786 Src/Common: CSubclass.cpp sizecbar.cpp
787 BUG: [ 1561781 ] 64-bit compile errors from 7zCommon.cpp
789 PATCH: [ 1561650 ] Separate FilterCommentsManager code from DiffWrapper
790 Src: DiffWrapper.cpp DiffWrapper.h Merge.dsp
791 Src new files: FilterCommentsManager.cpp FilterCommentsManager.h
792 Fix 64-bit compile warning by casting last SendMessage() param to LPARAM
794 Fix hex number used instead of INVALID_HANDLE_VALUE
795 Src/Common: sinstance.cpp
796 Fix 64-bit pointer truncation in SetWindowLongPtr call
800 PATCH: [ 1561001 ] Fix FileActionScript type in running actions
801 Src: FileActionScript.cpp
802 PATCH: [ 1561008 ] Warning fix for FileActionScript
804 PATCH: [ 1561080 ] Cleanup for loglevel definition
805 Src: DirDoc.cpp DirScan.cpp MainFrm.cpp Plugins.cpp StdAfx.cpp
806 Src/Common: LogFile.cpp LogFile.h
809 Cleanup 64-bit ShellExtension projectfile, add a debug target
810 ShellExtension: ShellExtensionX64.vcproj
813 PATCH: [ 1559619 ] 64-bit shellextension project file
814 ShellExtension new files: ShellExtensionX64.def ShellExtensionX64.vcproj
815 Remove unused variable
816 Src/editlib: memcombo.cpp
817 Remove unused variable
819 Fix typecasting warnings
820 Src: locality.cpp locality.h MergeDoc.cpp
821 Remove unused variable
822 Src: FileActionScript.cpp
823 Remove unused variable
824 Src: FileFiltersDlg.cpp
827 BUG: [ 1558839 ] ShellExtension does not compile as 64-bit
828 ShellExtension: WinMergeShell.cpp WinMergeShell.h
829 PATCH: [ 1558893 ] Fix incompatible prototype in MessageBoxDialog
830 Src/Common: MessageBoxDialog.cpp MessageBoxDialog.h
831 PATCH: [ 1558913 ] Fix OnTimer prototypes (64-bit compatibility)
832 Src: ChildFrm.cpp ChildFrm.h DircompProgressDlg.cpp DirCompProgressDlg.h DirView.cpp
833 Dirview.h MainFrm.cpp MainFrm.h MergeEditview.cpp MergeEditView.h OpenDlg.cpp
834 Opendlg.h Splash.cpp Splash.h
835 Src/Common: MessageBoxDialog.cpp MessageBoxDialog.h
836 Src/editlib: ccrystaltextview2.cpp ccrystaltextview.h
839 BUG: [ 1547247 ] WinMerge ANSI target does not compile with VS2005
841 Src: Common/SuperComboBox.cpp
842 PATCH: [ 1558152 ] Italian translation updated
843 Submitted by Andrea Decorte
844 Src/Languages/Italian: MergeItalian.rc
847 PATCH: [ 1555764 ] prevent from shaking in view when pressing F5 down
848 Src: GhostTextView.cpp MergeDiffDetailView.cpp
851 PATCH: [ 1556851 ] An Swedish translation update
852 Submitted by Hans Eriksson
853 Src/Languages/Swedish: MergeSwedish.rc
855 2006-09-11 WinMerge beta release 2.5.6 (revision 3552)
858 Japanese translation - update
859 Src/Languages/Japanese: MergeJapanese.rc
862 PATCH: [ 1555764 ] prevent from shaking in view when pressing F5 down
863 Src: GhostTextView.cpp GhostTextView.h MergeDiffDetailView.cpp MergeDiffDetailView.h
866 BUG: [ 1555664 ] fail to copy all to right when enabling moved block detect
870 Czech translation update from Jan Hryz
871 Src/Languages/Czech/MergeCzech.rc
872 PATCH: [ 1553714 ] Add new commandine switches to help dialog
873 Src: Merge.rc MergeArgs.cpp resource.h
874 Src/Languages/*: Merge*.rc
875 PATCH: [ 1552228 ] Don't use 'export' as variable name
879 RFE: [ 1533506 ] Need commandline switch for single-instance
883 PATCH: [ 1552901 ] Update VC loose filefilter
884 Filters: Merge_VC_loose.flt
885 PATCH: [ 1552917 ] Fix GUI for autocompletion option
887 Src/Languages/*: Merge*.rc
890 PATCH: [ 1552095 ] Fix last compare method not visible in GUI list
892 Src/Languages/*: Merge*.rc
895 PATCH: [ 1551332 ] defer loading plugin
896 Src: MainFrm.cpp Merge.rc MergeDoc.cpp MergeEditView.cpp MergeEditView.h
897 Src/Languages/*: Merge*.rc
900 BUG: [ 1550427 ] WinMerge 2.5.5.7 don't save "Include subfoders by default"
901 Src: PropRegistry.cpp
904 Japanese translation - update
905 Src/Languages/Japanese: MergeJapanese.rc
908 PATCH: [ 1544777 ] Compare by size
909 Forgot to commit Options-dialog changes last time so option for this wasn't visible
911 BUG: [ 1547262 ] Suspicious bit shift warning
913 Src/Common: UniFile.cpp
916 PATCH: [ 1547190 ] Fix VS2005 compile
920 BUG: [ 1546938 ] New toolbar icons only works for 'disabled' icons
921 Src/Languages/*/Merge*.rc
924 Fix compiling WinMerge after moving folders around (Merge7z moved under ArchiveSupport)
927 ***** Switch to Subversion *****
929 2006-08-24 WinMerge experimental release 2.5.5.7 (cvs)
932 PATCH: [ 1545411 ] Add some missing options to configlog
933 Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
934 PATCH: [ 1545165 ] WinMarge Bulgarian Translation
935 Submitted by tigertron
936 Src/Languages/Bulgarian: MergeBulgarian.rc
937 Docs/Users/Languages: Readme-Bulgarian.txt
938 Docs/Users/Contributors.txt
939 InnoSetup: WinMerge.iss
940 ShellExtension: ShellExtension.rc
941 ShellExtension/Languages: ShellExtensionBulgarian.rc
942 PATCH: [ 1545890 ] Swedish translation for update for WinMerge 2.5.5.7+
943 Submitted by Hans Eriksson
944 Src/Languages/Swedish: MergeSwedish.rc
945 BUG: [ 1545082 ] Crash when comparing .rc files
946 Fix submitted by Takashi
947 Src/editlib: ccrystaltextview.cpp
950 PATCH: [ 1544905 ] Use stat() to check if file is read-only
951 Src: files.cpp files.h
952 PATCH: [ 1544777 ] Compare by size
953 Src: DiffWrapper.h DirScan.cpp Merge.rc resource.h
954 Src/Languages/*: Merge*.rc
957 PATCH: [ 1541427 ] Using as an external diff tool (RFE 1454623)
958 Src: MainFrm.cpp MainFrm.h MergeArgs.cpp MergeDoc.cpp
961 PATCH: [ 1544784 ] Use as ClearCase external merge tool
965 BUG: [ 1543783 ] Misbehave margin draw
966 Src/editlib: ccrystaltextview.cpp
969 PATCH: [ 1544147 ] Add Install-feature for file filters
970 Src: FileFiltersDlg.cpp FileFiltersDlg.h Merge.rc resource.h
971 Src/Languages/*: Merge*.rc
972 BUG: [ 1534429 ] Message IDS_SUGGEST_IGNOREEOL incorrect
976 PATCH: [ 1424673 ] Widen labels on OpenDialog
979 Src/Languages/*: Merge*.rc
982 PATCH: [ 1542201 ] Change default user filter folder to WinMerge/Filters
984 PATCH: [ 1542829 ] Rename Format-item in File-menu to Convert
986 Src/Languages/*: Merge*.rc
989 PATCH: [ 1540090 ] Change horizontal scroll synch from relative to absolute
990 Src/Common: SplitterWndEx.cpp
993 PATCH: [ 1541158 ] New high-color toolbar icons
994 Src: BCMenu.cpp MainFrm.cpp MainFrm.h Merge.rc resource.h
995 Src/res: ToolbarDisabled.bmp ToolbarEnabled.bmp
998 PATCH: [ 1539568 ] draw icon at modified line (it was changed to line revision marks)
999 Src: GhostTextBuffer.cpp GhostTextBuffer.h MergeDoc.cpp MergeDoc.h
1000 Src/editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h ccrystaltextview.cpp
1003 PATCH: [ 1456356 ] Scrollbars sometimes not initially active
1007 PATCH: [ 1540129 ] Fix indentation of diffutils io.c
1008 Src/diffutils/src: IO.C
1009 PATCH: [ 1540054 ] Remove Copy All -items from folder compare menu
1011 Src/Languages/*: Merge*.rc
1012 PATCH: [ 1535558 ] Add GUI for shell extension folder include
1013 Src: Merge.rc PropRegistry.cpp PropRegistry.h resource.h
1014 Src/Languages/*: Merge*.rc
1017 BUG: [ 1538340 ] Undo enabled for folder compare.
1018 Src: DirView.h DirView.cpp
1021 Japanese translation - update
1022 Src/Languages/Japanese: MergeJapanese.rc
1025 PATCH: [ 1539204 ] Remove '#' from '#differences' column
1027 Src/Languages/*: Merge*.rc
1030 PATCH: [ 1538264 ] Split DiffFileData class to own files
1031 Src: DiffWrapper.cpp DiffWrapper.h DirScan.cpp DirViewColItems.cpp Merge.dsp
1032 Src new files: DiffFileData.cpp DiffFileData.h
1033 PATCH: [ 1537261 ] Swedish 2.5.5.6+ translation update
1034 Submitted by Hans Eriksson
1035 Src/Languages/Swedish: MergeSwedish.rc
1038 Fix doxygen comment for ImportOptions()
1039 Src/Common: OptionsMgr.cpp
1042 PATCH: Code cleanup. Removed commented out code.
1043 Src/Common: SuperComboBox.cpp
1045 BUG: [ 1531965 ] Crash undoing empty (?) event
1046 Src/editlib: ccrystaleditview.cpp
1049 Czech translation - update
1050 Src/Languages/Czech/MergeCzech.rc
1053 PATCH: [ 1310951 ] Option to copy DirCmpReport to clipboard
1054 Src: DirCmpReport.cpp DirCmpReport.h DirCmpReportDlg.cpp DirCmpReportDlg.h
1056 Src/Languages/*: Merge*.rc
1059 Czech translation - update
1060 Src/Languages/Czech/MergeCzech.rc
1062 2006-08-08 WinMerge experimental release 2.5.5.6 (cvs)
1065 BUG: [ 1535835 ] Import settings from the file
1066 Src/Common: PreferencesDlg.cpp PreferencesDlg.h
1067 PATCH: [ 1536240 ] Fix diff count numbers for real
1068 Src: DiffWrapper.cpp DirScan.cpp
1069 Src/diffutils/src: analyze.c UTIL.c
1072 PATCH: [ 1514487 ] Merge7z DllBuild 0018
1073 Merge7z: Merge7z311.cpp Merge7z409.cpp Merge7zCommon.cpp Merge7zCommon.h
1074 revision.txt Merge7z*.dsp
1075 Merge7z new files: Merge7z433.dsp Merge7z434.dsp Merge7z435.dsp Merge7z436.dsp
1076 Merge7z437.dsp Merge7z438.dsp Merge7z439.dsp Merge7z440.dsp Merge7z442.dsp
1077 Merge7zInstaller: Installer.cpp Installer.rc Files.rc2
1078 Change recommended version of 7-Zip to 4.42
1082 PATCH: [ 1535175 ] Shell ext: Add flag for subfolder inclusion
1083 ShellExtension: WinMergeShell.cpp WinMergeShell.h
1084 Bump ShellExtension version to 1.8.0
1085 ShellExtension: ShellExtension.rc
1088 BUG: [ 1533292 ] crash when specifying nonexistent project file.
1092 PATCH: [ 1534770 ] Add "don't wrap end of file" option for Find
1093 Src: Merge.rc resource.h
1094 Src/editlib: ccrystaleditview.cpp ccrystaltextview.cpp ccrystaltextview.h
1095 ceditreplacedlg.cpp cfindtextdlg.cpp cfindtextdlg.h
1096 Src/Languages/*: Merge*.rc
1097 BUG: [ 1534461 ] WinMerge 2.5.5.5 ingoring subfolders option in project files
1098 Src: MainFrm.cpp Merge.cpp
1101 Czech translation - update
1102 Src/Languages/Czech/MergeCzech.rc
1104 2006-08-03 WinMerge experimental release 2.5.5.5 (cvs)
1107 PATCH: [ 1533457 ] Add Refresh Selected -item to Folder compare main menu
1108 Src: DirActions.cpp DirView.cpp DirView.h Merge.rc
1109 Src/Languages/*: Merge*.rc
1112 PATCH: [ 1532743 ] Improve difference count columns in folder compare
1113 Src: DiffItem.h DiffItemList.cpp DirScan.cpp DirVierwColItems.cpp
1115 Src/Languages/*: Merge*.rc
1116 PATCH: [ 1529864 ] Stop using Application Data folders as filefilter folders
1117 Src: FileFilterHelper.cpp FileFilterHelper.h
1120 PATCH: [ 1531845 ] Fix memory leak after find
1121 Src/editlib: ccrystaltextview.cpp
1122 PATCH: [ 1531957 ] Fix imagelist memory leak in editor
1123 Src/editlib: ccrystaltextview.cpp
1124 PATCH: [ 1430331 ] New Debug menu
1125 Submitted by Perry, modified by me
1126 Src: MainFrm.cpp MainFrm.h Merge.rc resource.h
1127 Src/Languages/*: Merge*.rc
1128 PATCH: [ 1531319 ] Tidy Folder compare progress dialog
1130 Src/Languages/*: Merge*.rc
1133 PATCH: [ 1531293 ] Fix wrong cursor position after find
1134 Src: ccrystaltextview.cpp ccrystaltextview.h cfindtextdlg.cpp
1135 PATCH: [ 1406051 ] code cleanup for ScriptFileActions
1137 Src: DirActions.cpp FileActionScript.cpp FileActionScript.h
1138 PATCH: [ 1530459 ] Add some doxygen comments for ViewableWhitespace
1139 Src: ViewableWhitespace.cpp ViewableWhitespace.h
1142 BUG: [ 1528322 ] Crash when using F6 / Bugg for file differences
1143 Src: MergeEditView.cpp
1146 PATCH: [ 1530352 ] Start flashing WinMerge window when folder compare is ready
1147 Src: DirView.cpp MainFrm.cpp MainFrm.h
1148 PATCH: [ 1529995 ] Swedish translation update for 2.5.5.4+
1149 Submitted by Hans Eriksson
1150 Src/Languages/Swedish: MergeSwedish.rc
1151 PATCH: [ 1530655 ] Catalan translation update
1152 Submitted by Jordi Vilar
1153 Src/Languages/Catalan: MergeCatalan.rc
1156 PATCH: [ 1529915 ] Refresh menu on DirView does not work correctly
1157 Src: DirActions.cpp DirScan.cpp
1160 PATCH: [ 1529599 ] Cleanup DiffWrapper
1161 Src: DiffWrapper.cpp DiffWrapper.h MergeDoc.cpp PatchTool.cpp
1162 PATCH: [ 1529965 ] Add error messages for managing file filters
1163 Src: FileFiltersDlg.cpp FileFiltersDlg.h Merge.rc resource.h
1164 Src/Languages/*: Merge*.rc
1167 PATCH: [ 1527843 ] prevent dialog from flickering
1168 Src: DirCompProgressDlg.cpp DirView.cpp
1169 Src/Common: CMoveConstraint.cpp
1172 PATCH: [ 1528841 ] Cleanup ByteComparator
1173 Src: ByteComparator.cpp ByteComparator.h FileTextStats.h
1174 PATCH: [ 1528987 ] Use 64-bit variable as file position in Bytecompare
1175 Src: ByteComparator.cpp ByteComparator.h DiffWrapper.cpp FileTextStats.h
1176 PATCH: [ 1529053 ] Success message for loading/saving project file
1177 Src: Merge.rc ProjectFilePathsDlg.cpp resource.h
1178 Src/Languages/*: Merge*.rc
1181 PATCH: [ 1528444 ] Cleanup for AppSerialize
1182 Src: AppSerialize.cpp AppSerialize.h
1185 PATCH: [ 1527771 ] Remove Apply syntax highlight to other side option
1186 Src: Merge.rc MergeDoc.cpp OptionsDef.h OptionsInit.cpp PropEditor.cpp
1187 PropEditor.h resource.h
1188 Src/Languages/*: Merge*.rc
1191 PATCH: [ 1527947 ] Various Updates in German Translation for WinMerge 2.5
1192 Src/Languages/German: MergeGerman.rc
1195 PATCH: [ 1526918 ] Detect which side file is binary file
1196 Src: DiffItem.h DiffWrapper.cpp DiffWrapper.h
1197 Src/diffutils/src: DIFF.H IO.c analyze.c
1199 2006-07-20 WinMerge experimental release 2.5.5.4 (cvs)
1202 PATCH: [ 1525013 ] Add description for ASP.NET filter
1204 PATCH: [ 1525417 ] Move MovedBlock code to own file
1205 Src: DiffWrapper.cpp Merge.dsp
1206 Src new file: MovedBlocks.cpp
1207 PATCH: [ 1525531 ] Allow comparing project files from Open-dialog
1209 Config log files are .txt files (not .log)
1211 BUG: [ 1495212 ] Wrong cursor position after selecting wordwrapped line
1213 Src/editlib: ccrystaltextview.cpp
1216 Czech translation - update
1217 Src/Languages/Czech/MergeCzech.rc
1220 BUG: [ 1198248 ] version copyright symbol needs review
1221 Src/Languages/*: MergeChineseSimplified.rc MergeChineseTraditional.rc MergeJapanese.rc
1225 BUG: [ 1525451 ] ASSERT in CCrystalTextView::DrawSingleLine()
1226 Src/editlib: ccrystaltextview.cpp
1227 BUG: [ 1525466 ] ASSERT in CCrystalTextView::AssertValidTextPos()
1228 Src/editlib: ccrystaltextview2.cpp
1231 BUG: [ 1524832 ] Bogus include's
1232 Src: DirColsDlg.cpp PropEditor.cpp
1233 PATCH: [ 1522037 ] Add read-only option for paths in Project file
1234 Src: MainFrm.cpp Merge.cpp Merge.rc OpenDlg.cpp OpenDlg.h ProjectFile.cpp
1235 ProjectFile.h ProjectFilePathsDlg.cpp ProjectFilePathsDlg.h resource.h
1236 Src/Languages/*: Merge*.rc
1237 PATCH: [ 1525025 ] Copy/paste error in MainFrm.cpp
1239 PATCH: [ 1525198 ] Version info misses copyright (c) char
1243 Fix and improve comment for folder compare columns table
1245 BUG: [ 1524251 ] File filter does not work on 2.5.5.3
1246 Original fix from Takashi, modified by Kimmo
1247 Src: FileFilterMgr.cpp
1250 PATCH: [ 1517057 ] Option to Ignore Multiline Comments (bugfix for single-line comments)
1251 Submitted by David Maisonave
1252 Src: DiffWrapper.cpp
1255 Strip SuperComboBox strings before saving
1256 Src/Common: SuperComboBox.cpp
1258 2006-07-14 WinMerge experimental release 2.5.5.3 (cvs)
1261 BUG: [ 1521555 ] Location Pane - can't see current location because of color
1262 Use 3d-color instead of scrollbar color in location pane
1263 Src: LocationView.cpp
1264 PATCH: [ 1521696 ] Improve Text color option dialog
1265 Src: Merge.rc PropTextColors.cpp PropTextColors.h
1266 Src/Languages/*: Merge*.rc
1269 PATCH: [ 1521352 ] Cleanup char constants for CRegExep
1270 Src/Common: RegExp.cpp
1271 PATCH: [ 1521392 ] Fix reading last line in linefilter file
1272 Src: FileFilterMgr.cpp
1273 BUG: [ 1498511 ] Conflict accelerator key in IDR_DIRVIEWMENU
1275 Src/Languages/*: Merge*.rc
1276 PATCH: [ 1517057 ] Option to Ignore Multiline Comments (bugfix + rename to filtering)
1277 Submitted by David Maisonave
1278 Src: DiffWrapper.cpp DiffWrapper.h DirDoc.cpp MainFrm.cpp Merge.rc MergeDoc.cpp
1279 OptionsDef.h OptionsInit.cpp PropCompare.cpp Propcompare.h resource.h
1280 Src/Languages/*: Merge*.rc
1281 PATCH: [ 1517057 ] Option to Ignore Multiline Comments (bugfix)
1282 Submitted by David Maisonave
1283 Src: DiffWrapper.cpp
1286 PATCH: [ 1517057 ] Option to Ignore Multiline Comments
1287 Submitted by David Maisonave
1288 Src: DiffWrapper.cpp DiffWrapper.h DirDoc.cpp MainFrm.cpp Merge.rc MergeDoc.cpp
1289 OptionsDef.h OptionsInit.cpp PatchTool.cpp PropCompare.cpp Propcompare.h
1291 Src/Languages/*: Merge*.rc
1292 Add Ed_K and David Maisonave to Contributors
1293 Docs/Users: Contributors.txt
1294 Document UniMemFile::ReadString() function parameters and return values
1295 Src/Common: UniFile.cpp
1298 Quiet warning about deprecated function for VS2003 and later
1302 PATCH: [ 1517362 ] Ensure diff is visible in location view
1303 Src: LocationView.cpp
1304 Fix codinstyle in LocationView.cpp (messed up by patch #1517362)
1305 Src: LocationView.cpp
1306 Make VS2005 build less noisy by defining _CRT_SECURE_NO_DEPRECATE for it
1310 PATCH: [ 1516626 ] Enable double-click in column customization dialog
1311 Src: DirColsDlg.cpp DirColsDlg.h
1312 PATCH: [ 1514435 ] Optimize versioninfo reading
1313 Src: AboutDlg.cpp ConfigLog.cpp Splash.cpp
1314 Src/Common: version.cpp version.h
1317 BUG: [ 1303166 ] crash or freeze on closing all window
1320 2006-07-03 WinMerge experimental release 2.5.5.2 (cvs)
1323 PATCH: [ 1515380 ] Page Up/Down Anomaly
1325 Src/editlib: ccrystaltextview2.cpp
1326 PATCH: [ 1515966 ] Use View-IDs in MergeDoc.cpp
1327 Src: MergeDoc.cpp MergeDoc.h
1328 PATCH: [ 1516016 ] Fix poor handling of invalid tab size in Options-dialog
1329 Src: Merge.rc PropEditor.cpp PropEditor.h resource.h
1330 Src/Languages/*: Merge*.rc
1331 Fix comment in DiffList.cpp
1335 PATCH: [ 1515669 ] Add selected difference marker for locationview
1336 Src: LocationView.cpp LocationView.h
1339 PATCH: [ 1514459 ] Cleanup for LocationView code (use view ID)
1340 Src: LocationView.cpp LocationView.h StdAfx.h
1341 PATCH: [ 1514580 ] Tweak location view bar look
1342 Src: LocationView.cpp
1345 PATCH: [ 1514645 ] Various Updates in German Translation for WinMerge 2.5
1346 Src/Languages/German: MergeGerman.rc
1349 PATCH: [ 1513618 ] Fix Merge.rc translation id
1353 PATCH: [ 1512708 ] Fix compile with VS2005
1354 Also additional cleanup for CCrystalTextView::GetMarginWidth()
1355 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
1356 PATCH: [ 1512726 ] Fix combining filesize from two values
1357 Src: DiffFileInfo.cpp DirScan.cpp FileInfo.cpp FileInfo.h
1358 PATCH: [ 1512775 ] Fix encoding columns showing -1
1359 Src: FileTextEncoding.cpp FileTextEncoding.h
1362 PATCH: [ 1510596 ] Updated Readme-Swedish.txt
1363 Submitted by Hans Eriksson
1364 Docs/Users/Languages: ReadMe-Swedish.txt
1365 PATCH: [ 1510600 ] Updated MergeSwedish.rc file for 2.5.5.1+
1366 Submitted by Hans Eriksson
1367 Src/Languages/Swedish: MergeSwedish.rc
1368 BUG: [ 1483242 ] Needless resource file 'MergeSwedish_LastTranslation.rc'?
1369 Remove unneeded file
1370 Removed: Src/Languages/Swedish: MergeSwedish_LastTranslation.rc
1371 BUG: [ 1489034 ] Src/Common/LanguageSelect.rc unused?
1372 Remove unneeded file
1373 Removed: Src/Common/LanguageSelect.rc
1374 Remove unused files (language.h & language.c)
1375 Removed: Src: language.c language.h
1377 2006-06-21 WinMerge experimental release 2.5.5.1 (cvs)
1380 PATCH: [ 1509505 ] Manual: new compare method and options export/import
1381 Docs/Users/Manual: Configuration.xml
1382 Bump manual revision to 1.2.4
1383 Docs/Users/Manual: WinMerge_help.xml
1384 Bump ShellExtension version to 1.7.2
1385 ShellExtension: ShellExtension.rc
1388 BUG: [ 1505763 ] Crash after closing file compare window
1389 Src: MergeEditView.cpp
1390 PATCH: [ 1508865 ] Improve error handling for loading file filters
1391 Src: FileFilterHelper.cpp FileFilterMgr.cpp FileFilterMgr.h FileFiltersDlg.cpp
1393 PATCH: [ 1508898 ] Show binary as one of EOL types
1394 Src: DirViewColItems.cpp Merge.rc resource.h
1395 Src/Languages/*: Merge*.rc
1396 PATCH: [ 1506184 ] Polish translation update for WM 2.5.4.0
1397 Submitted by dr_prozac
1398 Src/Languages/Polish: MergePolish.rc
1399 PATCH:[ 1509495 ] Polish translation for ShellExtension
1400 Submitted by dr_prozac
1401 ShellExtension/Languages: ShellExtensionPolish.rc
1404 RFE: [ 1499245 ] Ruby Syntax Highlighting
1406 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h ruby.cpp
1409 BUG: [ 1494776 ] Can't rename files if '|' seperator exists
1410 Src: DirView.h DirView.cpp DirActions.cpp
1413 BUG: [ 1486434 ] Copy Pathnames for right-only dir copies parent dir only
1417 PATCH: [ 1483544 ] New compare method: by date and size
1418 Src: DiffWrapper.h DirScan.cpp Merge.rc PropCompare.cpp resource.h
1419 Src/Languages/*: Merge*.rc
1422 BUG: [ 1496066 ] WinMerge crashed with those files
1423 Src: GhostTextView.cpp GhostTextView.h
1426 BUG: [ 1494610 ] Wrong selection in ccrystalview2.cpp
1427 Src/editlib: ccrystaltextview2.cpp
1428 PATCH: [ 1497817 ] Cleanup CCrystalTextView::GetLineBySubLine
1429 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
1432 PATCH: [ 1497154 ] Fix memory leak in wordwrap code
1433 Src/editlib: ccrystaltextview.cpp
1434 PATCH: [ 1497068 ] Initialize cursorpositions in GhostTextView
1435 Src: GhostTextView.h
1436 PATCH: [ 1497147 ] Cleanup CCrystalTextView::ClientToText
1437 Src/editlib: ccrystaltextview.cpp
1440 BUG: [ 1494610 ] Wrong selection in ccrystalview2.cpp
1442 Src/editlib: ccrystaltextview2.cpp
1445 PATCH: [ 1495017 ] Translate 'Textcolors' options to German
1446 Src/Languages/German: MergeGerman.rc
1449 PATCH: [ 1494627 ] Skip processing empty paths in Open dialog
1451 Doxygen comments and trivial cleanups for paths.cpp & paths.h
1452 Src: paths.cpp paths.h
1455 PATCH: [ 1493742 ] Limit vertical scrolling to last line of files
1456 Src/editlib: ccrystaltextview.cpp
1457 PATCH: [ 1493868 ] Add bookmark by double-clicking selection frame
1458 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h ccrystaltextview2.cpp
1459 PATCH: [ 1492458 ] Swedish translation update for 2.5.4.0
1460 Submitted by Hans Eriksson
1461 Src/Languages/Swedish: MergeSwedish.rc
1462 Add some const keywords and fix comments, remove unused function.
1463 Src: DiffList.cpp DiffList.h
1464 BUG: [ 1488797 ] ASSERT in CMergeEditView::OnPrevdiff
1466 Src: MergeEditView.cpp
1469 PATCH: [ 1493713 ] Translate 'Bookmarks' feature to German
1470 Src/Languages/German: MergeGerman.rc
1473 PATCH: [ 1491436 ] Spanish Readme.txt
1474 Submitted by Jesus M. Delgado 'Mack'
1475 Docs/Users/Languages new file: ReadMe-Spanish.txt
1476 InnoSetup: WinMerge.iss
1479 PATCH: [ 1491993 ] Ability to rename files (RFE 1380228)
1480 Src: DirActions.cpp DirView.cpp DirView.h Merge.rc resource.h
1483 PATCH: [ 1491212 ] Czech Translation
1484 Submitted by: Jan Hryz
1485 Src/Languages/Czech/MergeCzec.rc
1486 PATCH: [ 1492025 ] Catalan translation update
1487 Submitted by Jordi Vilar
1488 Src/Languages/Catalan: MergeCatalan.rc
1489 PATCH: [ 1491424 ] Spanish translation for v2.5.3.7
1490 Submitted by Jesus M. Delgado 'Mack'
1491 Languages/Spanish: MergeSpanish.rc
1493 2006-05-18 WinMerge beta release 2.5.4
1496 PATCH: [ 1490540 ] Manual: add picture and explanation about our version tree
1497 Docs/Users/Manual: Introduction.xml
1498 Docs/Users/Manual/build: build_html.bat build_htmlhelp.bat
1499 Docs/Users/Manual/Art new files: WinMerge_versions.gif WinMerge_versions.odg
1502 PATCH: [ 1489824 ] Better default folder for user filters
1504 BUG: [ 1445975 ] BuildDll.bat exit is not good
1505 Src/Languages: BuildDll.bat
1506 PATCH: [ 1488387 ] Russian translation update for 2.4.6
1507 Submitted by Dmitriy Aleshkowskiy
1508 Src/Languages/Russian: MergeRussian.rc
1511 PATCH: [ 1489133 ] Manual: document new filter location(s)
1512 Docs/Users/Manual: Filters.xml
1513 PATCH: [ 1489091 ] Enable Help/Index
1515 PATCH: [ 1489098 ] Doesn't open Help TOC correctly
1517 BUG: [ 1487856 ] Long delay if many language dlls
1519 Src/Common: LanguageSelect.cpp LanguageSelect.h
1520 BUG: [ 1487854 ] ASSERT in CCrystalTextView::OnPrint
1521 Fix suggested by Mallato
1522 Src/editlib: ccrystaltextview.cpp
1523 Graphic Design: Alexander Skinner
1524 Docs/Users: Contributors.txt
1525 BUG: [ 1478057 ] Memory leak when cancelling print preview
1526 Fix suggested by Mallato
1527 Src/editlib: ccrystaltextview.cpp
1530 PATCH: [ 1488637 ] PHP/ASP Syntax Highlighting Fix (Bug 1441643)
1531 Src/editlib: asp.cpp php.cpp
1534 PATCH: [ 1485861 ] Czech translation - update
1535 Submitted by: Jan Hryz
1536 Src/Languages/Czech/MergeCzec.rc
1537 PATCH: [ 1483553 ] Swedish MergeSwedish.rc 1.304 2.5.3.7 update
1538 Submitted by Hans Eriksson
1539 Src/Languages/Swedish: MergeSwedish.rc
1540 PATCH: [ 1484004 ] Manual: new Open-dialog screenshot and small fixes
1541 Docs/Users/Manual: Quick_start.xml
1542 Docs/Users/Manual/screenshots: OpenDlg1.gif
1543 PATCH: [ 1484013 ] Manual: small changes to Introduction chapter
1544 Docs/Users/Manual: Introduction.xml
1545 PATCH: [ 1484092 ] Manual: preliminary whats new list for 2.5
1546 Docs/Users/Manual: Whatsnew_2_1.xml
1547 PATCH: [ 1484101 ] Manual: Add index
1548 Docs/Users/Manual: WinMerge_help.xml
1549 PATCH: [ 1484142 ] Manual: update some options descriptions
1550 Docs/Users/Manual: Configuration.xml
1553 PATCH: [ 1483344 ] Fix creating private file filters
1554 Src: FileFiltersDlg.cpp
1555 PATCH: [ 1483486 ] Add commenting for CLogFile
1556 Src/Common: LogFile.cpp LogFile.h
1559 PATCH: [ 1483107 ] Remove dublicated code from folder compare progress dlg
1560 Src: DirCompProgressDlg.cpp DirCompProgressDlg.h
1561 PATCH: [ 1483088 ] Add GUI for user to select filter folder
1562 Src: FileFilterHelper.cpp FileFilterHelper.h FileFiltersDlg.cpp MainFrm.cpp Merge.rc
1563 OptionsDef.h OptionsInit.cpp paths.cpp paths.h PropRegistry.cpp PropRegistry.h
1565 Src/Languages/*: Merge*.rc
1568 BUG: [ 1481053 ] Options: Text Colors should use 3D-Look too
1570 Src/Languages/*: Merge*.rc
1571 PATCH: [ 1482352 ] Icons for 'Bookmarks' feature
1572 Src: MainFrm.cpp Merge.rc resource.h
1573 Src/res new files: clear_bookmarks.bmp next_bookmark.bmp prev_bookmark.bmp
1575 Src/Languages/*: Merge*.rc
1578 BUG: [ 1363364 ] DisplayBinaryFiles extension list wrong
1579 Also bump version of plugin to 1.0.3.0
1580 Plugins/src_VCPP/DisplayBinaryFiles: ChangeLog.txt DisplayBinaryFiles.rc WinMergeScript.cpp
1581 Plugins/dlls: DisplayBinaryFiles.dll
1584 PATCH: [ 1482411 ] Add line before 'Open Project' in main menu
1586 Src/Languages/*: Merge*.rc
1589 PATCH: [ 1482688 ] sgml.cpp contains "lt" twice
1590 Src/editlib: sgml.cpp
1591 PATCH: [ 1482694 ] xml.cpp contains "lt" twice
1592 Src/editlib: xml.cpp
1593 PATCH: [ 1482765 ] Fix closing folder compare progress dialog
1594 Src: DirCompProgressDlg.cpp DirCompProgressDlg.h DirView.cpp
1596 2006-05-04 WinMerge experimental release 2.5.3.7 (cvs)
1599 PATCH: [ 1481213 ] Fix foldercompare short-size suffixes and localize them
1600 Src: DirViewColItems.cpp Merge.rc resource.h
1601 Src/Languages/*: Merge*.rc
1602 PATCH: [ 1481391 ] Make LocationView update from MergeView more safe
1603 Src: LocationView.cpp MergeEditView.cpp MergeEditView.h
1604 BUG: [ 1456356 ] Scrollbars sometimes not initially active
1605 Another possible fix..
1606 Src/editlib: ccrystaltextview.cpp
1609 PATCH: [ 1480652 ] Small fix for XML syntax highlight
1610 Src/editlib: xml.cpp
1613 PATCH: [ 1479007 ] WinMerge Icon Set Revision 3
1614 Submitted by Alexander Skinner
1616 BUG: [ 1474782 ] Crash when comparing SQL with with binary data
1617 Fix suggested by anonymous submitter
1618 Src/editlib: asp.cpp basic.cpp batch.cpp cplusplus.cpp csharp.cpp dcl.cpp
1619 fortran.cpp html.cpp ini.cpp innosetup.cpp is.cpp java.cpp lisp.cpp nsis.cpp
1620 pascal.cpp perl.cpp php.cpp python.cpp rexx.cpp rsrc.cpp sgml.cpp sh.cpp
1621 siod.cpp sql.cpp tcl.cpp tex.cpp xml.cpp
1622 PATCH: [ 1471835 ] Fix setting filename in folder-compare report dialog
1623 Fix bug in the original patch
1624 Src: DirCmpReportDlg.cpp
1627 PATCH: [ 1475649 ] Enable selection margin and line numbers
1628 Src/res new file: mg_icons.bmp
1631 PATCH: [ 1475649 ] Enable selection margin and line numbers
1632 Src: GhostTextView.cpp GhostTextView.h Merge.rc MergeEditView.cpp
1633 MergeEditView.h OptionsDef.h OptionsInit.cpp resource.h
1634 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h editcmd.h
1635 Src/Languages/*: Merge*.rc
1638 PATCH: [ 1477957 ] Fix 'Help' button position in German translation
1639 Src/Languages/German: MergeGerman.rc
1642 PATCH: [ 1476279 ] Cleanup CDiffContext::UpdateInfoFromDiskHalf() and its usage
1643 Src: Diffcontext.cpp DiffContext.h DirScan.cpp DirViewColItems.cpp
1646 PATCH: [ 1475776 ] Optimize dirview UI updates
1647 Src: DirActions.cpp DirDoc.cpp DirDoc.h
1648 PATCH: [ 1472622 ] Czech translation - update (more dialog fixes)
1649 Submitted by: Jan Hryz
1650 Src/Languages/*: Merge*.rc
1653 PATCH: [ 1474884 ] Fix XmlDoc not releasing file handles
1654 Src: XmlDoc.cpp XmlDoc.h
1655 PATCH: [ 1475092 ] Add DocumentsLoaded() to MergeDiffDetailView
1656 Src: MergeDiffDetailView.cpp MergeDiffDetailView.h MergeDoc.cpp
1657 Gal Hammer is now a developer
1658 Docs/Users: Contributors.txt
1661 PATCH: [ 1473902 ] Add dialog for editing and saving project files
1662 Src: DirDoc.cpp DirDoc.h MainFrm.cpp MainFrm.h Merge.dsp Merge.rc MergeDoc.cpp
1663 MergeDoc.h resource.h
1664 Src new files: ProjectFilePathsDlg.cpp ProjectFilePathsDlg.h
1665 Src/Languages/*: Merge*.rc
1666 PATCH: [ 1472622 ] Czech translation - update
1667 Submitted by: Jan Hryz
1668 Src/Languages/Czech/MergeCzec.rc
1669 PATCH: [ 1472622 ] Czech translation - update (apply dialog fixes)
1670 Submitted by: Jan Hryz
1671 Src/Languages/*: Merge*.rc
1674 PATCH: [ 1473635 ] Move some results update code to DirDoc
1675 Src: DirActions.cpp DirDoc.cpp DirDoc.h
1676 PATCH: [ 1468691 ] Center folder compare status dialog to mainframe
1677 Adding line I missed previous time applying the patch (2006-04-12)
1681 TODO: [ 1469363 ] Need image for aborted status in folder compare
1683 Src: DirView.cpp Merge.rc resource.h
1684 Src/res new file: aborted.ico
1685 Src/Languages/*: Merge*.rc
1686 PATCH: [ 1400653 ] Write project files using objects
1688 Src: Merge.dsp ProjectFile.cpp ProjectFile.h
1689 Src new files: XmlDoc.cpp XmlDoc.h
1692 PATCH: [ 1471835 ] Fix setting filename in folder-compare report dialog
1693 Src: DirCmpReportDlg.cpp DirCmpReportDlg.h
1696 PATCH: [ 1445996 ] Fix wrong PgDown scrolling after mousescroll(2)
1697 Src/editlib: ccrystaltextview2.cpp
1699 2006-04-12 WinMerge experimental release 2.5.3.6 (cvs)
1702 PATCH: [ 1468691 ] Center folder compare status dialog to mainframe
1704 PaTCH: [ 1468783 ] Fix disabled scrollbars after loading files
1705 Src: MergeDoc.cpp MergeEditView.cpp MergeEditView.h
1708 PATCH: [ 1467872 ] Fix diff navigation for first-line of diff
1709 Src: MergeEditView.cpp
1710 PATCH: [ 1443719 ] xml output reports
1711 Submitted by Perry, modified by me
1712 Src: DirCmpReport.cpp DirCmpReport.h DirCmpReportDlg.cpp DirCmpReportDlg.h
1713 DirView.cpp DirView.h Merge.dsp Merge.rc resource.h
1714 Src new file: DirReportTypes.h
1717 PATCH: [ 1467305 ] Beep when long compare is ready
1718 Src: DirView.cpp DirView.h
1721 BUG: [ 1461375 ] Forgot old patch #981526 for sgml.cpp, sh.cpp and tcl.cpp?
1722 Src\editlib: sgml.cpp sh.cpp tcl.cpp
1725 BUG: [ 1383719 ] ShellExtension resources opening in IDE fails
1727 ShellExtension/Languages/*.rc
1728 BUG: [ 1465893 ] Compile error with VC6 (SuperComboBox.cpp)
1730 Src/Common: SuperComboBox.cpp
1733 BUG: [ 1463137 ] MergeArgs.h is empty file?
1736 Src removed file: MergeArgs.h
1739 PATCH: [ 1461896 ] Syntax highlighting of HTML for ASP not complete
1740 Src\editlib: asp.cpp
1743 PATCH: [ 1460749 ] Print relative paths to patch files
1744 Src: DiffWrapper.cpp DiffWrapper.h MainFrm.cpp MergeDoc.cpp PatchDlg.h
1745 PatchTool.cpp PatchTool.h
1746 BUG: [ 1461328 ] Commandline handling overwrites flags?
1749 BUG: [ 1460236 ] Splash localization is broken
1750 Src: Merge.rc resource.h Splash.cpp
1751 Src/Languages/*: Merge*.rc
1752 PATCH: [ 1445426 ] Clear PrivateBuild flag in SetResourceVersions.wsf
1754 Src: SetResourceVersions.wsf
1757 BUG: [ 1458714 ] [Replace All] doesn't work
1758 Src/editlib: ceditreplacedlg.cpp
1761 PATCH: [ 1459284 ] Update of MergeSwedish.rc for WinMerge 2.5.3.5+
1762 Submitted by Hans Eriksson
1763 Src/Languages/Swedish: MergeSwedish.rc
1764 PATCH: [ 1458852 ] Fix UI for multiple file patches
1765 Src: PatchDlg.cpp PatchDlg.h
1766 PATCH: [ 1441718 ] Auto Complete on files or folders selection
1767 Submitted by Gal Hammer
1768 Src/Common: SuperComboBox.cpp SupercompoBox.h
1769 Src: Merge.rc OpenDlg.cpp OptionsDef.h OptionsInit.cpp PropGeneral.cpp
1770 PropGeneral.h resource.h
1771 Src/Languages/*: Merge*.rc
1774 PATCH: [ 1458066 ] Use / as path delimiter in patch files
1775 Src: DiffWrapper.cpp
1776 PATCH: [ 1406944 ] Compute text statistics in QuickCompare
1777 Src new file: FileTextStats.h
1780 PATCH: [ 1457203 ] Create patch from multiple files in folder compare
1781 Src: DirView.cpp DirView.h MainFrm.cpp
1784 PATCH: [ 1457306 ] Revamped Visual Basic syntax highlighter
1785 Src\editlib: basic.cpp
1788 BUG: [ 1455656 ] GPL text still contains 'How to Apply These Terms...'
1791 2006-03-22 WinMerge experimental release 2.5.3.5 (cvs)
1794 PATCH: [ 1455706 ] Catalan translation update
1795 Submitted by Jordi Vilar
1796 Src/Languages/Catalan: MergeCatalan.rc
1797 PATCH: [ 1406944 ] Compute text statistics in QuickCompare
1798 Src: ByteComparator.cpp ByteComparator.h DiffFileInfo.cpp DiffFileInfo.h DiffWrapper.cpp
1799 Diffwrapper.h DirScan.cpp DirViewColItems.cpp Merge.dsp Merge.rc resource.h
1800 Src/diffutils/src: DIFF.H IO.C
1801 Src/Languages/*: Merge*.rc
1804 PATCH: [ 1455663 ] Add new keywords to Visual Basic highlighter
1805 Src\editlib: basic.cpp
1808 PATCH: [ 1448599 ] WinMerge Program Icon Set
1809 Submitted by Alexander Skinner
1811 PATCH: [ 1452288 ] Add ASP.NET filefilter
1812 By By Jon Galloway and Josh Blair
1813 Filters new file: ASPNET.flt
1814 PATCH: [ 1454720 ] Fix resizable dialogs missing captionbar close button
1816 Src/Languages/*: Merge*.rc
1817 PATCH: [ 1455430 ] New Splash Screen Revision 2
1818 Submitted by Alexander Skinner
1820 Remove obsolete splashscreen image (for old splashscreen)
1821 Src/res removed file: WinMergesplash.psd
1824 PATCH: [ 1449892 ] Add compare method to configlog
1825 Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
1826 PATCH: [ 1453252 ] Fix closing filecompare after error
1827 Src: MainFrm.cpp MergeDoc.cpp
1830 PATCH: [ 1449571 ] Add '*.pm' and '*.plx' to Perl highlighter
1831 Src/editlib: ccrystaleditview.cpp
1834 BUG: [ 1449947 ] Looks like diffutils bug for mac-style
1835 BUG: [ 1449949 ] crash comparing two simple test mac files
1836 Fix looping which missed mac case
1840 PATCH: [ 1449868 ] Fix difference counts
1841 Src: DiffWrapper.cpp
1844 PATCH: [ 1449038 ] Add Help-button to Open-dialog
1845 Src: FileFiltersDlg.cpp FileFiltersDlg.h Merge.rc OpenDlg.cpp OpenDlg.h
1846 PropLineFilter.cpp PropLineFilter.h
1847 Src/Common: PreferencesDlg.cpp
1848 Src/Languages/*: Merge*.rc
1851 PATCH: [ 1447927 ] Add Help Search to menu, open correct manual location
1852 Src: DirView.cpp DirView.h MainFrm.cpp MainFrm.h Merge.rc MergeEditView.cpp
1853 MergeEditView.h resource.h
1854 Src/Languages/*: Merge*.rc
1857 PATCH: [ 1447506 ] Don't include splash bitmap to lang files
1858 Src/Languages/*: Merge*.rc
1859 Remove Catalan localized splash screen
1860 Src/Languages/Catalan/res removed files: splash1.bmp WinMergeSplash.psd
1861 BUG: [ 1447851 ] Not enough space for version info in new splash screen
1863 PaTCH: [ 1445377 ] WinMerge Logos (72 DPI)
1864 Submitted by Alexander Skinner
1865 Add new folder Docs/Logos
1866 New Docs/Logos files: readme.txt WinMerge_logo_24bit.png
1867 WinMerge_logo_shadow_24bit.png WinMerge_logo_shadow_trans.tif
1868 WinMerge_logo_trans.gif
1869 Change Splashscreen text to according to Dean's wish
1871 Add Alexander Skinner to contributors list
1872 Docs/Users: Contributors.txt
1873 PATCH: [ 1447348 ] Build language files to Build directory
1874 Src/Languages: BuildDll.bat
1875 PATCH: [ 1447806 ] Use JPEG splashscreen
1876 Src: Merge.dsp Merge.rc resource.h Splash.cpp Splash.h
1877 Src/Common new files: Picture.cpp Picture.h
1878 Src/res new file: splash.jpg
1879 Src/res deleted file: splash1.bmp
1880 Src/Languages/*: Merge*.rc
1883 BUG: [ 1441389 ] Comparing root directory - mysterious
1884 Src: DiffWrapper.cpp
1887 PATCH: [ 1447539 ] Add explanatory comment to CCrystalTextBuffer::MoveLine
1888 Src/editlib: ccrystaltextbuffer.cpp
1889 PATCH: [ 1447547 ] Add more comments to CMergeDoc::PrimeTextBuffers
1893 Remove unneeded splash image (Splash2.bmp) as noted in Patch item #1441392
1894 Src/res removed file: Splash2.bmp
1897 PATCH: [ 1445434 ] SyntaxColors scrambling reg values
1898 Src: SyntaxColors.cpp
1900 2006-03-10 WinMerge experimental release 2.5.3.4 (cvs)
1903 PATCH: [ 1445996 ] Fix wrong PgDown scrolling after mousescroll
1904 Src/editlib: ccrystaltextview2.cpp
1905 BUG: [ 1446648 ] cvs trunk doesn't compile
1909 PATCH: [ 1441392 ] New Splash Screen
1910 Submitted by Alexander Skinner
1912 Src/res: splash1.bmp
1915 Update MakeResDll readme with current information (MSVC.Net 2003 works
1916 now), and better explanation of how to pick a specific version.
1917 MakeResDll: readme.txt
1918 PATCH: [ 1443391 ] Update MakeResDll for VS.NET 2005
1919 MakeResDll: MakeResDll.cpp MakeResDll.dsp MakeResDll.rc
1920 StdAfx.cpp StdAfx.h readme.txt resource.h
1921 New MakeResDll: Merge.ico VsVersionDlg.cpp VsVersionDlg.h
1922 Bump MakeResDll version from 1.0.6.0 to 1.0.7.0.
1923 MakeResDll: MakeResDll.rc
1924 PATCH: [ 1442844 ] Make GetFileExt easier to understand
1925 Src: MergeDoc.cpp MergeDoc.h
1926 Add two minor comments to PropRegistry.
1929 2006-03-06 WinMerge experimental release 2.5.3.3 (cvs)
1932 BUG: [ 1444211 ] bug in current SelectFile
1934 PATCH: [ 1443841 ] Add header comment to Src/Changes.txt
1938 BUG: [ 1442866 ] German RC format error
1939 Src/Languages/German: MergeGerman.rc
1940 BUG: [ 1442865 ] languages lack generate patch & report bitmaps
1941 Src/Languages/*: Merge*.rc
1944 PATCH: [ 1435361 ] Fix and cleanup project file code
1945 Src: DiffContext.cpp DiffContext.h DirDoc.cpp MainFrm.cpp
1946 Merge.cpp Merge.h Merge.rc MergeArgs.cpp ProjectFile.cpp
1948 Src/Languages/*: Merge*.rc
1951 PATCH: [ 1396506 ] customizable text colors
1952 Fix compilation (MSVC.NET 2003 correctly gave error that MSVC6 ignored)
1953 Src: PreferencesDlg.cpp
1954 PATCH: [ 1442125 ] Improvements for MakeResDll parsing
1955 MakeResDll: MakeResDll.cpp MakeResDll.rc resource.h
1956 Src\Common: RegKey.cpp RegKey.h
1957 PATCH: [ 1442134 ] MakeResDll: check that RC file exists
1958 MakeResDll: MakeResDll.cpp MakeResDll.rc resource.h
1959 PATCH: [ 1442238 ] Fix MakeResDll to work with VS.NET 2003
1960 MakeResDll: MakeResDll.cpp MakeResDll.rc
1961 PATCH: [ 1442791 ] Update MakeResDll project
1962 Add Changes.txt to project.
1963 Change version copyright from "2003" to "2003-2006"
1964 MakeResDll: MakeResDll.dsp MakeResDll.rc
1966 2006-03-04 Perry (MSVC6)
1967 Current selftests status: Failure count: 0 (of 756)
1970 PATCH: [ 1396506 ] customizable text colors
1971 Src: MainFrm.cpp MainFrm.h Merge.dsp Merge.rc MergeDoc.cpp
1972 OptionsDef.h OptionsInit.cpp PropArchive.cpp PropArchive.h
1973 PropCodepage.cpp PropCodepage.h PropColors.cpp PropColors.h
1974 PropCompare.cpp PropCompare.h PropEditor.h PropGeneral.h
1975 PropRegistry.h PropSyntaxColors.cpp PropSyntaxColors.h
1976 PropVss.h SyntaxColors.cpp SyntaxColors.h resource.h
1977 Src\Common: PreferencesDlg.cpp PreferencesDlg.h
1978 Src/Languages/*: Merge*.rc
1979 PATCH: [ 1439335 ] Reset cwd in Merge.cpp SelectFile
1980 Src: Merge.cpp OpenDlg.cpp
1981 PATCH: [ 1442082 ] Fix MakeDirs to not error if directory exists
1982 Src\Common: coretools.cpp
1983 PATCH: [ 1396506 ] customizable text colors
1985 Src: new PropTextColors.cpp PropTextColors.h
1988 PATCH: [ 1442699 ] New Changes.txt file for MakeResDll
1989 Add Changes.txt change log (this file).
1990 MakeResDll: new Changes.txt
1991 PATCH: [ 1424636 ] New BuildOneLanguage.vbs & fix MakeResDll exit
1992 MakeResDll: MakeResDll.cpp StdAfx.h
1993 Src\Languages: BuildDll.bat BuildOneLanguage.vbs
1996 PATCH: [ 1441387 ] Improve File Encoding dialog
1998 Src/Languages/*: Merge*.rc
1999 PATCH: [ 1442107 ] Move About-dialog code to separate files from Merge.cpp
2000 Src: Merge.cpp Merge.dsp
2001 Src new files: AboutDlg.cpp AboutDlg.h
2004 PATCH: [ 1437770 ] Icons for 'Generate Patch' and 'Generate Report'
2005 Src: MainFrm.cpp Merge.rc resource.h
2006 Src/res new files: patch.bmp report.bmp
2009 PATCH: [ 1441124 ] Improve filter test dialog
2011 Src/Languages/*: Merge*.rc
2014 PATCH: [ 1424535 ] Czech Translation, Submitted by Jan Hryz
2015 Improve unpacker selection dialog and new filter location selection dialog
2017 Src/Languages/*: Merge*.rc
2020 PATCH: [ 1438233 ] New icons for 'notequalfile', 'lfile' and 'rfile'
2021 Src/res: lfile.ico notequalfile.ico rfile.ico
2024 PATCH: [ 1436855 ] Typo in lang files (change pactch to patch)
2025 Src/Languages/*: Merge*.rc
2026 BUG: [ 1440774 ] Test button for file filters enabled for no filter
2027 Fix submitted by Gal Hammer
2028 Src: FileFiltersDlg.cpp
2029 PATCH: [ 1395847 ] Integration with Rational ClearCase
2030 Submitted by Gal Hammer
2031 Src: MainFrm.cpp MainFrm.h Merge.h MergeArgs.cpp MergeDoc.cpp MergeDoc.h
2032 Src/Common: coretools.cpp coretools.h
2035 BUG: [ 1439360 ] Native languages sometimes suppressed in Unicode Build
2036 Add note to CLanguageSelect::GetNativeLanguageNameString
2037 explaining why codepage check is done even for Unicode build.
2038 Src/Common: LanguageSelect.cpp
2041 BUG: [ 1439350 ] Russian language name in LanguageSelect?
2042 Src/Common: LanguageSelect.cpp
2045 PATCH: [ 1435470 ] Remove CTextFile
2047 Deleted Src\Common: textfile.cpp textfile.h
2048 PATCH: [ 1439229 ] Fix CMergeDoc::SanityCheckD not to dereference illegal lines
2049 BUG: [ 1438390 ] Crash when editting the attached files
2051 PATCH: [ 1434007 ] Move source control code out of MainFrm.cpp
2052 Src: MainFrm.cpp MainFrm.h Merge.dsp
2053 New Src: SourceControl.cpp
2056 PATCH: [ 1437758 ] Improve diff selection when selected diff not visible
2057 Src: MergeEditView.cpp MergeEditView.h
2058 PATCH: [ 1431607 ] Fix worddiff highlight error
2060 Src: stringdiffs.cpp
2063 PATCH: [ 1437677 ] Various Updates in German Translation for WinMerge 2.5
2064 Src/Languages/German: MergeGerman.rc
2067 PATCH: [ 1435431 ] Fix GenerateReport lines
2069 Src: DirCmpReport.cpp
2070 PATCH: [ 1395721 ] VS.NET 2003 warning of SEH bug
2072 PATCH: [ 1428686 ] Catalan translation update
2074 Src/Languages/Catalan: MergeCatalan.rc
2075 PATCH: [ 1430321 ] Swedish translation update and feedback on WinMerge 2.5.3.2
2077 Src\Languages\Swedish: MergeSwedish.rc
2078 PATCH: [ 1434270 ] Fix difference counts
2080 Src: DiffWrapper.cpp
2083 PATCH: [ 1435384 ] Add context menu for diff pane
2084 Src: Merge.rc MergeDiffDetailView.cpp MergeDiffDetailView.h resource.h
2085 Src/Languages/*: Merge*.rc
2086 PATCH: [ 1433125 ] Trap errors from filesystem during actions
2087 Src: FileActionScript.cpp
2090 PATCH: [ 1405603 ] New Test dialog for file filters
2091 (Forgot to do all the language resources)
2092 and misc RC file fixes (eg, many fixes in editor proppage)
2093 New: Src/Languages: WinMerge_Resource_Discrepencies.txt
2096 PATCH: [ 1405603 ] New Test dialog for file filters
2097 Src: FileFilterMgr.cpp FileFilterMgr.h FileFiltersDlg.cpp
2098 FileFiltersDlg.h Merge.dsp Merge.rc resource.h
2099 Src new: TestFilterDlg.cpp TestFilterDlg.h
2100 PATCH: [ 1433312 ] Add cvs tags to source files
2101 Src: ByteComparator.cpp SharedFilterDlg.cpp StdAfx.cpp
2102 TestFilterDlg.cpp TestFilterDlg.h ViewableWhitespace.cpp
2103 Src/Common: SortHeaderCtrl.cpp SortHeaderCtrl.h UniFile.cpp
2104 UniFile.h textfile.cpp textfile.h unicoder.cpp unicoder.h
2105 varprop.cpp varprop.h version.cpp version.h
2108 PATCH: [ 1178743 ] Disable lang menu if no additional langs installed
2109 Src: Merge.cpp Merge.h
2110 Src/Common: LanguageSelect.cpp LanguageSelect.h
2113 PATCH: [ 1433931 ] Add comment before isBin checks in DirView
2115 PATCH: [ 1424153 ] Remove VTS_PUI1 from lwdisp.h
2116 BUG: [ 1395475 ] VTS_UI1 & VTSPUI1 macro redefinition warnings (VS.NET)
2117 Src\Common: lwdisp.h
2118 PATCH: [ 1433927 ] Fix external editor default and messages
2119 BUG: [ 1433774 ] default editor is blank
2120 Src: MainFrm.cpp Merge.cpp Merge.rc OptionsInit.cpp resource.h
2121 Src/Languages/*: Merge*.rc
2122 PATCH: [ 1433353 ] Fix menu resources
2123 Src: MainFrm.cpp Merge.cpp Merge.rc resource.h
2124 Src/Languages/*: Merge*.rc
2126 2006-02-19 Christian
2127 PATCH: [ 1429125 ] Return number of diffs instead of true/false
2131 BUG: [ 1395483 ] Signed/unsigned mismatch warning from LocationView.cpp
2132 Src: LocationView.cpp
2135 BUG: [ 1395475 ] VTS_UI1 & VTSPUI1 macro redefinition warnings (VS.NET)
2136 Fixed VTS_PUI1 (which previous patch for this bug missed).
2137 Src\Common: lwdisp.h
2140 PATCH: [ 1424535 ] Czech Translation, Submitted by Jan Hryz
2141 Improve folder compare columns dialog (idea for new arrows from Catalan translation)
2143 Src/Languages/*: Merge*.rc
2146 PATCH: [ 1431771 ] Alter CheckTranslations.vbs to YesNoCancel
2147 Src/Languages: CheckTranslations.vbs
2148 PATCH: [ 1419582 ] Polish translation update for latest v2.5
2149 Contributed by dr_prozac
2150 Src/Languages/Polish: MergePolish.rc
2151 PATCH: [ 1431846 ] Update Czech Translation
2152 Contributed by Jan Hryz
2153 Src/Languages/Czech: MergeCzech.rc
2154 ShellExtension/Languages/ShellExtensionCzech.rc
2155 A few control adjustments matching Czech to English (many left)
2156 Src/Languages/Czech: MergeCzech.rc
2159 PATCH: [ 1431636 ] IgnoreEOL broken in cvs trunk
2160 Src: PropCompare.cpp
2163 PATCH: [ 1431768 ] Write paths to patch files as given
2164 Src: DiffWrapper.cpp
2167 PATCH: [ 1431205 ] Fix ViewWhitespace \r\n bug
2168 BUG: [ 1431012 ] View line differences adds additional EOL char
2169 Src/editlib: ccrystaltextview.cpp
2170 PATCH: [ 1431197 ] Fix off-by-one highlight error
2171 Src: stringdiffs.cpp
2172 Fix button movement on LanguageSelect (broken by PATCH#1423461).
2173 Also add cvs id comment at top, and doxygen file label.
2174 Src\Common: LanguageSelect.cpp
2177 BUG: [ 1197976 ] GeneratePatch file browse not intialized correctly
2178 Fix submitted by Perry
2182 PATCH: [ 1431131 ] Fix VS.NET 2003 compilation
2183 Src\Common: coretools.cpp scbarg.cpp scbarg.h sizecbar.cpp sizecbar.h
2184 Shrink Swedish dialog IDD_PROPPAGE_LARGE to same size as English
2185 (all controls already were the same size anyway)
2186 Src\Languages\Swedish: MergeSwedish.rc
2189 PATCH: [ 1212124 ] File encoding GUI
2190 Src: DiffContext.cpp DiffFileInfo.cpp DiffFileInfo.h DiffItem.cpp
2191 DiffItem.h DiffThread.cpp DiffWrapper.cpp DirActions.cpp
2192 DirScan.cpp DirView.cpp DirView.h DirViewColItems.cpp FileLocation.h
2193 MainFrm.cpp Merge.dsp Merge.rc MergeDoc.cpp MergeDoc.h OpenDlg.cpp
2194 codepage_detect.cpp codepage_detect.h resource.h
2195 NEW Src: FileTextEncoding.cpp FileTextEncoding.h IntToIntMap.h
2196 LoadSaveCodepageDlg.cpp LoadSaveCodepageDlg.h MergeDocEncoding.cpp
2197 dlgutil.cpp dlgutil.h
2200 Adjust whitespace to match English translation
2201 Also update Russian options/editor controls to match English
2202 Src\Languages\Russian: MergeRussian.rc
2203 Src\Languages\Slovak: MergeSlovak.rc
2204 Src\Languages\Swedish: MergeSwedish.rc
2205 Src\Languages\Turkish: MergeTurkish.rc
2206 PATCH: [ 1424681 ] Widen labels on unpacker dialog
2208 Src\Languages: Merge*.rc
2211 PATCH: [ 1429517 ] Fix coretools.cpp compilation (for MakeResDll)
2212 Src/Common: coretools.cpp
2213 PATCH: [ 1427838 ] code cleanup bottom of merge.cpp
2215 Synchronizing Turkish translation to English where feasible.
2216 Src/Languages/Turkish: MergeTurkish.rc
2217 Update Swedish Options/Editor to current English layout
2218 Src/Languages/Swedish: MergeSwedish.rc
2221 PATCH: [ 1428800 ] Fix ListCopy/AllLeft
2222 BUG: [ 1428791 ] All Left gave me a bunch of msgboxes
2223 Src: MergeDoc.cpp MergeDoc.h
2224 PATCH: [ 1428726 ] Fix for compilation under VS2005
2225 Src: BCMenu.cpp DiffWrapper.cpp DirCmpReport.cpp
2226 DirColsDlg.cpp DirViewColHandler.cpp GhostTextBuffer.cpp
2227 MergeArgs.cpp MergeDiffDetailView.cpp MergeDoc.cpp
2229 Src\Common: LanguageSelect.cpp SuperComboBox.cpp UniFile.cpp
2230 coretools.cpp multiformatText.cpp scbarg.cpp scbarg.h
2231 sizecbar.cpp sizecbar.h
2232 Src\editlib: asp.cpp basic.cpp batch.cpp ccrystaltextview.cpp
2233 cplusplus.cpp crystaltextblock.cpp csharp.cpp dcl.cpp
2234 fortran.cpp html.cpp ini.cpp innosetup.cpp is.cpp java.cpp
2235 lisp.cpp nsis.cpp pascal.cpp perl.cpp php.cpp python.cpp
2236 rexx.cpp rsrc.cpp sgml.cpp sh.cpp siod.cpp sql.cpp
2237 tcl.cpp tex.cpp xml.cpp
2238 PATCH: [ 1427563 ] Give descriptive name to CMergeDoc::SaveHelper
2239 Src: MainFrm.cpp MergeDiffDetailView.cpp MergeDoc.cpp
2240 MergeDoc.h MergeEditView.cpp
2241 PATCH: [ 1426593 ] Remove empty CMergeDoc::SetDiffViewMode()
2243 Src: MergeDoc.cpp MergeDoc.h
2245 2006-02-09 WinMerge experimental release 2.5.3.2 (cvs)
2248 PATCH: [ 1427851 ] Small cleanup for FileFilterMgr::AddFilter()
2249 Src: FileFilterMgr.cpp
2250 Add Jan Hryz as Czech translator and contributor
2251 Docs/Users: Contributors.txt
2254 PATCH: [ 1427845 ] Double-click fails to open, no message
2256 BUG: [ 1427956 ] Differences count in Folder Compare wrong?
2257 Make sure to set diff count to 0 just before counting them
2258 Src: DiffWrapper.cpp
2261 PATCH: [ 1426499 ] Move Save Projectfile to File menu
2262 Src: DirDoc.cpp DirDoc.h MainFrm.cpp MainFrm.h Merge.rc MergeDoc.cpp
2263 MergeDoc.h OpenDlg.cpp OpenDlg.h resource.h
2264 Src/Languages/*: Merge*.rc
2267 PATCH: [ 1424884 ] Fix UniStdioFile encoding of TCHAR
2268 BUG: [ 1402379 ] A character display and save error with encoding of unicode
2269 Src\Common: UniFile.cpp unicoder.cpp unicoder.h
2272 Current selftests status: Failure count: 0 (of 756)
2275 PATCH: [ 1426552 ] Add selftests between platform versions
2276 Src: Changes.txt ConfigLog.cpp DiffWrapper.cpp DiffWrapper.h
2277 DirDoc.cpp MainFrm.cpp MergeArgs.cpp MergeDoc.cpp
2278 MergeDocLineDiffs.cpp OptionsDef.h OptionsInit.cpp PatchTool.cpp
2279 PropCompare.cpp PropCompare.h
2280 Src\editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h
2283 Current selftests status: Failure count: 0 (of 588)
2286 PATCH: [ 1424867 ] Fix common prefix code for \r\n
2287 Src\diffutils\src: IO.C
2288 PATCH: [ 1426793 ] Fix diffutils that counts lines in suffix
2289 Src\diffutils\src: IO.C
2292 Current selftests status: Failure count: 0 (of 588)
2295 PATCH: [ 1424535 ] Czech Translation, Submitted by Jan Hryz
2296 Fix dir compare report dialog layout
2298 Src/Languages/*: Merge*.rc
2301 Synchronizing Slovak translation to English where feasible.
2302 Src/Languages/Slovak: MergeSlovak.rc
2303 Synchronizing Swedish translation to English where feasible.
2304 Src/Languages/Swedish: MergeSwedish.rc
2305 PATCH: [ 1392413 ] Track lossy encodings & warn user
2306 Src: FileFilterMgr.cpp Merge.rc MergeDoc.cpp files.h resource.h
2307 Src/Common: UniFile.cpp UniFile.h unicoder.cpp
2308 PATCH: [ 1392413 ] Track lossy encodings & warn user
2309 Src/Languages/*: Merge*.rc
2312 PATCH: [ 1414201 ] Cleanup Merge Line Flags
2313 Src: LocationView.cpp Merge.dsp MergeDiffDetailView.cpp MergeDoc.cpp
2314 MergeEditView.cpp MergeEditView.h
2315 NEW Src: MergeLineFlags.h
2318 PATCH: [ 1424264 ] Use 'Item' instead of file in View-menu
2320 Src/Language: */Merge*.rc
2323 Fix Italian Edit/Options/Editor line selection controls.
2324 Src/Languages/Italian/MergeItalian.rc
2325 PATCH: [ 1414904 ] updated italian translation for winmerge 2.5.3.1
2326 Submitted by A. Decorte
2327 New updates for selecting current diffs and wrap lines.
2328 Src/Languages/Italian/MergeItalian.rc
2331 BUG: [ 1422257 ] Wrong text in tooltip
2332 (Dutch translation had wrong shortcut keys in tooltip)
2333 Src/Languages/Dutch/MergeDutch.rc
2334 PATCH: [ 1424535 ] Czech Translation
2335 Submitted by Jan Hryz
2336 Src/Languages/Czech/MergeCzech.rc
2339 PATCH: [ 1424142 ] Wrap two lwdisp macros in ifndef
2340 Src/Common: lwdisp.h
2341 Undo PATCH: [ 1424142 ] Wrap two lwdisp macros in ifndef
2342 Src/Common: lwdisp.h
2343 BUG: [ 1383052 ] warning C4005: 'COMPILE_MULTIMON_STUBS' : macro redefinition
2344 (Wrap multimon def with ifndef
2346 PATCH: [ 1423461 ] Rearrange language select dialog
2347 Revise patch applied earlier: put Ok on left and Cancel on right.
2348 (Also fix French dialog which was left out before.)
2350 Src/Languages: */Merge*.rc
2351 PATCH: [ 1421199 ] Fix plugin menu for when location or diff detail view active
2352 Src: ChildFrm.cpp ChildFrm.h MainFrm.cpp MainFrm.h MergeDoc.cpp MergeDoc.h
2353 PATCH: [ 1414904 ] updated italian translation for winmerge 2.5.3.1
2354 Submitted by A. Decorte
2355 Src/Languages/Italian: MergeItalian.rc
2356 PATCH: [ 1423907 ] Fix diffutils hashing of \r
2357 Src/diffutils: IO.C UTIL.C
2358 Current selftests status: Failure count: 0 (of 480)
2359 Created branch "R_diffutils_branch"
2362 PATCH: [ 1409651 ] fix diffutils handling trailing whitespace
2363 Src/diffutils/src: IO.C UTIL.C
2364 Current selftests status: Failure count: 24 (of 480)
2365 Failing -b t002 (u & m platforms, all 4 builds)
2366 Failing -bi t002 (u & m platforms, all 4 builds)
2367 Failing -b bug1406950 (u & m platforms, all 4 builds)
2370 PATCH: [ 1423060 ] Modify perl selftest to test all 4 builds
2372 Current selftests status: Failure count: 36 (of 480)
2373 Failing -b t002 (all 3 platforms, all 4 builds)
2374 Failing -bi t002 (all 3 platforms, all 4 builds)
2375 Failing -b bug1406950 (all 3 platforms, all 4 builds)
2376 PATCH: [ 1421694 ] Widen comments label in Rational ClearCase dialog
2378 Src/Languages: */Merge*.rc
2379 PATCH: [ 1423461 ] Rearrange language select dialog
2380 Src: MainFrm.cpp MainFrm.h Merge.rc OpenDlg.cpp OpenDlg.h
2381 Src/Common: LanguageSelect.cpp LanguageSelect.h
2382 Src/Languages: */Merge*.rc
2385 PATCH: [ 1422052 ] Correction of Swedish for 2.5.3.1+
2386 Contributed by Hans Eriksson
2387 Src/Languages/Swedish: Merge Swedish
2390 PATCH: [ 1412386 ] Adding readme files
2391 New WinMerge/readme.txt
2392 (Various other directories affected -- readme.txt & Changes.txt files)
2395 PATCH: [ 1419329 ] Select Line Difference
2396 Src: Merge.rc MergeDiffDetailView.cpp MergeDiffDetailView.h MergeEditView.cpp
2397 MergeEditView.h resource.h
2398 Src/Language: */Merge*.rc
2401 BUG: [ 1419317 ] link error on 8-bit cvs trunk
2402 Add HtmlHelp.lib to link lines MergeRelease, MergeDebug, MergeUnicodeRelease.
2404 PATCH: [ 1419582 ] Polish translation update for latest v2.5
2405 Contributed by dr_prozac
2406 Src/Languages/Polish: MergePolish.rc
2407 PATCH: [ 1421018 ] Fix handle leak in GetOpenFileName
2408 BUG: [ 1418765 ] 2.4.4.0U maintain opened a handle on folders
2409 Adds new method paths_GetWindowsDirectory & resets current
2410 directory to WINDIR after GetOpenFileName call
2411 Src: MainFrm.cpp OpenDlg.cpp paths.cpp paths.h
2412 Cosmetic: synchronizing whitespace to English version
2413 Src/Languages/*: MergeTurkish.rc MergeSwedish.rc MergeSpanish.rc
2414 Cosmetic: synchronizing whitespace to English version
2415 Src/Languages/*: MergePolish.rc
2416 Updating Polish dialog control layout to English (except where
2417 would hinder appearance)
2418 Src/Languages/*: MergePolish.rc
2421 PATCH: [ 1419171 ] Various Updates in German Translation for WinMerge 2.5
2422 Src/Languages/German: MergeGerman.rc
2425 PATCH: [ 1415895 ] Split cmdline help string into chunks
2426 Src: Merge.cpp Merge.h Merge.rc MergeArgs.cpp resource.h
2427 Src/Languages: */*.rc
2430 PATCH: [ 1414904 ] updated italian translation for winmerge 2.5.3.1
2431 Submitted by A. Decorte
2432 InnoSetup\Languages: Italian.isl
2433 PATCH: [ 1415165 ] Updated Swedish translation for 2.5.3.1+
2434 Submitted by Hans Eriksson
2435 Src\Languages\Swedish: MergeSwedish.rc
2436 PATCH: [ 1414195 ] Delete two old TODO notes
2438 PATCH: [ 1414196 ] Delete useless CChildFrame::OnNotify method
2439 Src: ChildFrm.cpp ChildFrm.h
2440 PATCH: [ 1414199 ] Fix outdated comment on DirView.cpp :: NumToStr
2444 PATCH: [ 1413230 ] Use HtmlHelp API to open help
2445 Src: MainFrm.cpp Merge.dsp
2448 BUG: [ 1412237 ] InitOption return value wrong if RegCreateKey fails
2449 Fix unused wrong return value of InitOption & improve one comment
2450 Src/Common: OptionsMgr.cpp
2451 BUG: [ 1414868 ] Bug in byte_compare (early finish)
2452 (Also added some comments.)
2453 Src: DiffWrapper.cpp
2455 2006-01-24 WinMerge experimental release 2.5.3.1 (cvs)
2458 PATCH: [ 1406840 ] Use HTMLHelp locally
2460 PATCH: [ 1411727 ] Merge inactive diff when cursor is inside it
2461 Src: MergeDoc.cpp MergeDoc.h MergeEditView.cpp MergeEditView.h
2464 Add repro files to selftests from
2465 BUG [ 1406950 ] QuickCompare vs diffutils, disagree on trailing whitespace
2466 Current selftests status: Failure count: 9 (of 108)
2467 Failing -b t002 (all 3 platforms)
2468 Failing -bi t002 (all 3 platforms)
2469 Failing -b bug1406950 (all 3 platforms)
2470 PATCH: [ 1406950 ] QuickCompare vs diffutils, disagree on trailing whitespace
2471 Src: ByteComparator.cpp
2472 (selftests results unimproved, because selftest uses diffutils core, not QuickCompare)
2475 PATCH: [ 1405540 ] Cleanup filters dialog
2476 Src: FileFiltersDlg.cpp FileFiltersDlg.h
2479 PATCH: [ 1411102 ] Add '*.dsl' and '*.jsp' to syntax highlighter
2480 Src/editlib: ccrystaleditview.cpp
2483 PATCH: [ 1411406 ] self-tests and new arguments and new diff2winmerge.exe
2484 Src: Changes.txt MainFrm.cpp MainFrm.h Merge.cpp Merge.h MergeArgs.cpp
2485 Src/Common: OptionsMgr.cpp OptionsMgr.h
2486 New directory WinMerge/diff2winmerge, for diff2winmerge utility
2487 New directory WinMerge/selftests added
2488 Current selftests status: Failure count: 6 (of 108)
2489 Failing -b t002 (all 3 platforms)
2490 Failing -bi t002 (all 3 platforms)
2493 PATCH: [ 1411150 ] Add GetActiveMergeView for MergeDoc
2494 Src: MergeDoc.cpp MergeDoc.h
2497 PATCH: [ 1407740 ] Polish translation update (for version 2.4.4.0)
2498 Submitted by dr_prozac
2499 (Perry merging many of these to cvs trunk)
2500 Src/Language/Polish: MergePolish.rc
2503 BUG: [ 1408587 ] Unused DoScroll() function in Merge*View
2504 Remove DoScroll() from CMergeEditView and CMergeDiffDetailView
2505 Src: MergeDiffDetailView.cpp MergeDiffDetailView.h MergeEditView.cpp
2509 PATCH: [ 1406207 ] Fix error message for unique folders
2510 Src: DirView.cpp Merge.rc resource.h
2511 Src/Language: */Merge*.rc
2514 PATCH: [ 1401711 ] A hybrid of word diff and char diff
2515 Submitted by Takashi Sawanaka
2516 Src: MergeDocLineDiffs.cpp PropEditor.cpp
2517 stringdiffs.cpp stringdiffs.h
2520 PATCH: [ 1406203 ] Open unique files to external editor
2521 Src: DirView.cpp Merge.rc resource.h
2522 Src/Language: */Merge*.rc
2525 PATCH: [ 1333600 ] Get rid of global MainFrame pointer (part1)
2526 Src: DirActions.cpp DirDoc.cpp DirView.cpp FileActionScript.cpp
2527 MainFrm.cpp MainFrm.h Merge.cpp MergeDoc.cpp MergeEditView.cpp
2528 OpenDlg.cpp PropRegistry.cpp
2529 Src\Common: PreferencesDlg.cpp
2532 PATCH: [ 1403457 ] Support Unicode file filter files
2533 Src: FileFilterMgr.cpp
2536 PATCH: [ 1372044 ] Add FileActionScript for folder compare actions
2537 Src: DirActions.cpp DirView.h Merge.dsp
2538 Src new files: FileActionScript.cpp FileActionScript.h
2539 PATCH: [ 1385672 ] Replace some 'file's with 'item's
2541 Src/Language: */Merge*.rc
2542 PATCH: [ 1405340 ] Add XP shadow to folderskip.ico
2544 Src/res: folderskip.ico
2547 TODO: [ 1395638 ] CChildFrame::PreCreateWindow() does nothing
2548 Src: ChildFrm.cpp ChildFrm.h MainFrm.cpp
2551 PATCH: [ 1403454 ] Add comment to UniStdioFile.h
2553 Src/Common: UniFile.h
2554 PATCH: [ 1403893 ] Fix whitespace error in ByteCompare
2555 BUG: [ 1400779 ] Whitespace bug in ByteComparator
2556 Src: ByteComparator.cpp
2559 PATCH: [ 1039677 ] Alter text of Reset button label
2561 Src/Language: */Merge*.rc
2564 PATCH: [ 1399263 ] Captioned panes (new style)
2565 Src: ChildFrm.cpp DiffViewBar.h LocationBar.h Merge.dsp Merge.rc resource.h
2566 Src/Common new files: scbarcf.cpp scbarcf.h
2567 Src/Language: */Merge*.rc
2568 PATCH: [ 1399738 ] Filename bars to use caption colors
2569 Src: ChildFrm.cpp FilePathEdit.cpp FilePathEdit.h
2572 PATCH: [ 1403412 ] German: Option 'Line Difference Coloring' looks broken
2573 Src/Languages/German: MergeGerman.rc
2575 2006-01-11 WinMerge beta release 2.5.2
2578 PATCH: [ 1402774 ] Use dark red color for 'binarydiff.ico'
2580 Src/res: binarydiff.ico
2581 PATCH: [ 1400845 ] Allow Shift+Ctrl+F3 to search selected text backwards
2582 With addition from Takashi for Shift+F3 backwards search
2584 Src/editlib: ccrystaltextview.cpp
2585 Src/Language: */Merge*.rc
2586 BUG: [ 1400829 ] Crash trying to open location pane context menu
2587 Src: LocationView.cpp
2590 PATCH: [ 1401420 ] New 'MergeDir' icon
2591 Src/res: MergeDir.ico
2594 PATCH: [ 1400830 ] Fix drop to only do LoadProjectFile when 1 file dropped
2595 BUG: [ 1400797 ] Dropping two project files doesn't work to compare them
2596 (Also fixes extension test to be case-sensitive)
2600 BUG: [ 1396222 ] CDirView::MoveSelection() is confused
2601 (Rename MoveSelection to MoveFocus & add more commenting)
2602 Src: DirActions.cpp DirView.cpp DirView.h
2605 PATCH: [ 1398064 ] Catalan translation update
2607 Src/Languages/Catalan: MergeCatalan.rc
2608 PATCH: [ 1398959 ] Implement GuessEncoding in QuickCompare
2609 Src: codepage_detect.cpp DiffWrapper.cpp DiffWrapper.h
2611 2006-01-05 WinMerge experimental release 2.5.0.5 (cvs)
2614 PATCH: [ 1393635 ] Save pane sizes and positions when they change
2615 Src: ChildFrm.cpp ChildFrm.h DiffViewBar.cpp DiffViewBar.h LocationBar.cpp
2616 LocationBar.h LocationView.cpp LocationView.h MergeDiffDetailView.cpp
2617 MergeDiffDetailView.h StdAfx.h
2618 PATCH: [ 1396413 ] Update Open dialog controls when its activated
2619 Src: OpenDlg.cpp OpenDlg.h
2622 Cosmetic; normalizing blank lines to agree with English Merge.rc
2624 Brazilian\MergeBrazilian.rc
2625 ChineseSimplified\MergeChineseSimplified.rc
2626 Korean\MergeKorean.rc
2627 Norwegian\MergeNorwegian.rc
2630 PATCH: [ 1394877 ] Find selected text with Ctrl+F3
2632 Src/editlib: ccrystaltextview.cpp
2633 Src/Language: */Merge*.rc
2634 PATCH: [ 1395584 ] Update CSizingControlBar to latest version
2635 Src: DiffViewBar.cpp DiffViewBar.h LocationBar.cpp LocationBar.h Merge.dsp StdAfx.h
2636 Src/Common: sizecbar.cpp sizecbar.h
2637 Src/Common new files: scbarg.cpp scbarg.h
2638 Src/Common deleted files: sizecbarg.cpp sizecbarg.h
2639 PATCH: [ 1383262 ] Fix bitmap leak in ShellExtension
2640 Also bump version number to 1.7.1
2642 ShellExtension: ShellExtension.rc WinMergeShell.cpp WinMergeShell.h
2645 PATCH: [ 1390104 ] fix for BUG: [ 1384069 ] Wrapped lines have incorrect column
2646 Src: MergeEditView.cpp
2647 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
2650 BUG: [ 1390849 ] cvs trunk MergeChineseSimplified doesn't compile
2651 Src/Languages: ChineseSimplified: MergeChineseSimplified.rc
2652 PATCH: [ 1212161 ] Fix handling of \r\n in ByteComparator
2653 Src: ByteComparator.cpp
2656 PATCH: [ 1383802 ] Cleanup line difference options in Editor-options
2657 Src: Merge.rc PropEditor.cpp PropEditor.h resource.h
2658 PATCH: [ 1383802 ] Cleanup line difference options in Editor-options
2660 Src/Language: */Merge*.rc
2661 PATCH: [ 1391550 ] vbs script to check & optionally merge WinMerge resources
2662 Src: new CheckTranslations.vbs
2665 PATCH: [ 1395474 ] Define WINVER for compiling with VS.net
2667 PATCH: [ 1395018 ] Small cleanup for CMergeDoc::PrimeTextBuffers()
2668 Src: DiffList.cpp DiffList.h MergeDoc.cpp
2671 PATCH: [ 1395487 ] Unused local variable in UniStdioFile::DoOpen()
2672 (Delete unused variable)
2673 Src/Common: UniFile.cpp
2674 BUG: [ 1395497 ] Unused local variables in CMergeDoc::GetWordDiffArray()
2675 (Delete unused variables)
2676 Src: MergeDocLineDiffs.cpp
2677 BUG: [ 1395494 ] stringdiffs.cpp / LastChar() returning uninitialized value?
2678 Src: stringdiffs.cpp
2681 Remove unused variable from VSSHelper.cpp/VSSHelper::ReLinkVCProj()
2685 PATCH: [ 1392647 ] Prefix members with m_ in storage_for_plugins
2686 Src/Common: multiformatText.cpp multiformatText.h
2687 PATCH: [ 1394717 ] Fix resource.h include for translations
2688 Src/Languages: */Merge*.rc
2689 Src/Languages deleted: UpdateAll_resource_h.bat
2690 Src/Languages deleted: */resource.h (localized versions of resource.h)
2691 BUG: [ 1395107 ] MergeKorean.rc not compile in cvs trunk
2692 (resource.h => ..\..\resource.h fix missed Korean somehow)
2693 Src/Languages/Korean: MergeKorean.rc
2694 PATCH: [ 1394073 ] Fix ByteComparator: m_bol0
2695 (Change in ByteComparator.h is cosmetic typo fix in comment)
2696 (Fixes some bad tabbing as well)
2697 Src: ByteComparator.cpp ByteComparator.h
2700 PATCH: [ 1394759 ] Allows quotes in Rational ClearCase checkout comment
2701 Submitted by Gal Hammer
2703 Add Gal Hammer to contributors list
2704 Docs/Users: Contributors.txt
2707 BUG: [ 1394857 ] cvs trunk does not compile, ANSI, FindEncodingIdFromNameOrAl
2708 Src: codepage_detect.cpp
2711 PATCH: [ 1392347 ] Fix status after synching unique binary files
2713 PATCH: [ 1394464 ] Find again code doesn't recognize dos/mac EOLs
2714 Src/editlib: ccrystaltextview.cpp
2715 BUG: [ 1394851 ] cvs trunk does not compile (DirScan.cpp, sRule)
2719 PATCH: [ 1394247 ] Fix GuessEncoding recognition of codepages
2720 BUG: [ 1394234 ] GuessEncodings fails to recognize CP-437
2721 Src: codepage_detect.cpp
2722 PATCH: [ 1393979 ] Delete unused DiffWrapper fnc cleanup_script
2723 Src: DiffWrapper.cpp
2726 PATCH: [ 1391732 ] Do not offer to unify codepages in UNICODE build
2727 Also introduces new error IDS_DIFFERENT_UNICODINGS and new
2728 global function IsUnicodeBuild.
2730 Doing language synchronizations for this patch.
2732 Languages\Brazilian\MergeBrazilian.rc
2733 Languages\Bulgarian\MergeBulgarian.rc
2734 Languages\Catalan\MergeCatalan.rc
2735 Languages\ChineseSimplified\MergeChineseSimplified.rc
2736 Languages\ChineseTraditional\MergeChineseTraditional.rc
2737 Languages\Czech\MergeCzech.rc
2738 Languages\Danish\MergeDanish.rc
2739 Languages\Dutch\MergeDutch.rc
2740 Languages\German\MergeGerman.rc
2741 Languages\Hungarian\MergeHungarian.rc
2742 Languages\Italian\MergeItalian.rc
2743 Languages\Japanese\MergeJapanese.rc
2744 Languages\Korean\MergeKorean.rc
2745 Languages\Norwegian\MergeNorwegian.rc
2746 Languages\Polish\MergePolish.rc
2747 Languages\Russian\MergeRussian.rc
2748 Languages\Slovak\MergeSlovak.rc
2749 Languages\Spanish\MergeSpanish.rc
2750 Languages\Swedish\MergeSwedish.rc
2751 Languages\Turkish\MergeTurkish.rc
2752 PATCH: [ 1212368 ] Display correct paths in context patches
2754 Revising patched code, removing unneeded dispname added when patch applied
2755 Src: DiffWrapper.cpp
2756 diffutils\src: CONTEXT.C DIFF.H
2757 PATCH: [ 1393239 ] Split functions out of RunFileDiff
2758 Src: DiffWrapper.cpp DiffWrapper.h
2759 PATCH: [ 1392229 ] Fix Column item handling
2760 Src: DirView.h DirViewColHandler.cpp DirViewColItems.cpp
2764 PATCH: [ 1390774 ] Rename CRegOptions to CRegOptionsMgr
2765 Docs\Developers: Options.html
2766 Src\Common: OptionsMgr.cpp OptionsMgr.h
2767 Src: FileTransform.cpp MainFrm.cpp MainFrm.h SyntaxColors.cpp
2768 SyntaxColors.h codepage.h
2769 PATCH: [ 1392650 ] Fix locals of CDiffWrapper::RunFileDiff
2770 Src: DiffWrapper.cpp DiffWrapper.h MergeDoc.cpp PatchTool.cpp
2771 PATCH: [ 1392729 ] Cleanup variables in RunFileDiff
2772 Src: DiffWrapper.cpp
2773 BUG: [ 1369646 ] Confusing half-commented lines in DiffFileData::prepAndCompa
2774 Src: DiffWrapper.cpp
2775 BUG: [ 1392740 ] Clutter in debug output
2777 PATCH: [ 1391766 ] Sync language resources to English
2779 Languages\Brazilian\MergeBrazilian.rc
2780 Languages\Bulgarian\MergeBulgarian.rc
2781 Languages\Catalan\MergeCatalan.rc
2782 Languages\ChineseSimplified\MergeChineseSimplified.rc
2783 Languages\ChineseTraditional\MergeChineseTraditional.rc
2784 Languages\Czech\MergeCzech.rc
2785 Languages\Danish\MergeDanish.rc
2786 Languages\Dutch\MergeDutch.rc
2787 Languages\German\MergeGerman.rc
2788 Languages\Hungarian\MergeHungarian.rc
2789 Languages\Italian\MergeItalian.rc
2790 Languages\Japanese\MergeJapanese.rc
2791 Languages\Korean\MergeKorean.rc
2792 Languages\Norwegian\MergeNorwegian.rc
2793 Languages\Polish\MergePolish.rc
2794 Languages\Russian\MergeRussian.rc
2795 Languages\Slovak\MergeSlovak.rc
2796 Languages\Spanish\MergeSpanish.rc
2797 Languages\Swedish\MergeSwedish.rc
2798 Languages\Turkish\MergeTurkish.rc
2799 PATCH: [ 1212368 ] Display correct paths in context patches
2800 Src: DiffWrapper.cpp DiffWrapper.h
2801 diffutils\src: CONTEXT.C DIFF.H
2802 PATCH: [ 1390454 ] new commandline arguments (prediffer, ignorews...)
2803 Src: ConfigLog.cpp DirDoc.cpp DirDoc.h FileTransform.cpp
2804 MainFrm.cpp MainFrm.h Merge.cpp Merge.dsp Merge.h
2805 MergeEditView.cpp MergeEditView.h
2806 PluginManager.cpp PluginManager.h Plugins.cpp Plugins.h
2808 Src New files: MergeArgs.h MergeArgs.cpp
2809 Src/Common: CmdArgs.cpp CmdArgs.h OptionsMgr.cpp OptionsMgr.h
2812 PATCH: [ 1391732 ] Do not offer to unify codepages in UNICODE build
2813 Also introduces new error IDS_DIFFERENT_UNICODINGS and new
2814 global function IsUnicodeBuild.
2815 Src: ConfigLog.cpp MainFrm.cpp Merge.rc resource.h StdAfx.cpp StdAfx.h
2818 PATCH: [ 1390793 ] New global function GetOptionMgr
2819 Src: DirActions.cpp DirDoc.cpp DirView.cpp DirViewColHandler.cpp
2820 LocationView.cpp MainFrm.cpp MainFrm.h MergeDiffDetailView.cpp
2821 MergeDoc.cpp MergeEditView.cpp OpenDlg.cpp
2822 Src/Common: OptionsMgr.h
2825 PATCH: [ 1382130 ] New line-based RCLocalizationHelper
2829 PATCH: [ 1388704 ] Simplified Chinese language .rc file for RC1
2830 Src/Languages/ChineseSimplified: MergeChineseSimplified.rc
2831 Update language versions of resource.h
2832 Src/Languages/*: resource.h
2835 Update & synchronize translations: Danish Dutch French Hungarian Italian Japanese
2838 Danish: MergeDanish.rc
2839 Dutch: MergeDutch.rc
2840 French: MergeFrench.rc
2841 Hungarian: MergeHungarian.rc
2842 Italian: MergeItalian.rc
2843 Japanese: MergeJapanese.rc
2844 Remove needless cast
2845 Src/Common: unicoder.cpp
2846 Update & synchronize translations: Korean Norwegian Polish Russian
2849 Korean: MergeKorean.rc
2850 Norwegian: MergeNorwegian.rc
2851 Polish: MergePolish.rc
2852 Russian: MergeRussian.rc
2855 PATCH: [ 1388456 ] Convert rest of folder compare bitmaps to icons
2856 Icons from Tim (Thanks!)
2857 Src: CompareStatisticsDlg.cpp DirView.cpp Merge.dsp Merge.rc resource.h
2858 Src/res added files: binarydiff.ico equalbinary.ico equalfile.ico error.ico
2859 fileskip.ico folderup.ico folderup_disable.ico lfile.ico notequalfile.ico
2860 rfile.ico sigma.ico unknown.ico
2861 Src/res removed files: binary.bmp binarydiff.bmp error.bmp fileskip.bmp
2862 folderup.bmp folderup_disable.bmp lfile.bmp notequal.bmp rfile.bmp
2863 sigma.bmp unknown.bmp
2864 Src/Languages: *.rc resource.h
2866 2005-12-21 WinMerge experimental release 2.5.0.4 (cvs)
2869 BUG: [ 1385518 ] Batch file syntax highlighting weirdness
2871 Src/editlib: batch.cpp
2872 PATCH: [ 1387297 ] Swedish translation update for 2.5.0.3+
2873 Submitted by Hans Eriksson
2874 Src/Languages/Swedish: MergeSwedish.rc
2877 PATCH: [ 1386442 ] Local variable uses m_ prefix in CChildFrame
2881 PATCH: [ 1384646 ] Replace Question icons with warning icons in messageboxes
2882 Src: DirActions.cpp FileFiltersDlg.cpp MainFrm.cpp MergeDoc.cpp PatchDlg.cpp
2885 PATCH: [ 1383120 ] Fix background colors in WinMerge
2886 Src: SyntaxColors.cpp SyntaxColors.h
2887 Src/Common: OptionsMgr.cpp OptionsMgr.h
2888 PATCH: [ 1384181 ] Fix byte difference fencepost/infinite loop
2889 Src: CompareOptions.h ConfigLog.cpp DiffWrapper.cpp DiffWrapper.h
2890 Merge.dsp PatchDlg.cpp stringdiffs.cpp
2893 BUG: [ 1379277 ] typo fix for docs
2894 Docs/Developers: Plugins.html
2895 BUG: [ 1375661 ] Readme incomplete in WinMerge 2.5.0.3
2896 Docs/Users: ReadMe.txt
2897 PATCH: [ 1382966 ] Remove empty CMergeEditView::AddMod() and ResetMod()
2898 Src: MergeEditView.cpp MergeEditView.h
2901 PATCH: [ 1378771 ] Fix for BUG:[ 1376552 ] char offset not getting updated when...
2902 Src: ChildFrm.cpp MergeEditView.cpp
2905 PATCH: [ 1378795 ] The searched word is not highlighted correctly
2906 Src/editlib: ccrystaltextview.cpp
2909 PATCH: [ 1382955 ] Remove unused CompareStats.h include from DirFrame.cpp
2911 PATCH: [ 1376711 ] Change CFile::GetStatus to paths_DoesPathExist
2912 Src: files.cpp MainFrm.cpp MainFrm.h Merge.cpp MergeDoc.cpp OpenDlg.cpp
2914 Src/Common: coretools.cpp
2917 PATCH: [ 1381984 ] Folder compare progressdialog could be drawn off-screen
2918 Src: DirCompProgressDlg.cpp
2921 PATCH: [ 1380083 ] Fix EditBinaryFiles Plugin BuildTmp paths
2922 Plugins\src_VCPP\EditBinaryFiles: EditBinaryFiles.dsp
2925 PATCH: [ 1381975 ] Don't open Open-dialog outside screen
2926 Src: MainFrm.cpp OpenDlg.cpp
2927 Src removed file: multimon.h
2930 BUG: [ 1380019 ] Bulgarian translation has wrong language id
2931 Src/Languages/Bulgarian: MergeBulgarian.rc
2932 PATCH: [ 1382131 ] English rc file has numbers instead of symbols for language
2934 PATCH: [ 1379227 ] Fix ExpatLibs BuildTmp paths
2935 Src/ExpatLib: expat_static.dsp
2936 Src/ExpatMapLib: expat_maps_static.dsp
2937 PATCH: [ 1379228 ] Fix Merge7zInstaller BuildTmp paths
2938 Merge7zInstaller: Merge7zInstaller.dsp
2941 PATCH: [ 1381935 ] Simplify DirView icon loading
2945 BUG: [ 1382021 ] Merge7z432 missing?
2946 Merge7z new files: Merge7z431.dsp Merge7z432.dsp
2949 PATCH: [ 1188787 ] New Chinese translation rc file (from PATCH 1183476)
2950 Some more synchronizing from submitted patch
2951 Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
2952 PATCH: [ 1379226 ] Fix Display Plugins BuildTmp paths
2954 PATCH: [ 1188787 ] New Chinese translation rc file (from PATCH 1183476)
2955 Last updates from submitted patch
2956 Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
2957 BUG: [ 1381879 ] Unused variable in unicoder.cpp
2958 Src/common: unicoder.cpp
2961 Update & synchronize translations: ChineseTraditional Czech Danish Dutch
2963 ChineseTraditional: MergeChineseTraditional.rc
2964 Czech: MergeCzech.rc
2965 Danish: MergeDanish.rc
2966 Dutch: MergeDutch.rc
2967 Update & synchronize translations: French German Hungarian Italian Japanese
2969 French: MergeFrench.rc
2970 German: MergeGerman.rc
2971 Hungarian: MergeHungarian.rc
2972 Italian: MergeItalian.rc
2973 Japanese: MergeJapanese.rc
2976 PATCH: [ 1379894 ] Fix handling of unknown encoding
2978 Src/Common: unicoder.cpp
2979 Update & synchronize translations: Brazilian Bulgarian Catalan ChineseSimplified
2981 Brazilian: MergeBrazilian.rc
2982 Bulgarian: MergeBulgarian.rc
2983 Catalan: MergeCatalan.rc
2984 ChineseSimplified: MergeChineseSimplified.rc
2987 PATCH: [ 1378174 ] Share Src/res between translations
2989 Src/Languages/res: removed .bmp .cur and .ico files and WinMergeSplash.psd
2990 splash1.bmp and splash WinMergeSplash.psd not removed from Catalan
2993 PATCH: [ 1377545 ] Remove needless casts
2996 PATCH: [ 1372549 ] readme for Merge7z distributables
3000 PATCH: [ 1371994 ] Enable hi-color icons for folder compare
3001 Icons from Tim (Thanks!)
3002 Src: CompareStatisticsDlg.cpp DirView.cpp Merge.rc resource.h
3003 res new files: folder.ico folderskip.ico lfolder.ico rfolder.ico
3004 res deleted files: folder.bmp folderskip.bmp lfolder.bmp rfolder.bmp
3005 Src/Languages: *.rc resource.h
3006 Src/Languages/res: new and deleted files like in res above
3009 PATCH: [ 1371384 ] Move Expat maps into WinMerge src
3010 Plugins\src_VCPP\DisplayXMLFiles: DisplayXMLFiles.dsp
3011 Src\ExpatMapLib added
3012 Many files moved from DisplayXMLFiles to new ExpatMapLib
3013 PATCH: [ 1373020 ] Carry unicoding, codepage, & file path together
3014 & PATCH: [ 1377545 ] Remove needless casts
3015 Src: DiffWrapper.cpp DiffWrapper.h DirScan.cpp DirView.cpp
3016 MainFrm.cpp MainFrm.h Merge.dsp MergeDoc.cpp MergeDoc.h
3017 Src\Common: RegKey.cpp
3018 NEW Src\FileLocation.h
3021 PATCH: [ 1188787 ] New Chinese translation rc file (from PATCH 1183476)
3022 Remainder of dialogs
3023 Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
3024 BUG: [ 1376825 ] infinite loop bug in byte diffs
3025 Src: stringdiffs.cpp
3026 PATCH: [ 1188787 ] New Chinese translation rc file (from PATCH 1183476)
3027 A few string resources
3028 Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
3029 PATCH: [ 1249007 ] Short size column
3030 Src: DirViewColItems.cpp locality.cpp locality.h Merge.rc resource.h
3031 PATCH: [ 1377362 ] Fix coretools to MakeResDll compiles
3032 BUG: [ 1377361 ] MakeResDll broken b/c coretools broken
3033 Src/Common: coretools.cpp
3036 PATCH: [1374728 ] Fix filter dialog delete
3037 Src: FileFilterMgr.cpp
3040 PATCH: [ 1374782 ] fix for bug 1300957 Crash on save 'unique' file comparison
3041 Submitted by Oliver Mellet, some additional comment improvements by me.
3043 Takashi is now developer, Olivier Mellet submitted a patch
3044 Docs/Users: Contributors.txt
3047 PATCH: [ 1376457 ] Need clarification in platform test in ShellExtension
3048 ShellExtension: ShellExtension.cpp
3051 fix two-line-end-markers bug that was reported in:
3052 "PATCH: [ 1372716 ] patch for RFE:[ 922992 ] Word Wrap/split long lines"
3053 Src: stringdiffs.cpp
3056 PATCH: [ 1372716 ] patch for RFE:[ 922992 ] Word Wrap/split long lines
3057 Src: Merge.rc MergeDoc.cpp MergeEditView.cpp MergeEditView.h OptionsDef.h
3058 OptionsInit.cpp resource.h
3059 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h ccrystaltextview2.cpp
3060 crystalparser.cpp editcmd.h
3061 Src/Languages: *.rc resource.h
3064 PATCH [ 1374931 ] Bugfixes & upload binary for RCLocalizationHelper
3065 (RCLocalizationHelper plugin)
3068 PATCH [ 1372575 ] Fix link for DisplayXmlFiles plugin
3069 (DisplayXMLFiles plugin)
3070 TODO [ 1341058 ] ToDoDeleteThisValidateColumnOrdering()
3071 Src: DirView.cpp DirView.h DirViewColHandler.cpp
3073 2005-12-06 WinMerge experimental release 2.5.0.3 (cvs)
3076 PATCH: [ 1372589 ] Document tildas in config
3079 PATCH: [ 1373037 ] Fix filter dialog to correctly add new filters
3081 Src: FileFiltersDlg.cpp
3082 PATCH: [ 1370183 ] ShellExtension: better way to check for WinMerge executable
3083 ShellExtension: WinMergeShell.cpp
3084 Bump ShellExtension version to 1.7.0
3085 ShellExtension: ShellExtension.rc
3088 PATCH: [ 1372974 ] Make local function "GuessEncoding_from_bytes" static
3089 Src: codepage_detect.cpp
3090 PATCH: [ 1368762 ] Fix assignment in DirScan_GetItems
3091 Also add explanatory comment, for what variable does.
3095 CMarkdown::FileImage::GuessByteOrder(), GuessCodepageEncoding(): Fix UTF-8 signature detection
3096 CMarkdown::GetTagName(): Strip bogus trailing slash in name of empty tag
3097 Src: markdown.cpp codepage_detect.cpp
3100 PATCH: [ 1335128 ] Ignore uninstalled codepages
3101 Src: MergeDoc.cpp MergeDoc.h codepage.cpp codepage_detect.cpp
3102 Src/Common: unicoder.cpp
3105 PATCH: [ 1358408 ] Import and export for options
3106 Increase buffer size
3107 Src/Common: OptionsMgr.cpp
3110 PATCH: [ 1369660 ] Delete unused variables m_msgUpdateStatus
3112 Src: DirDoc.cpp DiffContext.cpp DiffContext.h DiffThread.cpp
3116 PATCH: [ 1369657 ] Delete unused variable DiffFuncStruct::msgStatusUpdate
3118 BUG: [ 1369856 ] Crashed when interface language is changed
3120 BUG: [ 1368755 ] Want comment on format line in 7ZCommon.cpp
3121 Cosmetic: adding explanatory comment to Merge7z::Proxy::operator->
3125 PATCH: [ 1369544 ] Catalan translation update
3126 Submitted by Jordi Vilar
3127 Docs/Users/Languages: ReadMe-Catalan.txt
3128 Src/Languages/Catalan: MergeCatalan.rc
3129 PATCH: [ 1265295 ] Swap file compare panes (use pointers for buffers)
3130 Forgot to update resource.h in language folders
3131 Src/Languages: resource.h
3134 Cosmetic: add comment to DiffThread giving value of msgID variable
3135 (to help debugging).
3139 BUG: [ 1368492 ] cvs ASSERT failing
3140 Fix reversion bug from Patch [ 1265295 ]
3143 PATCH: [ 1265295 ] Swap file compare panes (use pointers for buffers)
3144 Submitted by Takashi Sawanaka
3145 Src: ChildFrm.cpp DiffList.cpp DiffList.h DirDoc.cpp EditorFilepathBar.cpp
3146 EditorFilepathBar.h LocationView.cpp LocationView.h MainFrm.cpp Merge.rc
3147 MergeDiffDetailView.cpp MergeDiffDetailView.h MergeDoc.cpp MergeDoc.h
3148 MergeDocLineDiffs.cpp MergeEditView.cpp MergeEditView.h PathContext.cpp
3149 PathContext.h resource.h
3150 Src/Languages: *.rc resource.h
3153 PATCH: [ 1336598 ] Add extensions DisplayXMLFiles plugin
3154 Add several new extensions, bump version (1.0.2.0 -> 1.0.3.0)
3155 Plugins\src_VCPP\DisplayXMLFiles:
3156 DisplayXMLFiles.dsp DisplayXMLFiles.rc WinMergeScript.cpp
3161 PATCH: [ 1241935 ] Implement Line Diff coloring on byte diffs
3162 Src: MergeDoc.cpp MergeDoc.h MergeDocLineDiffs.cpp PropEditor.cpp
3164 2005-11-23 WinMerge experimental release 2.5.0.2 (cvs)
3167 PATCH: [ 1363114 ] Add '*.ctl;*.pag;*.dsr' to Visual Basic highlighter
3168 Src/editlib: ccrystaltextview.cpp
3171 PATCH: [ 1362882 ] Remove option for autoclosing compare statepane
3172 Src: Merge.rc OptionsDef.h OptionsInit.cpp PropGeneral.cpp PropGeneral.h resource.h
3173 Src/Languages: *.rc resource.h
3174 BUG: [ 1355884 ] 2.4.2 fails to open dvd files
3175 File/folder selection dialog couldn't open read-only folders
3179 PATCH: [ 1334277 ] Show asterisk in #diffs for QuickCompare results
3180 Src: DiffWrapper.cpp DiffWrapper.h DirViewColItems.cpp
3181 PATCH: [ 1334589 ] Encoding maps for Expat parser, for DisplayXmlFiles plugin
3182 Plugins/src_VCPP/DisplayXMLFiles
3183 BUG: [ 1277320 ] Plugins.txt not up-to-date
3184 Plugins/dll/IgnoreCommentsC
3187 Merge7z DllBuild 0017
3188 Merge7z: StdAfx.h Merge7zCommon.cpp Merge7zCommon.h revision.txt
3189 Merge7z new files: Merge7z430.dsp
3190 Merge7zInstaller: Files.rc2 Installer.cpp Merge7zInstaller.dsp
3193 PATCH: [ 1358408 ] Import and export for options
3194 Src: Merge.rc resource.h
3195 Src/Common: OptionsMgr.cpp OptionsMgr.h PreferencesDlg.cpp PreferencesDlg.h
3196 Src/Languages: *.rc resource.h
3199 PATCH: [ 1349645 ] Folder Compare Statistics dialog
3200 PATCH: [ 1347787 ] Use non-modal dialog for dir compare status
3201 Src: DirDoc.cpp DirDoc.h DirFrame.cpp DirFrame.h DirView.cpp DirView.h Merge.cpp Merge.dsp
3203 Src new files: CompareStatisticsDlg.cpp CompareStatisticsDlg.h DirCompProgressDlg.cpp
3204 DirCompProgressDlg.h
3205 Src deleted files: DirCompStateBar.cpp DirCompStateBar.h
3206 Src/res new file: sigma.bmp
3207 Src/Languages: *.rc resource.h
3210 PATCH: [ 1356783 ] Use OptionsMgr in SyntaxColors class
3211 Src: MainFrm.cpp SyntaxColors.cpp SyntaxColors.h
3214 PATCH: [ 1350638 ] Move options read/write code to options panels
3215 Src: MainFrm.cpp Merge.dsp PropArchive.cpp PropArchive.h PropCodepage.cpp PropCodepage.h
3216 PropColors.cpp PropColors.h PropCompare.cpp PropCompare.h PropEditor.cpp PropEditor.h
3217 PropGeneral.cpp PropGeneral.h PropRegistry.cpp PropRegistry.h PropVss.cpp PropVss.h
3218 Src new file: IOptionsPanel.h
3219 Src/Common: PreferencesDlg.cpp PreferencesDlg.h
3222 Merge Perry's fix for OpenDlg/SelectFile() to Merge.cpp/SelectFile() (PATCH #1348733)
3224 PATCH: [ 1350489 ] Use SelectFile() for external editor selection
3225 Src: PropRegistry.cpp
3228 PATCH: [ 1327413 ] Fix bug in CDirDoc::AllowUpwardDirectory()
3229 Change CDirView::AreItemsOpenable() to consider archive files as openable
3230 Src: DirActions.cpp DirDoc.cpp DirView.cpp
3233 PATCH: [ 1337905 ] Allow comparing binary files with binary unpacker
3235 PATCH: [ 1348733 ] Fix open dialog for cvs version 2.4
3239 PATCH: [ 1335072 ] Add text to Plugins.txt to cover DisplayXMLFiles
3240 Plugins/dlls: Plugins.txt
3242 2005-11-02 WinMerge experimental release 2.5.0.1 (cvs)
3245 BUG: [ 1341243 ] Current Find string is too fragile
3246 Was resetting find string after rescanning
3247 Src/editlib: ccrystaltextview.cpp
3248 PATCH: [ 1342550 ] Modernize file selection dialog
3249 PATCH: [ 1345110 ] Properly compare projectfile extension
3250 Src: Merge.cpp Merge.h OpenDlg.cpp
3251 Bump ShellExtension version to 1.6.2
3252 ShellExtension: ShellExtension.rc
3255 PATCH: [ 1345382 ] Translated Shell Extension to German
3256 ShellExtension/Languages: ShellExtensionGerman.rc
3259 RFE: [ 1324314 ] CTRL+W to close current diff
3262 PATCH: [ 1342871 ] Disable Copy Filenames for folders
3263 Src: DirView.cpp DirView.h
3264 PATCH: [ 1343059 ] Swedish translation update for 2.5.0.1 experimental
3265 Submitted by Hans Eriksson
3266 Src/Languages/Swedish: MergeSwedish.rc
3269 PATCH: [ 1341813 ] VSS project linking misdetects project files
3271 PATCH: [ 1310710 ] Fix bug #1309450
3273 Src: DiffContext.cpp DiffContext.h DiffFileInfo.cpp DiffFileInfo.h DirScan.cpp
3276 PATCH: [ 1341183 ] Fix VSS checkout canceling
3277 Src: DirActions.cpp MainFrm.cpp
3278 Open 2.4 manual (update link)
3282 PATCH: [ 1334444 ] Remove needless (& therefore confusing) cast
3283 Src: LocationView.cpp
3286 PATCH: [ 1334484 ] Skip location view paint if buffer not initialized
3287 Src: LocationView.cpp MergeDoc.cpp MergeDoc.h
3288 MergeEditView.cpp MergeEditView.h
3289 Cosmetic changes to GetFunctionsFromScript, to document
3290 arguments passed to GetTypeInfo.
3294 PATCH: [ 1333545 ] Small improvement to Open-dialog folder selection
3296 PATCH: [ 1333581 ] Increase quick compare limit and make it option
3297 Src: DiffContext.h DiffWrapper.cpp DirDoc.cpp OptionsDef.h OptionsInit.cpp
3300 PATCH: [ 1330179 ] Icon for 'Print'
3301 Src: MainFrm.cpp Merge.rc resource.h
3302 Src/res new file: print.bmp
3303 Src/Languages: *.rc resource.h
3304 Src/Languages/res new file: print.bmp
3307 PATCH: [ 1332365 ] Make some DirActions.cpp functions consts
3308 Src: DirActions.cpp DirView.h
3311 PATCH: [ 1329951 ] Readme.txt points to version 2.2 manual
3312 Docs/Users: ReadMe.txt
3313 Docs/Users/Languages: ReadMe-Catalan.txt ReadMe-Swedish.txt
3314 BUG: [ 1326621 ] Extention ".WinMerge" is omitted
3318 PATCH: [ 1330059 ] Translated 3 missing sentences to German
3319 Src/Languages/German: MergeGerman.rc
3322 PATCH: [ 1326813 ] Fix binary detection to allow archives
3326 PATCH: [ 1305541 ] Rational ClearCase support
3327 Submitted by Greg (rys1908)
3328 Src: CCPrompt.cpp CCprompt.h DirActions.cpp MainFrm.cpp MainFrm.h Merge.rc resource.h
3329 Src/Common: coretools.cpp
3330 Src/Languages: *.rc resource.h
3333 PATCH: [ 1323107 ] Patch for crash on save filenames with different cases
3334 From anonymous submitter
3336 PATCH: [ 1286629 ] print support
3337 Submitted by Markus Rollmann
3338 Src: MainFrm.cpp Merge.rc MergeEditView.cpp MergeEditView.h
3339 Src/Common: SplitterWndEx.cpp SplitterWndEx.h
3340 Src/editlib: ccrystaleditview.cpp
3342 Add Markus Rollmann to Contributors.txt
3343 Docs/Users/Contributors.txt
3346 PATCH: [ 1242008 ] Update status to binary if open fails because binary
3347 Follow on for 2nd case
3348 Src: DirView.cpp MergeDoc.cpp
3351 PATCH: [ 1302710 ] generating a report is slow
3352 Perry added comments explaining one code line
3353 Src: DirCmpReport.cpp
3356 PATCH: [ 1302710 ] generating a report is slow
3357 Submitted by Takashi Sawanaka
3358 Src: DirCmpReport.cpp
3359 PATCH: [ 1310214 ] Shell extension italian translation
3360 Submitted by Andrea Decorte
3361 ShellExtension/Languages: ShellExtensionItalian.rc
3364 PATCH: [ 1253949 ] cosmetic comment fix
3366 PATCH: [ 1253950 ] cosmetic--remove old code in InitInstance
3368 PATCH: [ 1253951 ] trivial cosmetic comment upgrade in arg parsing
3372 Merge7z DllBuild 0015
3373 Merge7z: Merge7zCommon.cpp Merge7zCommon.h revision.txt
3374 Merge7z new files: Merge7z427.dsp Merge7z428.dsp Merge7z429.dsp
3375 Merge7zInstaller update
3376 Merge7zInstaller: Files.rc2 Installer.cpp Installer.rc
3379 PATCH: [ 1309423 ] Small typo in MergeSwedish.rc
3380 Submitted by Hans Eriksson
3381 Src/Languages/Swedish: MergeSwedish.rc
3384 PATCH: [ 1229867 ] RFE [ 1205516 ], RFE [ 887948 ], and other issues
3385 Cosmetic, transcribing comment from patch discussion
3389 PATCH: [ 1302608 ] crash on generating a report
3390 Submitted by Takashi Sawanaka
3391 Src: DirCmpReport.cpp
3394 BUG: [ 1298687 ] The files marked as 'skipped' are compared
3395 Fix from Takashi Sawanaka, comment updates by me
3399 PATCH: [ 1301504 ] Danish ShellExtension translation
3400 Submitted by Christial List
3401 ShellExtension/Languages: ShellExtensionDanish.rc
3404 PATCH: [ 1297642 ] Japanese translation update
3405 Submitted by Takashi Sawanaka
3406 ShellExtension/Languages: ShellExtensionJapanese.rc
3407 Src/Languages/Japanese: MergeJapanese.rc
3410 PATCH: [ 1297406 ] updated hungarian translation
3411 Submitted by Márton Balázs
3412 Src/Languages/Hungarian: MergeHungarian.rc
3415 PATCH: [ 1295701 ] Scrolling for dir compare report filename
3418 PATCH: [ 1295758 ] Update URL for downloads page (archive options)
3419 Src: PropArchive.cpp
3422 PATCH: [ 1295767 ] German Translation for 'Highlight Line * Diff'
3423 Src/Languages/German: MergeGerman.rc
3426 PATCH: [ 1294514 ] Set file loading traces debug-only
3428 PATCH: [ 1295473 ] updated italian rc file for winmerge 2.3.6
3429 Submitted by Andrea Decorte
3430 Src/Languages/Italian: MergeItalian.rc
3433 PATCH: [ 1292120 ] More significant diff navigations fixes
3434 Src: DiffList.cpp DiffList.h MergeDoc.cpp MergeEditView.cpp
3435 BUG: [ 1290305 ] ShellExtensionU.dll info missing from config log
3439 PATCH: [ 1292279 ] Various Updates in German Translation
3440 Src/Languages/German: MergeGerman.rc
3443 PATCH: [ 1290477 ] Catalan translation update
3444 Submitted by Jordi Vilar
3445 Src/Languages/Catalan: MergeCatalan.rc
3448 PATCH: [ 1289037 ] Some (non)significant diff count fixes
3449 Src: DiffList.cpp DiffList.h MergeDoc.cpp MergeEditView.cpp
3452 PATCH: [ 1284150 ] Fix Shell Extension registering problem
3453 Also bump version to 1.6
3454 ShellExtension: ShellExtension.cpp ShellExtension.rc
3457 BUG: [ 1284304 ] StaticLink crashes after mouse over event
3458 Changed signature of CStaticLink::OnSetCursor to start with CWnd *
3459 Src\Common: StaticLink.cpp StaticLink.h
3462 PATCH: [ 1285404 ] Various Updates in German Translation
3463 Src/Languages/German: MergeGerman.rc
3466 PATCH: [ 1284890 ] Use Changes.txt instead of readme.txt for ChangeLog
3467 Added ChangeLogs folder to project, and put Changes.txt (this),
3468 readme.txt, and CHANGELO into new ChangeLogs folder.
3469 PATCH: [ 1283466 ] French translation
3470 New translation by Jean-F Jolin
3471 Src/Languages/French: MergeFrench.rc
3474 Previous change history is in file readme.txt