3 (This summarizes all changes to all files under Src, including Src\Languages.)
6 Cleanup WMGotoDlg constructor
8 CleanUp VSS dialog class
12 BUG: [ 1664731 ] Margin and line numbers not separated
13 Src/editlib: ccrystaltextview.cpp
14 BUG: [ 1664727 ] Empty file compare looks broken
15 Fix revision marks for scratchpads
16 Src/editlib: ccrystaltextview.cpp
17 BUG: [ 1664832 ] Typo Error in the Registry
18 ShellExtension: WinMergeShell.rgs
19 BUG: [ 1666559 ] Error on save option (WinMerge 2.7.1.7)
23 BUG: [ 1664727 ] Empty file compare looks broken
24 Src/editlib: ccrystaltextview.cpp
26 2007-02-20 WinMerge experimental release 2.7.1.7 (SVN revision 4120)
29 PATCH: [ 1663798 ] Add option and menuitem for file compare selection margin
30 Src: Merge.rc MergeEditView.cpp MergeEditView.h OptionsDef.h OptionsInit.cpp
32 Src/editlib: ccrystaltextview.cpp
33 Src/Languages/*: Merge*.rc
34 Remove commented out lines
38 PATCH: [ 1663012 ] Fix total count for compare progress dialog
39 Src: DirCompProgressDlg.cpp DirCompProgressDlg.h
40 Bug: [ 1663197 ] s/inproper/improper [in Changes.txt]
42 PATCH: [ 1642876 ] Open manual for command line help
43 Src: Merge.cpp Merge.h Merge.rc resource.h
44 Src/Languages/*: Merge*.rc
47 Czech translation - update
48 Src/Languages/Czech/MergeCzech.rc
51 PATCH: [ 1662002 ] Use two threads for folder compare
52 Src: Diffcontext.cpp Diffcontext.h DiffThread.cpp DiffThread.h DirScan.cpp
56 PATCH: [ 1640274 ] Icons for folder compare popup menu
57 Src: MainFrm.cpp Merge.dsp Merge.rc resource.h
58 Src/res new files: both.bmp left.bmp left_to_browse.bmp left_to_right.bmp
59 move_left_to_browse.bmp move_right_to_browse.bmp right.bmp
60 right_to_browse.bmp right_to_left.bmp
61 Src/Languages/*: Merge*.rc
64 PATCH: [ 1659183 ] Add Vista security attributes to manifest files
65 Src/res: WinMerge.exe.manifest WinMergeU.exe.manifest
68 PATCH: [ 1657664 ] Swedish translation update for Backup options
69 Submitted by Hans Eriksson
70 Src/Languages/Swedish: MergeSwedish.rc
73 Fix compile with VC6 (doesn't have CString::Append() or CString::AppendChar())
74 Src: MainFrm.cpp PropBackups.cpp
77 PATCH: [ 1650831 ] Polish translation update for WinMerge 2.6.4
78 Submitted by dr_prozac
79 Src/Languages/Polish: MergePolish.rc
82 Add accelerator keys to new Backup options dialog
84 Src/Languages/*: Merge*.rc
87 PATCH: [ 1582537 ] CSS syntax highlighter
89 editlib: ccrystaltextview.cpp ccrystaltextview.h
90 editlib new file: css.cpp
93 PATCH: [ 1652696 ] Add more options for backup files
94 Src: FileActionScript.cpp MainFrm.cpp MainFrm.h Merge.dsp Merge.rc MergeDoc.cpp
95 OptionsDef.h OptionsInit.cpp PropGeneral.cpp PropGeneral.h resource.h
96 Src new files: PropBackups.cpp PropBackups.h
97 Src/Common: PreferencesDlg.cpp PreferencesDlg.h
98 Src/Languages/*: Merge*.rc
101 Remove unused enum definition
109 Remove unused parameter from CMainFrame::SyncFileToVCS()
110 Src: FileActionScript.cpp MainFrm.cpp MainFrm.h
112 2007-02-01 WinMerge experimental release 2.7.1.6 (SVN revision 4094)
115 PATCH: [ 1636314 ] Fix limiting to single file compare window (2)
118 PATCH: [ 1639493 ] Updated Bulgarian language files
119 Submitted by tigertron
120 Src/Languages/Bulgarian: MergeBulgarian.rc
121 Docs/Users/Languages: Readme-Bulgarian.txt
122 PATCH: [ 1650043 ] Convert CDiffWrapper to use CompareOptions
123 Src: CompareOptions.cpp CompareOptions.h DiffWrapper.cpp DiffWrapper.h
124 Remove commented out include line
128 PATCH: [ 1648182 ] Separate Compare options from DiffWrapper
129 Src: CompareOptions.h DiffWrapper.h DirDoc.cpp DirDoc.h Merge.dsp
130 Src new file: CompareOptions.cpp
131 PATCH: [ 1646638 ] Catalan translation update
132 Submitted by Jordi Vilar
133 Src/Languages/Catalan: MergeCatalan.rc
136 Merge7z DllBuild 0019 - Unassociate .exe filename extension from NSIS format
137 ArchiveSupport/Merge7z: Merge7zCommon.cpp Merge7zCommon.h revision.txt
138 Support 7-Zip versions 4.43 & 4.44
139 ArchiveSupport/Merge7z new files: Merge7z443.dsp Merge7z444.dsp
140 ArchiveSupport/Merge7zInstaller: Files.rc2
143 PATCH: [ 1640741 ] patch for BUG:[ 1635100 ] Inefficient word-wrap code
144 Src: MergeEditView.cpp MergeEditView.h
145 Src/edtlib: ccrystaltextview.cpp ccrystaltextview.h
148 PATCH: [ 1644668 ] Fix ANSI regexps(2)
149 Src: DiffWrapper.cpp FileFilterHelper.cpp FilterList.cpp
152 PATCH: [ 1644668 ] Fix ANSI regexps
153 Src: DiffWrapper.cpp FileFilterHelper.cpp FilterList.cpp FilterList.h
154 PATCH: [ 1644820 ] Implement post-compare linefilters for folder compare
155 Src: DiffContext.cpp DiffContext.h DiffThread.cpp DiffThread.h DirDoc.cpp
156 DirDoc.h FolderCmp.cpp FolderCmp.h
159 PATCH: [ 1644785 ] 24bit icons for "Window" menu
160 Based on icons by Alexander Skinner
161 Src/res: cascade.bmp change_pane.bmp close.bmp horizontally.bmp vertically.bmp
162 PATCH: [ 1644800 ] 24bit "Goto" icon
163 Based on icons by Alexander Skinner
167 PATCH: [ 1642809 ] Move compare code out from DiffFileData
168 Src: DiffFileData.cpp DiffFileData.h DiffWrapper.cpp DirScan.cpp
169 DirViewColItems.cpp Merge.dsp
170 Src new files: FolderCmp.cpp FolderCmp.h
173 BUG: [ 1637433 ] Forget selected filter after close
174 Src: Merge.cpp OptionsInit.cpp
177 PATCH: [ 1636314 ] Fix limiting to single file compare window
179 Move options function call out of if() (for easier debugging)
183 PATCH: [ 1620076 ] Add Bazaar and Mercurial to SourceControl.flt
184 Submitted by René Leonhardt
185 Filters: SourceControl.flt
186 Add René Leonhardt to Contributors.txt
187 Docs/Users: Contributors.txt
188 PATCH: [ 1634968 ] Swedish translation update for 2.7.1.5+
189 Submitted by Hans Eriksson
190 Src/Languages/Swedish: MergeSwedish.rc
193 Update manual URL point to 2.6 version manual in readme.txt
194 Docs/Users/ReadMe.txt
195 Docs/Users/Languages/ReadMe-*.txt
196 PATCH: [ 1633581 ] Restrict expanding env variables in open dialog
197 Src: OpenDlg.cpp OpenDlg.h paths.cpp paths.h
200 PATCH: [ 1633194 ] Add editor tab setting to configuration log
201 Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
203 2007-01-10 WinMerge experimental release 2.7.1.5 (SVN revision 4030)
206 PATCH: [ 1631796 ] Use PCRE for filemask filtering
207 Src: DiffWrapper.cpp DirDoc.h FileFilterHelper.cpp FileFilterHelper.h Merge.cpp
208 Merge.dsp Ucs2Utf8.cpp Ucs2Utf8.h
209 Src/Common removed files: Regexp.cpp RegExp.h
210 PATCH: [ 1631806 ] Fix Filterspath initialization
211 Src: MainFrm.cpp MainFrm.h Merge.cpp Merge.h OptionsInit.cpp
214 BUG: [ 1631613 ] WinMerge crashes when editing code files
215 Src/editlib: ccrystaleditview.cpp
218 BUG: [ 1630630 ] Unexpected selection of text after changing pane
219 Src: MergeEditView.cpp
222 PATCH: [ 1597814 ] 'Wrap Lines' + 'Next Diff' Bug (3)
223 Src: MergeEditView.cpp MergeEditView.h
226 PATCH: [ 1631215 ] Remove used files
228 Src/Common deleted: listvwex.cpp listvwex.h
231 PATCH: [ 1593810 ] Line-filtering post compare
232 Src: DiffWrapper.cpp DiffWrapper.h MainFrm.cpp MainFrm.h Merge.dsp MergeDoc.cpp
233 Src new files: FilterList.cpp FilterList.h
236 BUG: [ 1597939 ] Rename Edits Wrong Field in Folder Compare List
240 BUG: [ 1567749 ] "Unable to compare files" needs short result
241 Src: DirViewColItems.cpp Merge.rc resource.h
242 Src/Languages/*: Merge*.rc
245 TODO: [ 1489875 ] Mimimum height for location pane visible area indicator
246 Src: LocationView.cpp
247 TODO: [ 1485038 ] Rename DIFFITEM::IsSideLeft() and IsSideRight()
248 Src: CompareStats.cpp DiffContext.cpp DiffFileData.cpp DiffItem.cpp DiffItem.h
249 DirActions.cpp DirDoc.cpp DirScan.cpp DirView.cpp DirViewColHandler.cpp
251 PATCH: [ 1567773 ] Change "Only in xxxxxxxxxx" to "Right Only: xxxxxxxxxx"
252 Src: DirViewColItems.cpp Merge.rc resource.h
253 Src/Languages/*: Merge*.rc
254 ConvertFilter() function in FileOrFolderSelect can be a static function
255 Src: FileOrFolderSelect.cpp FileOrFolderSelect.h
258 PATCH: [ 1628203 ] Reduce options caching in MergeEditView
259 Src: MergeEditView.cpp MergeEditView.h
260 PATCH: [ 1628299 ] Use OptionsMgr for archive options
262 PATCH: [ 1628263 ] Add debug-menuitem for resetting options
263 Src: MainFrm.cpp MainFrm.h Merge.rc resource.h
264 Src/Languages/*: Merge*.rc
267 PATCH: [ 1625344 ] Move OptionsMgr from MainFrame to MergeApp
268 Src: FileActionScript.cpp MainFrm.cpp MainFrm.h Merge.cpp Merge.h
269 OptionsInit.cpp PropRegistry.cpp PropTextColors.cpp SourceControl.cpp
270 Src/Common: OptionsMgr.h
271 Use Empty() method for CString instead of assigning empty string into it
272 Src/Common: varprop.h
275 PATCH: [ 1625022 ] Constify OptionsManager parameters
276 Src/Common: OptionsMgr.cpp OptionsMgr.h
279 PATCH: [ 1623772 ] Constify PathContext parameter strings
280 Src: PathContext.cpp PathContext.h
282 2006-12-21 WinMerge experimental release 2.7.1.4 (SVN revision 3991)
285 BUG: [ 1603061 ] "Copy Left/Right To .." doesn't work correctly(2)
286 Src: FileActionScript.cpp DirActions.cpp
289 BUG: [ 1606583 ] VC6 build is broken
290 Backout of patch [ 1603769 ] Send MergeCmdLineInfo between instances
291 Src: MainFrm.cpp Merge.cpp MergeCmdLineInfo.cpp MergeCmdLineInfo.h
292 Bump ShellExtension version to 1.10
293 ShellExtension: ShellExtension.rc
294 BUG: [ 1619689 ] Filefilter: ASP.NET Devel
298 PATCH: [ 1618358 ] Fix warning about non-standard extension with enum
300 PATCH: [ 1618364 ] Make GPL URL const string
304 PATCH: [ 1617502 ] Cleanup use of enum in MovedLines
308 BUG: [ 1614558 ] Goto line doesn't work when word wrap is enabled
309 Src: MergeEditView.cpp
312 BUG: [ 1602219 ] Crappy save of project files
313 Src: MainFrm.cpp ProjectFilePathsDlg.cpp
316 PATCH: [ 1614442 ] Swedish translation update for WinMerge 2.6.2
317 Submitted by Hans Eriksson
318 Src/Languages/Swedish: MergeSwedish.rc
321 BUG: [ 1584068 ] location pane is inaccurate when word wrap is on (2)
322 Src: LocationView.cpp LocationView.h MergeEditView.cpp
325 Fix error in logical condition for checking if item is directory
327 PATCH: [ 1610998 ] Splash screen does not stop timer
329 PATCH: [ 1611060 ] Move constants from Merge.cpp to FileOrFolderSelect.cpp
330 Src: FileOrFolderSelect.cpp Merge.cpp
333 BUG: [ 1611542 ] "Wrap lines" does not work for diff pane
334 Src: MergeDiffDetailView.cpp MergeDiffDetailView.h
337 PATCH: [ 1447744 ] Match lines inside diff blocks (based on Perry's patch)
338 Src new files: MergeDocDiffSync.cpp
339 Src: DiffList.h Merge.dsp Merge.rc MergeDoc.cpp MergeDoc.h OptionsDef.h OptionsInit.cpp
340 PropCompare.cpp PropCompare.h resource.h
341 Src/Languages/*: Merge*.rc
344 BUG: [ 1584068 ] location pane is inaccurate when word wrap is on
345 Src: LocationView.cpp LocationView.h MergeEditView.cpp MergeEditView.h
348 BUG: [ 1604115 ] No copyright info in aboutbox for translations
352 BUG: [ 1610877 ] wrong shortcut (localizazion IT, italian)
353 Src/Languages/Italian: MergeItalian.rc
356 PATCH: [ 1610442 ] Make time getting faster for files
357 Src: DirScan.cpp FileInfo.cpp
358 PATCH: [ 1610477 ] Fix UniFile for weird filetimes
359 Src/Common: UniFile.cpp UniFile.h
362 Add missing include to fix ANSI build target
363 Src: FileOrFolderSelect.cpp
365 2006-12-05 WinMerge experimental release 2.7.1.3 (SVN revision 3919)
368 PATCH: [ 1608846 ] Create a class for moved blocks
369 Src: DiffWrapper.cpp DiffWrapper.h Merge.dsp MergeDoc.cpp MergeDoc.h
370 Src new files: MovedLines.cpp MovedLines.h
371 PATCH: [ 1557295 ] Exclude Source Control files and directories filter
372 Submitted by Paul Welter
373 Filters new file: SourceControl.flt
374 Add Peter Welter and Ivan Masár to contributors
375 Docs/Users: Contributors.txt
378 PATCH: [ 1607193 ] INI Syntax Improvements
380 PATCH: [ 1608541 ] Use INI highlighter for VB6 project files
381 Src/editlib: ccrystaltextview.cpp
384 PATCH: [ 1607823 ] Remove manifest loading from lang dlls
385 Src/Languages/*: Merge*.rc
388 PATCH: [ 1597814 ] 'Wrap Lines' + 'Next Diff' Bug (2)
389 Src: MergeEditView.cpp
392 PATCH: [ 1556688 ] Fix maketstring to check for zero-term by MultiByteToWideCha
393 Src: Common/unicoder.cpp
394 PATCH: [ 1606496 ] Slovak translation (update)
395 Submitted by Ivan Masár
396 Src/Languages/Slovak: MergeSlovak.rc
399 Remove commented out code
403 BUG: [ 1589324 ] WinMegee crashes on copy
404 Src: FileFilterMgr.cpp
407 Fix filefilter regexp uppercasing for trunk
408 Src: FileFilterMgr.cpp
411 BUG: [ 1603077 ] Doesn't filter the file vc60.idb using "Merge_VC_loose.flt"
412 Filters: Merge_VC_loose.flt
415 BUG: [ 1603061 ] "Copy Left/Right To .." doesn't work correctly
419 PATCH: [ 1606496 ] Slovak translation
420 Submitted by Ivan Masár
421 ShellExtension/Languages: ShellExtensionSlovak.rc
422 Src/Languages/Slovak: MergeSlovak.rc
425 PATCH: [ 1597814 ] 'Wrap Lines' + 'Next Diff' Bug
426 Src: MergeEditView.cpp
429 PATCH: [ 1605682 ] Add Syntax Highlight option to config log
430 Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
431 PATCH: [ 1556685 ] Avoid infinite loop in character loop in crystal c++ parser
433 Src/editlib: asp.cpp basic.cpp batch.cpp cplusplus.cpp csharp.cpp dcl.cpp fortran.cpp
434 html.cpp innosetup.cpp is.cpp java.cpp lisp.cpp nsis.cpp. pascal.cpp perl.cpp php.cpp
435 python.cpp rexx.cpp rsrc.cpp ruby.cpp sgml.cpp sh.cpp siod.cpp sql.cpp tcl.cpp tex.cpp
439 BUG: [ 1603230 ] DirView icons isn't shown correctly on NT4.0
440 Src/res: equalfile.ico fileskip.ico lfile.ico notequalfile.ico rfile.ico
443 PATCH: [ 1604078 ] Hide skipped items by default
447 PATCH: [ 1603769 ] Send MergeCmdLineInfo between instances
448 Src: MainFrm.cpp Merge.cpp MergeCmdLineInfo.cpp MergeCmdLineInfo.h
451 BUG: [ 1602214 ] Incorrect work with associated files in WinMerge 2.7.1.2
453 PATCH: [ 1603196 ] Allow Open-dialog kind of folder selection for project files
454 Src: FileOrFolderSelect.cpp FileOrFolderSelect.h OpenDlg.cpp OpenDlg.h
457 BUG: [ 1603562 ] Location pane's bar outlines
458 Src: LocationView.cpp
461 Perry is not active developer
462 Docs/Users: Contributors.txt
465 PATCH: [ 1602365 ] Move SelectFile and SelectFolder routines to separate file
466 Src: DirActions.cpp DirCmpReportDlg.cpp FileFiltersDlg.cpp MainFrm.cpp Merge.cpp
467 Merge.dsp Merge.h MergeDoc.cpp OpenDlg.cpp PatchDlg.cpp ProjectFilePathsDlg.cpp
468 PropRegistry.cpp PropVss.cpp
469 Src/Common: PreferencesDlg.cpp
470 Src new files: FileOrFolderSelect.cpp FileOrFolderSelect.h
473 Fix bunch of doxygen warnings (wrong parameter names etc)
474 Src: CmdLineParser.h DiffWrapper.cpp DirDoc.cpp FilepathEdit.cpp files.cpp
475 paths.cpp PropEditor.cpp WMGotoDlg.h
477 2006-11-23 WinMerge experimental release 2.7.1.2 (SVN revision 3844)
480 PATCH: [ 1512881 ] Fix memleak from charsets.c
481 Src: charsets.cp charsets.h Merge.cpp
482 PATCH: [ 1596285 ] Unresolved external symbol __abs64 with VC7.1
483 Submitted by Gal, minor edit by Kimmo
484 Src: StdAfx.cpp StdAfx.h
485 BUG: [ 1584068 ] location pane is inaccurate when word wrap is on
487 Src: LocationView.cpp
490 PATCH: [ 1600714 ] Allow canceling when started from commandline
491 Src: Merge.cpp Merge.h
494 PATCH: [ 1600000 ] Fix project file Has*() functions
495 Src: ProjectFile.cpp ProjectFile.h
498 BUG: [ 1599631 ] WinMerge 2.7.1.1 ignores left dir in project file
502 PATCH: [ 1590831 ] Handle minimize argument (Bug 1570351)
503 Src: MergeDiffDetailView.cpp
504 Src/Common: SplitterWndEx.cpp
507 PATCH: [ 1598194 ] New command line parser
508 Src: MainFrm.cpp Merge.cpp Merge.dsp Merge.h
509 Src added files: ClearCaseCmdLineParser.cpp ClearCaseCmdLineParser.h
510 CmdLineParser.h MergeCmdLineInfo.cpp MergeCmdLineInfo.h
511 WinMergeCmdLineParser.cpp WinMergeCmdLineParser.h
512 Src removed files: CmdArgs.cpp CmdArgs.h MergeArgs.cpp
515 PATCH: Moved white-space trimming to FileFilterHelper class
516 Src: FileFilterHelper.cpp
518 2006-11-16 WinMerge experimental release 2.7.1.1 (SVN revision 3810)
521 PATCH: [ 1596692 ] Change the way modified docs are saved to fix several issues
522 Src: MainFrm.cpp MergeDiffDetailView.cpp MergeDoc.cpp MergeDoc.h
525 BUG: [ 1596285 ] Unresolved external symbol __abs64 with VC7.1
526 Src: StdAfx.cpp StdAfx.h
529 BUG: [ 1594188 ] /x option does not work
533 PATCH: [ 1586689 ] True color bookmark icon
534 Src/editlib: ccrystaltextview.cpp
535 Src/res: mg_icons.bmp
538 PATCH: [ 1590737 ] BCMenu update to v3.036
539 Src: BCMenu.cpp BCMenu.h
542 PATCH: [ 1591532 ] Remove unused XmlDoc class
544 Src removed files: XmlDoc.cpp XmlDoc.h
547 Add PCRE 6.7 (with windows build files from ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Contrib/)
548 New folder: /Externals/pcre
549 PATCH: [ 1591605 ] Add PCRE regexps and convert file filtering to PCRE
550 Src: FileFilterMgr.cpp FileFilterMgr.h Merge.dsp Plugins.cpp
551 Src new files: Ucs2Utf8.cpp Ucs2Utf8.h
554 PATCH: [ 1586705 ] DirView icons (Tim made [not]equalfile.ico)
555 Src/res: equalfile.ico fileskip.ico lfile.ico notequalfile.ico rfile.ico
558 PATCH: [ 1590892 ] Handle unicode paths for project files
562 PATCH: [ 1589427 ] Add back read-only handling for project files
564 PATCH: [ 1589438 ] Add read-only info to ProjectFile dialog
566 PATCH: [ 1589563 ] Fix crash with weird filetimes (and cleanup the code)
567 Src: DiffFileInfo.cpp DiffFileInfo.h DirScan.cpp DirViewColHandler.cpp
568 DirViewColItems.cpp FileInfo.cpp FileInfo.h
571 PATCH: [ 1589601 ] Add "ReDim" keyword to Visual Basic highlighter
572 Src\editlib: basic.cpp
575 Add Expat version 2.0.0 to /Externals/expat (revision: 3749)
576 New folder: /Externals/Expat
577 Add SCEW version 0.4.0 to /Externals/scew (revision: 3750)
578 New folder: /Externals/scew
579 PATCH: [ 1587574 ] Convert project files code to use expat+SCEW
580 Src: Merge.dsp ProjectFile.cpp ProjectFile.h
581 Remove folder: Src/ExpatLib/*
582 PATCH: [ 1588212 ] Add manifest file to resource file
584 Src/Languages/*: Merge*.rc
585 Move files from Installer/InnoSetup: WinMerge.exe.manifest WinMergeU.exe.manifest
589 PATCH: [ 1586869 ] Fix File Select -dialog modality (commit the file I missed in previous commit)
590 Src/Common: PreferencesDlg.cpp
593 PATCH: [ 1586869 ] Fix File Select -dialog modality
594 Src: DirCmpReportDlg.cpp FileFiltersDlg.cpp MainFrm.cpp Merge.cpp Merge.h
595 MergeDoc.cpp PatchDlg.cpp ProjectFilePathsDlg.cpp PropRegistry.cpp PropVss.cpp
596 PATCH: [ 1586892 ] Remove unused unknown.ico and code loading it
597 Src: DirView.cpp Merge.rc resource.h
598 Src/Languages/*: Merge*.rc
599 Remove file: Src/Res: unknown.ico
602 BUG: [ 1418805 ] Menu colors incorrect with non-standard color scheme
606 PATCH: [ 1584004 ] Delete "Toolbar.bmp"
607 Src/res deleted file: Toolbar.bmp
610 Fix compile warnings (some of them 64-bit), remove unused variables and code, fix types
612 Remove unused function, fix improper pointer usage
613 Src: FileFilterHelper.cpp
614 Fix casting a pointer type to DWORD (not 64-bit compatible)
615 Src: DirView.cpp DirView.h
618 PATCH: [ 1578419 ] Fix creating WinMerge folder to MyFolders always
619 Src: MainFrm.cpp MainFrm.h
620 Trivial type fixes, coding style fixes and converting comments to doxygen
621 Src: StdAfx.cpp StdAfx.h
622 Fix misuse of reference parameters (compiler warning)
626 PATCH: [ 1574696 ] Fix problem in saving filefilter to project file
627 Src: ProjectFilePathsDlg.cpp
630 BUG: [ 1573240 ] Crash in subversion trunk
631 Src: MainFrm.cpp MainFrm.h OptionsInit.cpp
634 BUG: [ 1570259 ] Bookmarks GUI get reset after save
635 Src/editlib: ccrystaltextview.cpp
638 BUG: [ 1570173 ] Crash when merging all differences
642 PATCH: [ 1555344 ] Separate active/inactive developers in Contributors.txt
643 Docs/Users: Contributors.txt
646 PATCH: [ 1572359 ] Various Updates in German Translation for WinMerge 2.6
647 Src/Languages/German: MergeGerman.rc
650 PATCH: [ 1570241 ] Various Updates in German Translation for WinMerge 2.6
651 Src/Languages/German: MergeGerman.rc
654 BUG: [ 1566783 ] Crash on Save Project when no file is selected
658 PATCH: [ 1567874 ] Change manual URL to point to 2.6 manual
662 BUG: [ 1564572 ] Leak memory on undoing
663 Src: GhostTextBuffer.h
664 Src/editlib: ccrystaltextbuffer.h
667 PATCH: [ 1565917 ] Register.bat to register ShellExt for 64-bit Windows
668 ShellExtension: Register.bat
669 BUG: [ 1563187 ] Can't close a file compare with -e switch
673 PATCH: [ 1565359 ] Various Updates in German Translation for WinMerge 2.6
674 Src/Languages/German: MergeGerman.rc
677 PATCH: [ 1564857 ] FindAnyFile function doesn't compile with VC6
678 Src/Common: coretools.cpp
681 PATCH: [ 1563171 ] Catalan translation update (Open-dialog)
682 Submitted by Jordi Vilar
683 Src/Languages/Catalan: MergeCatalan.rc
686 BUG: [ 1564283 ] Parameter -x causes files to be closed after merging
690 PATCH: [ 1564280 ] Stack corruption in LanguageSelect
691 Src/Common: LanguageSelect.cpp
694 Couple of type fixes to CMoveConstraint
695 Src/Common: CMoveConstraint.cpp CMoveConstraint.h
696 Fix check for pointer/value by using bit-shift instead of a cast + add trivial typecasts
697 Src: GhostTextBuffer.cpp
698 Src/editlib: ccrystaltextbuffer.cpp
701 PATCH: [ 1563157 ] Fix coretools.cpp for 64-bit
702 Src/Common: coretools.cpp coretools.h
703 Fix type in ccrystaltextbuffer.h
704 Src/editlib: ccrystaltextbuffer.h
705 PATCH: [ 1563171 ] Catalan translation update
706 Submitted by Jordi Vilar
707 Src/Languages/Catalan: MergeCatalan.rc
708 PATCH: [ 1563386 ] Spanish translation update
709 Submitted by Jesus M. Delgado 'Mack'
710 Src/Languages/Spanish: MergeSpanish.rc
711 Quiet warnings from DiffList.cpp
713 Some SPECIAL_ITEM_POS cleanups
714 Src: DirActions.cpp DirDoc.cpp DirView.cpp DirView.h
715 Fix check for pointer/value by using bit-shift instead of a cast
716 Src: GhostTextBuffer.h
717 Src/editlib: ccrystaltextbuffer.h
719 2006-09-21 WinMerge experimental release 2.5.7.1 (SVN revision 3600)
722 PATCH: [ 1558213 ] Tweak text positions in splash screen
724 Bump ShellExtension version to 1.9.0 (first 64-bit Windows version)
725 ShellExtension: ShellExtension.rc
726 Fix 64-bit typecast warning
727 Src: GhostTextBuffer.h
728 Fix 64-bit pointer truncation in SetWindowLongPtr call (the last I hope)
730 Minor tweaks to 64-bit ShellExtension project file
731 ShellExtension: ShellExtensionX64.vcproj
734 PATCH: [ 1561788 ] Fix 64-bit CFile constructor usage
735 Src/Common: UniFile.cpp
736 PATCH: [ 1561796 ] Get/SetWindowLong not supported in 64-bit Windows
737 Src: 7zCommon.cpp ChildFrm.cpp
738 Src/Common: CSubclass.cpp sizecbar.cpp
739 BUG: [ 1561781 ] 64-bit compile errors from 7zCommon.cpp
741 PATCH: [ 1561650 ] Separate FilterCommentsManager code from DiffWrapper
742 Src: DiffWrapper.cpp DiffWrapper.h Merge.dsp
743 Src new files: FilterCommentsManager.cpp FilterCommentsManager.h
744 Fix 64-bit compile warning by casting last SendMessage() param to LPARAM
746 Fix hex number used instead of INVALID_HANDLE_VALUE
747 Src/Common: sinstance.cpp
748 Fix 64-bit pointer truncation in SetWindowLongPtr call
752 PATCH: [ 1561001 ] Fix FileActionScript type in running actions
753 Src: FileActionScript.cpp
754 PATCH: [ 1561008 ] Warning fix for FileActionScript
756 PATCH: [ 1561080 ] Cleanup for loglevel definition
757 Src: DirDoc.cpp DirScan.cpp MainFrm.cpp Plugins.cpp StdAfx.cpp
758 Src/Common: LogFile.cpp LogFile.h
761 Cleanup 64-bit ShellExtension projectfile, add a debug target
762 ShellExtension: ShellExtensionX64.vcproj
765 PATCH: [ 1559619 ] 64-bit shellextension project file
766 ShellExtension new files: ShellExtensionX64.def ShellExtensionX64.vcproj
767 Remove unused variable
768 Src/editlib: memcombo.cpp
769 Remove unused variable
771 Fix typecasting warnings
772 Src: locality.cpp locality.h MergeDoc.cpp
773 Remove unused variable
774 Src: FileActionScript.cpp
775 Remove unused variable
776 Src: FileFiltersDlg.cpp
779 BUG: [ 1558839 ] ShellExtension does not compile as 64-bit
780 ShellExtension: WinMergeShell.cpp WinMergeShell.h
781 PATCH: [ 1558893 ] Fix incompatible prototype in MessageBoxDialog
782 Src/Common: MessageBoxDialog.cpp MessageBoxDialog.h
783 PATCH: [ 1558913 ] Fix OnTimer prototypes (64-bit compatibility)
784 Src: ChildFrm.cpp ChildFrm.h DircompProgressDlg.cpp DirCompProgressDlg.h DirView.cpp
785 Dirview.h MainFrm.cpp MainFrm.h MergeEditview.cpp MergeEditView.h OpenDlg.cpp
786 Opendlg.h Splash.cpp Splash.h
787 Src/Common: MessageBoxDialog.cpp MessageBoxDialog.h
788 Src/editlib: ccrystaltextview2.cpp ccrystaltextview.h
791 BUG: [ 1547247 ] WinMerge ANSI target does not compile with VS2005
793 Src: Common/SuperComboBox.cpp
794 PATCH: [ 1558152 ] Italian translation updated
795 Submitted by Andrea Decorte
796 Src/Languages/Italian: MergeItalian.rc
799 PATCH: [ 1555764 ] prevent from shaking in view when pressing F5 down
800 Src: GhostTextView.cpp MergeDiffDetailView.cpp
803 PATCH: [ 1556851 ] An Swedish translation update
804 Submitted by Hans Eriksson
805 Src/Languages/Swedish: MergeSwedish.rc
807 2006-09-11 WinMerge beta release 2.5.6 (revision 3552)
810 Japanese translation - update
811 Src/Languages/Japanese: MergeJapanese.rc
814 PATCH: [ 1555764 ] prevent from shaking in view when pressing F5 down
815 Src: GhostTextView.cpp GhostTextView.h MergeDiffDetailView.cpp MergeDiffDetailView.h
818 BUG: [ 1555664 ] fail to copy all to right when enabling moved block detect
822 Czech translation update from Jan Hryz
823 Src/Languages/Czech/MergeCzech.rc
824 PATCH: [ 1553714 ] Add new commandine switches to help dialog
825 Src: Merge.rc MergeArgs.cpp resource.h
826 Src/Languages/*: Merge*.rc
827 PATCH: [ 1552228 ] Don't use 'export' as variable name
831 RFE: [ 1533506 ] Need commandline switch for single-instance
835 PATCH: [ 1552901 ] Update VC loose filefilter
836 Filters: Merge_VC_loose.flt
837 PATCH: [ 1552917 ] Fix GUI for autocompletion option
839 Src/Languages/*: Merge*.rc
842 PATCH: [ 1552095 ] Fix last compare method not visible in GUI list
844 Src/Languages/*: Merge*.rc
847 PATCH: [ 1551332 ] defer loading plugin
848 Src: MainFrm.cpp Merge.rc MergeDoc.cpp MergeEditView.cpp MergeEditView.h
849 Src/Languages/*: Merge*.rc
852 BUG: [ 1550427 ] WinMerge 2.5.5.7 don't save "Include subfoders by default"
853 Src: PropRegistry.cpp
856 Japanese translation - update
857 Src/Languages/Japanese: MergeJapanese.rc
860 PATCH: [ 1544777 ] Compare by size
861 Forgot to commit Options-dialog changes last time so option for this wasn't visible
863 BUG: [ 1547262 ] Suspicious bit shift warning
865 Src/Common: UniFile.cpp
868 PATCH: [ 1547190 ] Fix VS2005 compile
872 BUG: [ 1546938 ] New toolbar icons only works for 'disabled' icons
873 Src/Languages/*/Merge*.rc
876 Fix compiling WinMerge after moving folders around (Merge7z moved under ArchiveSupport)
879 ***** Switch to Subversion *****
881 2006-08-24 WinMerge experimental release 2.5.5.7 (cvs)
884 PATCH: [ 1545411 ] Add some missing options to configlog
885 Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
886 PATCH: [ 1545165 ] WinMarge Bulgarian Translation
887 Submitted by tigertron
888 Src/Languages/Bulgarian: MergeBulgarian.rc
889 Docs/Users/Languages: Readme-Bulgarian.txt
890 Docs/Users/Contributors.txt
891 InnoSetup: WinMerge.iss
892 ShellExtension: ShellExtension.rc
893 ShellExtension/Languages: ShellExtensionBulgarian.rc
894 PATCH: [ 1545890 ] Swedish translation for update for WinMerge 2.5.5.7+
895 Submitted by Hans Eriksson
896 Src/Languages/Swedish: MergeSwedish.rc
897 BUG: [ 1545082 ] Crash when comparing .rc files
898 Fix submitted by Takashi
899 Src/editlib: ccrystaltextview.cpp
902 PATCH: [ 1544905 ] Use stat() to check if file is read-only
903 Src: files.cpp files.h
904 PATCH: [ 1544777 ] Compare by size
905 Src: DiffWrapper.h DirScan.cpp Merge.rc resource.h
906 Src/Languages/*: Merge*.rc
909 PATCH: [ 1541427 ] Using as an external diff tool (RFE 1454623)
910 Src: MainFrm.cpp MainFrm.h MergeArgs.cpp MergeDoc.cpp
913 PATCH: [ 1544784 ] Use as ClearCase external merge tool
917 BUG: [ 1543783 ] Misbehave margin draw
918 Src/editlib: ccrystaltextview.cpp
921 PATCH: [ 1544147 ] Add Install-feature for file filters
922 Src: FileFiltersDlg.cpp FileFiltersDlg.h Merge.rc resource.h
923 Src/Languages/*: Merge*.rc
924 BUG: [ 1534429 ] Message IDS_SUGGEST_IGNOREEOL incorrect
928 PATCH: [ 1424673 ] Widen labels on OpenDialog
931 Src/Languages/*: Merge*.rc
934 PATCH: [ 1542201 ] Change default user filter folder to WinMerge/Filters
936 PATCH: [ 1542829 ] Rename Format-item in File-menu to Convert
938 Src/Languages/*: Merge*.rc
941 PATCH: [ 1540090 ] Change horizontal scroll synch from relative to absolute
942 Src/Common: SplitterWndEx.cpp
945 PATCH: [ 1541158 ] New high-color toolbar icons
946 Src: BCMenu.cpp MainFrm.cpp MainFrm.h Merge.rc resource.h
947 Src/res: ToolbarDisabled.bmp ToolbarEnabled.bmp
950 PATCH: [ 1539568 ] draw icon at modified line (it was changed to line revision marks)
951 Src: GhostTextBuffer.cpp GhostTextBuffer.h MergeDoc.cpp MergeDoc.h
952 Src/editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h ccrystaltextview.cpp
955 PATCH: [ 1456356 ] Scrollbars sometimes not initially active
959 PATCH: [ 1540129 ] Fix indentation of diffutils io.c
960 Src/diffutils/src: IO.C
961 PATCH: [ 1540054 ] Remove Copy All -items from folder compare menu
963 Src/Languages/*: Merge*.rc
964 PATCH: [ 1535558 ] Add GUI for shell extension folder include
965 Src: Merge.rc PropRegistry.cpp PropRegistry.h resource.h
966 Src/Languages/*: Merge*.rc
969 BUG: [ 1538340 ] Undo enabled for folder compare.
970 Src: DirView.h DirView.cpp
973 Japanese translation - update
974 Src/Languages/Japanese: MergeJapanese.rc
977 PATCH: [ 1539204 ] Remove '#' from '#differences' column
979 Src/Languages/*: Merge*.rc
982 PATCH: [ 1538264 ] Split DiffFileData class to own files
983 Src: DiffWrapper.cpp DiffWrapper.h DirScan.cpp DirViewColItems.cpp Merge.dsp
984 Src new files: DiffFileData.cpp DiffFileData.h
985 PATCH: [ 1537261 ] Swedish 2.5.5.6+ translation update
986 Submitted by Hans Eriksson
987 Src/Languages/Swedish: MergeSwedish.rc
990 Fix doxygen comment for ImportOptions()
991 Src/Common: OptionsMgr.cpp
994 PATCH: Code cleanup. Removed commented out code.
995 Src/Common: SuperComboBox.cpp
997 BUG: [ 1531965 ] Crash undoing empty (?) event
998 Src/editlib: ccrystaleditview.cpp
1001 Czech translation - update
1002 Src/Languages/Czech/MergeCzech.rc
1005 PATCH: [ 1310951 ] Option to copy DirCmpReport to clipboard
1006 Src: DirCmpReport.cpp DirCmpReport.h DirCmpReportDlg.cpp DirCmpReportDlg.h
1008 Src/Languages/*: Merge*.rc
1011 Czech translation - update
1012 Src/Languages/Czech/MergeCzech.rc
1014 2006-08-08 WinMerge experimental release 2.5.5.6 (cvs)
1017 BUG: [ 1535835 ] Import settings from the file
1018 Src/Common: PreferencesDlg.cpp PreferencesDlg.h
1019 PATCH: [ 1536240 ] Fix diff count numbers for real
1020 Src: DiffWrapper.cpp DirScan.cpp
1021 Src/diffutils/src: analyze.c UTIL.c
1024 PATCH: [ 1514487 ] Merge7z DllBuild 0018
1025 Merge7z: Merge7z311.cpp Merge7z409.cpp Merge7zCommon.cpp Merge7zCommon.h
1026 revision.txt Merge7z*.dsp
1027 Merge7z new files: Merge7z433.dsp Merge7z434.dsp Merge7z435.dsp Merge7z436.dsp
1028 Merge7z437.dsp Merge7z438.dsp Merge7z439.dsp Merge7z440.dsp Merge7z442.dsp
1029 Merge7zInstaller: Installer.cpp Installer.rc Files.rc2
1030 Change recommended version of 7-Zip to 4.42
1034 PATCH: [ 1535175 ] Shell ext: Add flag for subfolder inclusion
1035 ShellExtension: WinMergeShell.cpp WinMergeShell.h
1036 Bump ShellExtension version to 1.8.0
1037 ShellExtension: ShellExtension.rc
1040 BUG: [ 1533292 ] crash when specifying nonexistent project file.
1044 PATCH: [ 1534770 ] Add "don't wrap end of file" option for Find
1045 Src: Merge.rc resource.h
1046 Src/editlib: ccrystaleditview.cpp ccrystaltextview.cpp ccrystaltextview.h
1047 ceditreplacedlg.cpp cfindtextdlg.cpp cfindtextdlg.h
1048 Src/Languages/*: Merge*.rc
1049 BUG: [ 1534461 ] WinMerge 2.5.5.5 ingoring subfolders option in project files
1050 Src: MainFrm.cpp Merge.cpp
1053 Czech translation - update
1054 Src/Languages/Czech/MergeCzech.rc
1056 2006-08-03 WinMerge experimental release 2.5.5.5 (cvs)
1059 PATCH: [ 1533457 ] Add Refresh Selected -item to Folder compare main menu
1060 Src: DirActions.cpp DirView.cpp DirView.h Merge.rc
1061 Src/Languages/*: Merge*.rc
1064 PATCH: [ 1532743 ] Improve difference count columns in folder compare
1065 Src: DiffItem.h DiffItemList.cpp DirScan.cpp DirVierwColItems.cpp
1067 Src/Languages/*: Merge*.rc
1068 PATCH: [ 1529864 ] Stop using Application Data folders as filefilter folders
1069 Src: FileFilterHelper.cpp FileFilterHelper.h
1072 PATCH: [ 1531845 ] Fix memory leak after find
1073 Src/editlib: ccrystaltextview.cpp
1074 PATCH: [ 1531957 ] Fix imagelist memory leak in editor
1075 Src/editlib: ccrystaltextview.cpp
1076 PATCH: [ 1430331 ] New Debug menu
1077 Submitted by Perry, modified by me
1078 Src: MainFrm.cpp MainFrm.h Merge.rc resource.h
1079 Src/Languages/*: Merge*.rc
1080 PATCH: [ 1531319 ] Tidy Folder compare progress dialog
1082 Src/Languages/*: Merge*.rc
1085 PATCH: [ 1531293 ] Fix wrong cursor position after find
1086 Src: ccrystaltextview.cpp ccrystaltextview.h cfindtextdlg.cpp
1087 PATCH: [ 1406051 ] code cleanup for ScriptFileActions
1089 Src: DirActions.cpp FileActionScript.cpp FileActionScript.h
1090 PATCH: [ 1530459 ] Add some doxygen comments for ViewableWhitespace
1091 Src: ViewableWhitespace.cpp ViewableWhitespace.h
1094 BUG: [ 1528322 ] Crash when using F6 / Bugg for file differences
1095 Src: MergeEditView.cpp
1098 PATCH: [ 1530352 ] Start flashing WinMerge window when folder compare is ready
1099 Src: DirView.cpp MainFrm.cpp MainFrm.h
1100 PATCH: [ 1529995 ] Swedish translation update for 2.5.5.4+
1101 Submitted by Hans Eriksson
1102 Src/Languages/Swedish: MergeSwedish.rc
1103 PATCH: [ 1530655 ] Catalan translation update
1104 Submitted by Jordi Vilar
1105 Src/Languages/Catalan: MergeCatalan.rc
1108 PATCH: [ 1529915 ] Refresh menu on DirView does not work correctly
1109 Src: DirActions.cpp DirScan.cpp
1112 PATCH: [ 1529599 ] Cleanup DiffWrapper
1113 Src: DiffWrapper.cpp DiffWrapper.h MergeDoc.cpp PatchTool.cpp
1114 PATCH: [ 1529965 ] Add error messages for managing file filters
1115 Src: FileFiltersDlg.cpp FileFiltersDlg.h Merge.rc resource.h
1116 Src/Languages/*: Merge*.rc
1119 PATCH: [ 1527843 ] prevent dialog from flickering
1120 Src: DirCompProgressDlg.cpp DirView.cpp
1121 Src/Common: CMoveConstraint.cpp
1124 PATCH: [ 1528841 ] Cleanup ByteComparator
1125 Src: ByteComparator.cpp ByteComparator.h FileTextStats.h
1126 PATCH: [ 1528987 ] Use 64-bit variable as file position in Bytecompare
1127 Src: ByteComparator.cpp ByteComparator.h DiffWrapper.cpp FileTextStats.h
1128 PATCH: [ 1529053 ] Success message for loading/saving project file
1129 Src: Merge.rc ProjectFilePathsDlg.cpp resource.h
1130 Src/Languages/*: Merge*.rc
1133 PATCH: [ 1528444 ] Cleanup for AppSerialize
1134 Src: AppSerialize.cpp AppSerialize.h
1137 PATCH: [ 1527771 ] Remove Apply syntax highlight to other side option
1138 Src: Merge.rc MergeDoc.cpp OptionsDef.h OptionsInit.cpp PropEditor.cpp
1139 PropEditor.h resource.h
1140 Src/Languages/*: Merge*.rc
1143 PATCH: [ 1527947 ] Various Updates in German Translation for WinMerge 2.5
1144 Src/Languages/German: MergeGerman.rc
1147 PATCH: [ 1526918 ] Detect which side file is binary file
1148 Src: DiffItem.h DiffWrapper.cpp DiffWrapper.h
1149 Src/diffutils/src: DIFF.H IO.c analyze.c
1151 2006-07-20 WinMerge experimental release 2.5.5.4 (cvs)
1154 PATCH: [ 1525013 ] Add description for ASP.NET filter
1156 PATCH: [ 1525417 ] Move MovedBlock code to own file
1157 Src: DiffWrapper.cpp Merge.dsp
1158 Src new file: MovedBlocks.cpp
1159 PATCH: [ 1525531 ] Allow comparing project files from Open-dialog
1161 Config log files are .txt files (not .log)
1163 BUG: [ 1495212 ] Wrong cursor position after selecting wordwrapped line
1165 Src/editlib: ccrystaltextview.cpp
1168 Czech translation - update
1169 Src/Languages/Czech/MergeCzech.rc
1172 BUG: [ 1198248 ] version copyright symbol needs review
1173 Src/Languages/*: MergeChineseSimplified.rc MergeChineseTraditional.rc MergeJapanese.rc
1177 BUG: [ 1525451 ] ASSERT in CCrystalTextView::DrawSingleLine()
1178 Src/editlib: ccrystaltextview.cpp
1179 BUG: [ 1525466 ] ASSERT in CCrystalTextView::AssertValidTextPos()
1180 Src/editlib: ccrystaltextview2.cpp
1183 BUG: [ 1524832 ] Bogus include's
1184 Src: DirColsDlg.cpp PropEditor.cpp
1185 PATCH: [ 1522037 ] Add read-only option for paths in Project file
1186 Src: MainFrm.cpp Merge.cpp Merge.rc OpenDlg.cpp OpenDlg.h ProjectFile.cpp
1187 ProjectFile.h ProjectFilePathsDlg.cpp ProjectFilePathsDlg.h resource.h
1188 Src/Languages/*: Merge*.rc
1189 PATCH: [ 1525025 ] Copy/paste error in MainFrm.cpp
1191 PATCH: [ 1525198 ] Version info misses copyright (c) char
1195 Fix and improve comment for folder compare columns table
1197 BUG: [ 1524251 ] File filter does not work on 2.5.5.3
1198 Original fix from Takashi, modified by Kimmo
1199 Src: FileFilterMgr.cpp
1202 PATCH: [ 1517057 ] Option to Ignore Multiline Comments (bugfix for single-line comments)
1203 Submitted by David Maisonave
1204 Src: DiffWrapper.cpp
1207 Strip SuperComboBox strings before saving
1208 Src/Common: SuperComboBox.cpp
1210 2006-07-14 WinMerge experimental release 2.5.5.3 (cvs)
1213 BUG: [ 1521555 ] Location Pane - can't see current location because of color
1214 Use 3d-color instead of scrollbar color in location pane
1215 Src: LocationView.cpp
1216 PATCH: [ 1521696 ] Improve Text color option dialog
1217 Src: Merge.rc PropTextColors.cpp PropTextColors.h
1218 Src/Languages/*: Merge*.rc
1221 PATCH: [ 1521352 ] Cleanup char constants for CRegExep
1222 Src/Common: RegExp.cpp
1223 PATCH: [ 1521392 ] Fix reading last line in linefilter file
1224 Src: FileFilterMgr.cpp
1225 BUG: [ 1498511 ] Conflict accelerator key in IDR_DIRVIEWMENU
1227 Src/Languages/*: Merge*.rc
1228 PATCH: [ 1517057 ] Option to Ignore Multiline Comments (bugfix + rename to filtering)
1229 Submitted by David Maisonave
1230 Src: DiffWrapper.cpp DiffWrapper.h DirDoc.cpp MainFrm.cpp Merge.rc MergeDoc.cpp
1231 OptionsDef.h OptionsInit.cpp PropCompare.cpp Propcompare.h resource.h
1232 Src/Languages/*: Merge*.rc
1233 PATCH: [ 1517057 ] Option to Ignore Multiline Comments (bugfix)
1234 Submitted by David Maisonave
1235 Src: DiffWrapper.cpp
1238 PATCH: [ 1517057 ] Option to Ignore Multiline Comments
1239 Submitted by David Maisonave
1240 Src: DiffWrapper.cpp DiffWrapper.h DirDoc.cpp MainFrm.cpp Merge.rc MergeDoc.cpp
1241 OptionsDef.h OptionsInit.cpp PatchTool.cpp PropCompare.cpp Propcompare.h
1243 Src/Languages/*: Merge*.rc
1244 Add Ed_K and David Maisonave to Contributors
1245 Docs/Users: Contributors.txt
1246 Document UniMemFile::ReadString() function parameters and return values
1247 Src/Common: UniFile.cpp
1250 Quiet warning about deprecated function for VS2003 and later
1254 PATCH: [ 1517362 ] Ensure diff is visible in location view
1255 Src: LocationView.cpp
1256 Fix codinstyle in LocationView.cpp (messed up by patch #1517362)
1257 Src: LocationView.cpp
1258 Make VS2005 build less noisy by defining _CRT_SECURE_NO_DEPRECATE for it
1262 PATCH: [ 1516626 ] Enable double-click in column customization dialog
1263 Src: DirColsDlg.cpp DirColsDlg.h
1264 PATCH: [ 1514435 ] Optimize versioninfo reading
1265 Src: AboutDlg.cpp ConfigLog.cpp Splash.cpp
1266 Src/Common: version.cpp version.h
1269 BUG: [ 1303166 ] crash or freeze on closing all window
1272 2006-07-03 WinMerge experimental release 2.5.5.2 (cvs)
1275 PATCH: [ 1515380 ] Page Up/Down Anomaly
1277 Src/editlib: ccrystaltextview2.cpp
1278 PATCH: [ 1515966 ] Use View-IDs in MergeDoc.cpp
1279 Src: MergeDoc.cpp MergeDoc.h
1280 PATCH: [ 1516016 ] Fix poor handling of invalid tab size in Options-dialog
1281 Src: Merge.rc PropEditor.cpp PropEditor.h resource.h
1282 Src/Languages/*: Merge*.rc
1283 Fix comment in DiffList.cpp
1287 PATCH: [ 1515669 ] Add selected difference marker for locationview
1288 Src: LocationView.cpp LocationView.h
1291 PATCH: [ 1514459 ] Cleanup for LocationView code (use view ID)
1292 Src: LocationView.cpp LocationView.h StdAfx.h
1293 PATCH: [ 1514580 ] Tweak location view bar look
1294 Src: LocationView.cpp
1297 PATCH: [ 1514645 ] Various Updates in German Translation for WinMerge 2.5
1298 Src/Languages/German: MergeGerman.rc
1301 PATCH: [ 1513618 ] Fix Merge.rc translation id
1305 PATCH: [ 1512708 ] Fix compile with VS2005
1306 Also additional cleanup for CCrystalTextView::GetMarginWidth()
1307 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
1308 PATCH: [ 1512726 ] Fix combining filesize from two values
1309 Src: DiffFileInfo.cpp DirScan.cpp FileInfo.cpp FileInfo.h
1310 PATCH: [ 1512775 ] Fix encoding columns showing -1
1311 Src: FileTextEncoding.cpp FileTextEncoding.h
1314 PATCH: [ 1510596 ] Updated Readme-Swedish.txt
1315 Submitted by Hans Eriksson
1316 Docs/Users/Languages: ReadMe-Swedish.txt
1317 PATCH: [ 1510600 ] Updated MergeSwedish.rc file for 2.5.5.1+
1318 Submitted by Hans Eriksson
1319 Src/Languages/Swedish: MergeSwedish.rc
1320 BUG: [ 1483242 ] Needless resource file 'MergeSwedish_LastTranslation.rc'?
1321 Remove unneeded file
1322 Removed: Src/Languages/Swedish: MergeSwedish_LastTranslation.rc
1323 BUG: [ 1489034 ] Src/Common/LanguageSelect.rc unused?
1324 Remove unneeded file
1325 Removed: Src/Common/LanguageSelect.rc
1326 Remove unused files (language.h & language.c)
1327 Removed: Src: language.c language.h
1329 2006-06-21 WinMerge experimental release 2.5.5.1 (cvs)
1332 PATCH: [ 1509505 ] Manual: new compare method and options export/import
1333 Docs/Users/Manual: Configuration.xml
1334 Bump manual revision to 1.2.4
1335 Docs/Users/Manual: WinMerge_help.xml
1336 Bump ShellExtension version to 1.7.2
1337 ShellExtension: ShellExtension.rc
1340 BUG: [ 1505763 ] Crash after closing file compare window
1341 Src: MergeEditView.cpp
1342 PATCH: [ 1508865 ] Improve error handling for loading file filters
1343 Src: FileFilterHelper.cpp FileFilterMgr.cpp FileFilterMgr.h FileFiltersDlg.cpp
1345 PATCH: [ 1508898 ] Show binary as one of EOL types
1346 Src: DirViewColItems.cpp Merge.rc resource.h
1347 Src/Languages/*: Merge*.rc
1348 PATCH: [ 1506184 ] Polish translation update for WM 2.5.4.0
1349 Submitted by dr_prozac
1350 Src/Languages/Polish: MergePolish.rc
1351 PATCH:[ 1509495 ] Polish translation for ShellExtension
1352 Submitted by dr_prozac
1353 ShellExtension/Languages: ShellExtensionPolish.rc
1356 RFE: [ 1499245 ] Ruby Syntax Highlighting
1358 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h ruby.cpp
1361 BUG: [ 1494776 ] Can't rename files if '|' seperator exists
1362 Src: DirView.h DirView.cpp DirActions.cpp
1365 BUG: [ 1486434 ] Copy Pathnames for right-only dir copies parent dir only
1369 PATCH: [ 1483544 ] New compare method: by date and size
1370 Src: DiffWrapper.h DirScan.cpp Merge.rc PropCompare.cpp resource.h
1371 Src/Languages/*: Merge*.rc
1374 BUG: [ 1496066 ] WinMerge crashed with those files
1375 Src: GhostTextView.cpp GhostTextView.h
1378 BUG: [ 1494610 ] Wrong selection in ccrystalview2.cpp
1379 Src/editlib: ccrystaltextview2.cpp
1380 PATCH: [ 1497817 ] Cleanup CCrystalTextView::GetLineBySubLine
1381 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
1384 PATCH: [ 1497154 ] Fix memory leak in wordwrap code
1385 Src/editlib: ccrystaltextview.cpp
1386 PATCH: [ 1497068 ] Initialize cursorpositions in GhostTextView
1387 Src: GhostTextView.h
1388 PATCH: [ 1497147 ] Cleanup CCrystalTextView::ClientToText
1389 Src/editlib: ccrystaltextview.cpp
1392 BUG: [ 1494610 ] Wrong selection in ccrystalview2.cpp
1394 Src/editlib: ccrystaltextview2.cpp
1397 PATCH: [ 1495017 ] Translate 'Textcolors' options to German
1398 Src/Languages/German: MergeGerman.rc
1401 PATCH: [ 1494627 ] Skip processing empty paths in Open dialog
1403 Doxygen comments and trivial cleanups for paths.cpp & paths.h
1404 Src: paths.cpp paths.h
1407 PATCH: [ 1493742 ] Limit vertical scrolling to last line of files
1408 Src/editlib: ccrystaltextview.cpp
1409 PATCH: [ 1493868 ] Add bookmark by double-clicking selection frame
1410 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h ccrystaltextview2.cpp
1411 PATCH: [ 1492458 ] Swedish translation update for 2.5.4.0
1412 Submitted by Hans Eriksson
1413 Src/Languages/Swedish: MergeSwedish.rc
1414 Add some const keywords and fix comments, remove unused function.
1415 Src: DiffList.cpp DiffList.h
1416 BUG: [ 1488797 ] ASSERT in CMergeEditView::OnPrevdiff
1418 Src: MergeEditView.cpp
1421 PATCH: [ 1493713 ] Translate 'Bookmarks' feature to German
1422 Src/Languages/German: MergeGerman.rc
1425 PATCH: [ 1491436 ] Spanish Readme.txt
1426 Submitted by Jesus M. Delgado 'Mack'
1427 Docs/Users/Languages new file: ReadMe-Spanish.txt
1428 InnoSetup: WinMerge.iss
1431 PATCH: [ 1491993 ] Ability to rename files (RFE 1380228)
1432 Src: DirActions.cpp DirView.cpp DirView.h Merge.rc resource.h
1435 PATCH: [ 1491212 ] Czech Translation
1436 Submitted by: Jan Hryz
1437 Src/Languages/Czech/MergeCzec.rc
1438 PATCH: [ 1492025 ] Catalan translation update
1439 Submitted by Jordi Vilar
1440 Src/Languages/Catalan: MergeCatalan.rc
1441 PATCH: [ 1491424 ] Spanish translation for v2.5.3.7
1442 Submitted by Jesus M. Delgado 'Mack'
1443 Languages/Spanish: MergeSpanish.rc
1445 2006-05-18 WinMerge beta release 2.5.4
1448 PATCH: [ 1490540 ] Manual: add picture and explanation about our version tree
1449 Docs/Users/Manual: Introduction.xml
1450 Docs/Users/Manual/build: build_html.bat build_htmlhelp.bat
1451 Docs/Users/Manual/Art new files: WinMerge_versions.gif WinMerge_versions.odg
1454 PATCH: [ 1489824 ] Better default folder for user filters
1456 BUG: [ 1445975 ] BuildDll.bat exit is not good
1457 Src/Languages: BuildDll.bat
1458 PATCH: [ 1488387 ] Russian translation update for 2.4.6
1459 Submitted by Dmitriy Aleshkowskiy
1460 Src/Languages/Russian: MergeRussian.rc
1463 PATCH: [ 1489133 ] Manual: document new filter location(s)
1464 Docs/Users/Manual: Filters.xml
1465 PATCH: [ 1489091 ] Enable Help/Index
1467 PATCH: [ 1489098 ] Doesn't open Help TOC correctly
1469 BUG: [ 1487856 ] Long delay if many language dlls
1471 Src/Common: LanguageSelect.cpp LanguageSelect.h
1472 BUG: [ 1487854 ] ASSERT in CCrystalTextView::OnPrint
1473 Fix suggested by Mallato
1474 Src/editlib: ccrystaltextview.cpp
1475 Graphic Design: Alexander Skinner
1476 Docs/Users: Contributors.txt
1477 BUG: [ 1478057 ] Memory leak when cancelling print preview
1478 Fix suggested by Mallato
1479 Src/editlib: ccrystaltextview.cpp
1482 PATCH: [ 1488637 ] PHP/ASP Syntax Highlighting Fix (Bug 1441643)
1483 Src/editlib: asp.cpp php.cpp
1486 PATCH: [ 1485861 ] Czech translation - update
1487 Submitted by: Jan Hryz
1488 Src/Languages/Czech/MergeCzec.rc
1489 PATCH: [ 1483553 ] Swedish MergeSwedish.rc 1.304 2.5.3.7 update
1490 Submitted by Hans Eriksson
1491 Src/Languages/Swedish: MergeSwedish.rc
1492 PATCH: [ 1484004 ] Manual: new Open-dialog screenshot and small fixes
1493 Docs/Users/Manual: Quick_start.xml
1494 Docs/Users/Manual/screenshots: OpenDlg1.gif
1495 PATCH: [ 1484013 ] Manual: small changes to Introduction chapter
1496 Docs/Users/Manual: Introduction.xml
1497 PATCH: [ 1484092 ] Manual: preliminary whats new list for 2.5
1498 Docs/Users/Manual: Whatsnew_2_1.xml
1499 PATCH: [ 1484101 ] Manual: Add index
1500 Docs/Users/Manual: WinMerge_help.xml
1501 PATCH: [ 1484142 ] Manual: update some options descriptions
1502 Docs/Users/Manual: Configuration.xml
1505 PATCH: [ 1483344 ] Fix creating private file filters
1506 Src: FileFiltersDlg.cpp
1507 PATCH: [ 1483486 ] Add commenting for CLogFile
1508 Src/Common: LogFile.cpp LogFile.h
1511 PATCH: [ 1483107 ] Remove dublicated code from folder compare progress dlg
1512 Src: DirCompProgressDlg.cpp DirCompProgressDlg.h
1513 PATCH: [ 1483088 ] Add GUI for user to select filter folder
1514 Src: FileFilterHelper.cpp FileFilterHelper.h FileFiltersDlg.cpp MainFrm.cpp Merge.rc
1515 OptionsDef.h OptionsInit.cpp paths.cpp paths.h PropRegistry.cpp PropRegistry.h
1517 Src/Languages/*: Merge*.rc
1520 BUG: [ 1481053 ] Options: Text Colors should use 3D-Look too
1522 Src/Languages/*: Merge*.rc
1523 PATCH: [ 1482352 ] Icons for 'Bookmarks' feature
1524 Src: MainFrm.cpp Merge.rc resource.h
1525 Src/res new files: clear_bookmarks.bmp next_bookmark.bmp prev_bookmark.bmp
1527 Src/Languages/*: Merge*.rc
1530 BUG: [ 1363364 ] DisplayBinaryFiles extension list wrong
1531 Also bump version of plugin to 1.0.3.0
1532 Plugins/src_VCPP/DisplayBinaryFiles: ChangeLog.txt DisplayBinaryFiles.rc WinMergeScript.cpp
1533 Plugins/dlls: DisplayBinaryFiles.dll
1536 PATCH: [ 1482411 ] Add line before 'Open Project' in main menu
1538 Src/Languages/*: Merge*.rc
1541 PATCH: [ 1482688 ] sgml.cpp contains "lt" twice
1542 Src/editlib: sgml.cpp
1543 PATCH: [ 1482694 ] xml.cpp contains "lt" twice
1544 Src/editlib: xml.cpp
1545 PATCH: [ 1482765 ] Fix closing folder compare progress dialog
1546 Src: DirCompProgressDlg.cpp DirCompProgressDlg.h DirView.cpp
1548 2006-05-04 WinMerge experimental release 2.5.3.7 (cvs)
1551 PATCH: [ 1481213 ] Fix foldercompare short-size suffixes and localize them
1552 Src: DirViewColItems.cpp Merge.rc resource.h
1553 Src/Languages/*: Merge*.rc
1554 PATCH: [ 1481391 ] Make LocationView update from MergeView more safe
1555 Src: LocationView.cpp MergeEditView.cpp MergeEditView.h
1556 BUG: [ 1456356 ] Scrollbars sometimes not initially active
1557 Another possible fix..
1558 Src/editlib: ccrystaltextview.cpp
1561 PATCH: [ 1480652 ] Small fix for XML syntax highlight
1562 Src/editlib: xml.cpp
1565 PATCH: [ 1479007 ] WinMerge Icon Set Revision 3
1566 Submitted by Alexander Skinner
1568 BUG: [ 1474782 ] Crash when comparing SQL with with binary data
1569 Fix suggested by anonymous submitter
1570 Src/editlib: asp.cpp basic.cpp batch.cpp cplusplus.cpp csharp.cpp dcl.cpp
1571 fortran.cpp html.cpp ini.cpp innosetup.cpp is.cpp java.cpp lisp.cpp nsis.cpp
1572 pascal.cpp perl.cpp php.cpp python.cpp rexx.cpp rsrc.cpp sgml.cpp sh.cpp
1573 siod.cpp sql.cpp tcl.cpp tex.cpp xml.cpp
1574 PATCH: [ 1471835 ] Fix setting filename in folder-compare report dialog
1575 Fix bug in the original patch
1576 Src: DirCmpReportDlg.cpp
1579 PATCH: [ 1475649 ] Enable selection margin and line numbers
1580 Src/res new file: mg_icons.bmp
1583 PATCH: [ 1475649 ] Enable selection margin and line numbers
1584 Src: GhostTextView.cpp GhostTextView.h Merge.rc MergeEditView.cpp
1585 MergeEditView.h OptionsDef.h OptionsInit.cpp resource.h
1586 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h editcmd.h
1587 Src/Languages/*: Merge*.rc
1590 PATCH: [ 1477957 ] Fix 'Help' button position in German translation
1591 Src/Languages/German: MergeGerman.rc
1594 PATCH: [ 1476279 ] Cleanup CDiffContext::UpdateInfoFromDiskHalf() and its usage
1595 Src: Diffcontext.cpp DiffContext.h DirScan.cpp DirViewColItems.cpp
1598 PATCH: [ 1475776 ] Optimize dirview UI updates
1599 Src: DirActions.cpp DirDoc.cpp DirDoc.h
1600 PATCH: [ 1472622 ] Czech translation - update (more dialog fixes)
1601 Submitted by: Jan Hryz
1602 Src/Languages/*: Merge*.rc
1605 PATCH: [ 1474884 ] Fix XmlDoc not releasing file handles
1606 Src: XmlDoc.cpp XmlDoc.h
1607 PATCH: [ 1475092 ] Add DocumentsLoaded() to MergeDiffDetailView
1608 Src: MergeDiffDetailView.cpp MergeDiffDetailView.h MergeDoc.cpp
1609 Gal Hammer is now a developer
1610 Docs/Users: Contributors.txt
1613 PATCH: [ 1473902 ] Add dialog for editing and saving project files
1614 Src: DirDoc.cpp DirDoc.h MainFrm.cpp MainFrm.h Merge.dsp Merge.rc MergeDoc.cpp
1615 MergeDoc.h resource.h
1616 Src new files: ProjectFilePathsDlg.cpp ProjectFilePathsDlg.h
1617 Src/Languages/*: Merge*.rc
1618 PATCH: [ 1472622 ] Czech translation - update
1619 Submitted by: Jan Hryz
1620 Src/Languages/Czech/MergeCzec.rc
1621 PATCH: [ 1472622 ] Czech translation - update (apply dialog fixes)
1622 Submitted by: Jan Hryz
1623 Src/Languages/*: Merge*.rc
1626 PATCH: [ 1473635 ] Move some results update code to DirDoc
1627 Src: DirActions.cpp DirDoc.cpp DirDoc.h
1628 PATCH: [ 1468691 ] Center folder compare status dialog to mainframe
1629 Adding line I missed previous time applying the patch (2006-04-12)
1633 TODO: [ 1469363 ] Need image for aborted status in folder compare
1635 Src: DirView.cpp Merge.rc resource.h
1636 Src/res new file: aborted.ico
1637 Src/Languages/*: Merge*.rc
1638 PATCH: [ 1400653 ] Write project files using objects
1640 Src: Merge.dsp ProjectFile.cpp ProjectFile.h
1641 Src new files: XmlDoc.cpp XmlDoc.h
1644 PATCH: [ 1471835 ] Fix setting filename in folder-compare report dialog
1645 Src: DirCmpReportDlg.cpp DirCmpReportDlg.h
1648 PATCH: [ 1445996 ] Fix wrong PgDown scrolling after mousescroll(2)
1649 Src/editlib: ccrystaltextview2.cpp
1651 2006-04-12 WinMerge experimental release 2.5.3.6 (cvs)
1654 PATCH: [ 1468691 ] Center folder compare status dialog to mainframe
1656 PaTCH: [ 1468783 ] Fix disabled scrollbars after loading files
1657 Src: MergeDoc.cpp MergeEditView.cpp MergeEditView.h
1660 PATCH: [ 1467872 ] Fix diff navigation for first-line of diff
1661 Src: MergeEditView.cpp
1662 PATCH: [ 1443719 ] xml output reports
1663 Submitted by Perry, modified by me
1664 Src: DirCmpReport.cpp DirCmpReport.h DirCmpReportDlg.cpp DirCmpReportDlg.h
1665 DirView.cpp DirView.h Merge.dsp Merge.rc resource.h
1666 Src new file: DirReportTypes.h
1669 PATCH: [ 1467305 ] Beep when long compare is ready
1670 Src: DirView.cpp DirView.h
1673 BUG: [ 1461375 ] Forgot old patch #981526 for sgml.cpp, sh.cpp and tcl.cpp?
1674 Src\editlib: sgml.cpp sh.cpp tcl.cpp
1677 BUG: [ 1383719 ] ShellExtension resources opening in IDE fails
1679 ShellExtension/Languages/*.rc
1680 BUG: [ 1465893 ] Compile error with VC6 (SuperComboBox.cpp)
1682 Src/Common: SuperComboBox.cpp
1685 BUG: [ 1463137 ] MergeArgs.h is empty file?
1688 Src removed file: MergeArgs.h
1691 PATCH: [ 1461896 ] Syntax highlighting of HTML for ASP not complete
1692 Src\editlib: asp.cpp
1695 PATCH: [ 1460749 ] Print relative paths to patch files
1696 Src: DiffWrapper.cpp DiffWrapper.h MainFrm.cpp MergeDoc.cpp PatchDlg.h
1697 PatchTool.cpp PatchTool.h
1698 BUG: [ 1461328 ] Commandline handling overwrites flags?
1701 BUG: [ 1460236 ] Splash localization is broken
1702 Src: Merge.rc resource.h Splash.cpp
1703 Src/Languages/*: Merge*.rc
1704 PATCH: [ 1445426 ] Clear PrivateBuild flag in SetResourceVersions.wsf
1706 Src: SetResourceVersions.wsf
1709 BUG: [ 1458714 ] [Replace All] doesn't work
1710 Src/editlib: ceditreplacedlg.cpp
1713 PATCH: [ 1459284 ] Update of MergeSwedish.rc for WinMerge 2.5.3.5+
1714 Submitted by Hans Eriksson
1715 Src/Languages/Swedish: MergeSwedish.rc
1716 PATCH: [ 1458852 ] Fix UI for multiple file patches
1717 Src: PatchDlg.cpp PatchDlg.h
1718 PATCH: [ 1441718 ] Auto Complete on files or folders selection
1719 Submitted by Gal Hammer
1720 Src/Common: SuperComboBox.cpp SupercompoBox.h
1721 Src: Merge.rc OpenDlg.cpp OptionsDef.h OptionsInit.cpp PropGeneral.cpp
1722 PropGeneral.h resource.h
1723 Src/Languages/*: Merge*.rc
1726 PATCH: [ 1458066 ] Use / as path delimiter in patch files
1727 Src: DiffWrapper.cpp
1728 PATCH: [ 1406944 ] Compute text statistics in QuickCompare
1729 Src new file: FileTextStats.h
1732 PATCH: [ 1457203 ] Create patch from multiple files in folder compare
1733 Src: DirView.cpp DirView.h MainFrm.cpp
1736 PATCH: [ 1457306 ] Revamped Visual Basic syntax highlighter
1737 Src\editlib: basic.cpp
1740 BUG: [ 1455656 ] GPL text still contains 'How to Apply These Terms...'
1743 2006-03-22 WinMerge experimental release 2.5.3.5 (cvs)
1746 PATCH: [ 1455706 ] Catalan translation update
1747 Submitted by Jordi Vilar
1748 Src/Languages/Catalan: MergeCatalan.rc
1749 PATCH: [ 1406944 ] Compute text statistics in QuickCompare
1750 Src: ByteComparator.cpp ByteComparator.h DiffFileInfo.cpp DiffFileInfo.h DiffWrapper.cpp
1751 Diffwrapper.h DirScan.cpp DirViewColItems.cpp Merge.dsp Merge.rc resource.h
1752 Src/diffutils/src: DIFF.H IO.C
1753 Src/Languages/*: Merge*.rc
1756 PATCH: [ 1455663 ] Add new keywords to Visual Basic highlighter
1757 Src\editlib: basic.cpp
1760 PATCH: [ 1448599 ] WinMerge Program Icon Set
1761 Submitted by Alexander Skinner
1763 PATCH: [ 1452288 ] Add ASP.NET filefilter
1764 By By Jon Galloway and Josh Blair
1765 Filters new file: ASPNET.flt
1766 PATCH: [ 1454720 ] Fix resizable dialogs missing captionbar close button
1768 Src/Languages/*: Merge*.rc
1769 PATCH: [ 1455430 ] New Splash Screen Revision 2
1770 Submitted by Alexander Skinner
1772 Remove obsolete splashscreen image (for old splashscreen)
1773 Src/res removed file: WinMergesplash.psd
1776 PATCH: [ 1449892 ] Add compare method to configlog
1777 Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
1778 PATCH: [ 1453252 ] Fix closing filecompare after error
1779 Src: MainFrm.cpp MergeDoc.cpp
1782 PATCH: [ 1449571 ] Add '*.pm' and '*.plx' to Perl highlighter
1783 Src/editlib: ccrystaleditview.cpp
1786 BUG: [ 1449947 ] Looks like diffutils bug for mac-style
1787 BUG: [ 1449949 ] crash comparing two simple test mac files
1788 Fix looping which missed mac case
1792 PATCH: [ 1449868 ] Fix difference counts
1793 Src: DiffWrapper.cpp
1796 PATCH: [ 1449038 ] Add Help-button to Open-dialog
1797 Src: FileFiltersDlg.cpp FileFiltersDlg.h Merge.rc OpenDlg.cpp OpenDlg.h
1798 PropLineFilter.cpp PropLineFilter.h
1799 Src/Common: PreferencesDlg.cpp
1800 Src/Languages/*: Merge*.rc
1803 PATCH: [ 1447927 ] Add Help Search to menu, open correct manual location
1804 Src: DirView.cpp DirView.h MainFrm.cpp MainFrm.h Merge.rc MergeEditView.cpp
1805 MergeEditView.h resource.h
1806 Src/Languages/*: Merge*.rc
1809 PATCH: [ 1447506 ] Don't include splash bitmap to lang files
1810 Src/Languages/*: Merge*.rc
1811 Remove Catalan localized splash screen
1812 Src/Languages/Catalan/res removed files: splash1.bmp WinMergeSplash.psd
1813 BUG: [ 1447851 ] Not enough space for version info in new splash screen
1815 PaTCH: [ 1445377 ] WinMerge Logos (72 DPI)
1816 Submitted by Alexander Skinner
1817 Add new folder Docs/Logos
1818 New Docs/Logos files: readme.txt WinMerge_logo_24bit.png
1819 WinMerge_logo_shadow_24bit.png WinMerge_logo_shadow_trans.tif
1820 WinMerge_logo_trans.gif
1821 Change Splashscreen text to according to Dean's wish
1823 Add Alexander Skinner to contributors list
1824 Docs/Users: Contributors.txt
1825 PATCH: [ 1447348 ] Build language files to Build directory
1826 Src/Languages: BuildDll.bat
1827 PATCH: [ 1447806 ] Use JPEG splashscreen
1828 Src: Merge.dsp Merge.rc resource.h Splash.cpp Splash.h
1829 Src/Common new files: Picture.cpp Picture.h
1830 Src/res new file: splash.jpg
1831 Src/res deleted file: splash1.bmp
1832 Src/Languages/*: Merge*.rc
1835 BUG: [ 1441389 ] Comparing root directory - mysterious
1836 Src: DiffWrapper.cpp
1839 PATCH: [ 1447539 ] Add explanatory comment to CCrystalTextBuffer::MoveLine
1840 Src/editlib: ccrystaltextbuffer.cpp
1841 PATCH: [ 1447547 ] Add more comments to CMergeDoc::PrimeTextBuffers
1845 Remove unneeded splash image (Splash2.bmp) as noted in Patch item #1441392
1846 Src/res removed file: Splash2.bmp
1849 PATCH: [ 1445434 ] SyntaxColors scrambling reg values
1850 Src: SyntaxColors.cpp
1852 2006-03-10 WinMerge experimental release 2.5.3.4 (cvs)
1855 PATCH: [ 1445996 ] Fix wrong PgDown scrolling after mousescroll
1856 Src/editlib: ccrystaltextview2.cpp
1857 BUG: [ 1446648 ] cvs trunk doesn't compile
1861 PATCH: [ 1441392 ] New Splash Screen
1862 Submitted by Alexander Skinner
1864 Src/res: splash1.bmp
1867 Update MakeResDll readme with current information (MSVC.Net 2003 works
1868 now), and better explanation of how to pick a specific version.
1869 MakeResDll: readme.txt
1870 PATCH: [ 1443391 ] Update MakeResDll for VS.NET 2005
1871 MakeResDll: MakeResDll.cpp MakeResDll.dsp MakeResDll.rc
1872 StdAfx.cpp StdAfx.h readme.txt resource.h
1873 New MakeResDll: Merge.ico VsVersionDlg.cpp VsVersionDlg.h
1874 Bump MakeResDll version from 1.0.6.0 to 1.0.7.0.
1875 MakeResDll: MakeResDll.rc
1876 PATCH: [ 1442844 ] Make GetFileExt easier to understand
1877 Src: MergeDoc.cpp MergeDoc.h
1878 Add two minor comments to PropRegistry.
1881 2006-03-06 WinMerge experimental release 2.5.3.3 (cvs)
1884 BUG: [ 1444211 ] bug in current SelectFile
1886 PATCH: [ 1443841 ] Add header comment to Src/Changes.txt
1890 BUG: [ 1442866 ] German RC format error
1891 Src/Languages/German: MergeGerman.rc
1892 BUG: [ 1442865 ] languages lack generate patch & report bitmaps
1893 Src/Languages/*: Merge*.rc
1896 PATCH: [ 1435361 ] Fix and cleanup project file code
1897 Src: DiffContext.cpp DiffContext.h DirDoc.cpp MainFrm.cpp
1898 Merge.cpp Merge.h Merge.rc MergeArgs.cpp ProjectFile.cpp
1900 Src/Languages/*: Merge*.rc
1903 PATCH: [ 1396506 ] customizable text colors
1904 Fix compilation (MSVC.NET 2003 correctly gave error that MSVC6 ignored)
1905 Src: PreferencesDlg.cpp
1906 PATCH: [ 1442125 ] Improvements for MakeResDll parsing
1907 MakeResDll: MakeResDll.cpp MakeResDll.rc resource.h
1908 Src\Common: RegKey.cpp RegKey.h
1909 PATCH: [ 1442134 ] MakeResDll: check that RC file exists
1910 MakeResDll: MakeResDll.cpp MakeResDll.rc resource.h
1911 PATCH: [ 1442238 ] Fix MakeResDll to work with VS.NET 2003
1912 MakeResDll: MakeResDll.cpp MakeResDll.rc
1913 PATCH: [ 1442791 ] Update MakeResDll project
1914 Add Changes.txt to project.
1915 Change version copyright from "2003" to "2003-2006"
1916 MakeResDll: MakeResDll.dsp MakeResDll.rc
1918 2006-03-04 Perry (MSVC6)
1919 Current selftests status: Failure count: 0 (of 756)
1922 PATCH: [ 1396506 ] customizable text colors
1923 Src: MainFrm.cpp MainFrm.h Merge.dsp Merge.rc MergeDoc.cpp
1924 OptionsDef.h OptionsInit.cpp PropArchive.cpp PropArchive.h
1925 PropCodepage.cpp PropCodepage.h PropColors.cpp PropColors.h
1926 PropCompare.cpp PropCompare.h PropEditor.h PropGeneral.h
1927 PropRegistry.h PropSyntaxColors.cpp PropSyntaxColors.h
1928 PropVss.h SyntaxColors.cpp SyntaxColors.h resource.h
1929 Src\Common: PreferencesDlg.cpp PreferencesDlg.h
1930 Src/Languages/*: Merge*.rc
1931 PATCH: [ 1439335 ] Reset cwd in Merge.cpp SelectFile
1932 Src: Merge.cpp OpenDlg.cpp
1933 PATCH: [ 1442082 ] Fix MakeDirs to not error if directory exists
1934 Src\Common: coretools.cpp
1935 PATCH: [ 1396506 ] customizable text colors
1937 Src: new PropTextColors.cpp PropTextColors.h
1940 PATCH: [ 1442699 ] New Changes.txt file for MakeResDll
1941 Add Changes.txt change log (this file).
1942 MakeResDll: new Changes.txt
1943 PATCH: [ 1424636 ] New BuildOneLanguage.vbs & fix MakeResDll exit
1944 MakeResDll: MakeResDll.cpp StdAfx.h
1945 Src\Languages: BuildDll.bat BuildOneLanguage.vbs
1948 PATCH: [ 1441387 ] Improve File Encoding dialog
1950 Src/Languages/*: Merge*.rc
1951 PATCH: [ 1442107 ] Move About-dialog code to separate files from Merge.cpp
1952 Src: Merge.cpp Merge.dsp
1953 Src new files: AboutDlg.cpp AboutDlg.h
1956 PATCH: [ 1437770 ] Icons for 'Generate Patch' and 'Generate Report'
1957 Src: MainFrm.cpp Merge.rc resource.h
1958 Src/res new files: patch.bmp report.bmp
1961 PATCH: [ 1441124 ] Improve filter test dialog
1963 Src/Languages/*: Merge*.rc
1966 PATCH: [ 1424535 ] Czech Translation, Submitted by Jan Hryz
1967 Improve unpacker selection dialog and new filter location selection dialog
1969 Src/Languages/*: Merge*.rc
1972 PATCH: [ 1438233 ] New icons for 'notequalfile', 'lfile' and 'rfile'
1973 Src/res: lfile.ico notequalfile.ico rfile.ico
1976 PATCH: [ 1436855 ] Typo in lang files (change pactch to patch)
1977 Src/Languages/*: Merge*.rc
1978 BUG: [ 1440774 ] Test button for file filters enabled for no filter
1979 Fix submitted by Gal Hammer
1980 Src: FileFiltersDlg.cpp
1981 PATCH: [ 1395847 ] Integration with Rational ClearCase
1982 Submitted by Gal Hammer
1983 Src: MainFrm.cpp MainFrm.h Merge.h MergeArgs.cpp MergeDoc.cpp MergeDoc.h
1984 Src/Common: coretools.cpp coretools.h
1987 BUG: [ 1439360 ] Native languages sometimes suppressed in Unicode Build
1988 Add note to CLanguageSelect::GetNativeLanguageNameString
1989 explaining why codepage check is done even for Unicode build.
1990 Src/Common: LanguageSelect.cpp
1993 BUG: [ 1439350 ] Russian language name in LanguageSelect?
1994 Src/Common: LanguageSelect.cpp
1997 PATCH: [ 1435470 ] Remove CTextFile
1999 Deleted Src\Common: textfile.cpp textfile.h
2000 PATCH: [ 1439229 ] Fix CMergeDoc::SanityCheckD not to dereference illegal lines
2001 BUG: [ 1438390 ] Crash when editting the attached files
2003 PATCH: [ 1434007 ] Move source control code out of MainFrm.cpp
2004 Src: MainFrm.cpp MainFrm.h Merge.dsp
2005 New Src: SourceControl.cpp
2008 PATCH: [ 1437758 ] Improve diff selection when selected diff not visible
2009 Src: MergeEditView.cpp MergeEditView.h
2010 PATCH: [ 1431607 ] Fix worddiff highlight error
2012 Src: stringdiffs.cpp
2015 PATCH: [ 1437677 ] Various Updates in German Translation for WinMerge 2.5
2016 Src/Languages/German: MergeGerman.rc
2019 PATCH: [ 1435431 ] Fix GenerateReport lines
2021 Src: DirCmpReport.cpp
2022 PATCH: [ 1395721 ] VS.NET 2003 warning of SEH bug
2024 PATCH: [ 1428686 ] Catalan translation update
2026 Src/Languages/Catalan: MergeCatalan.rc
2027 PATCH: [ 1430321 ] Swedish translation update and feedback on WinMerge 2.5.3.2
2029 Src\Languages\Swedish: MergeSwedish.rc
2030 PATCH: [ 1434270 ] Fix difference counts
2032 Src: DiffWrapper.cpp
2035 PATCH: [ 1435384 ] Add context menu for diff pane
2036 Src: Merge.rc MergeDiffDetailView.cpp MergeDiffDetailView.h resource.h
2037 Src/Languages/*: Merge*.rc
2038 PATCH: [ 1433125 ] Trap errors from filesystem during actions
2039 Src: FileActionScript.cpp
2042 PATCH: [ 1405603 ] New Test dialog for file filters
2043 (Forgot to do all the language resources)
2044 and misc RC file fixes (eg, many fixes in editor proppage)
2045 New: Src/Languages: WinMerge_Resource_Discrepencies.txt
2048 PATCH: [ 1405603 ] New Test dialog for file filters
2049 Src: FileFilterMgr.cpp FileFilterMgr.h FileFiltersDlg.cpp
2050 FileFiltersDlg.h Merge.dsp Merge.rc resource.h
2051 Src new: TestFilterDlg.cpp TestFilterDlg.h
2052 PATCH: [ 1433312 ] Add cvs tags to source files
2053 Src: ByteComparator.cpp SharedFilterDlg.cpp StdAfx.cpp
2054 TestFilterDlg.cpp TestFilterDlg.h ViewableWhitespace.cpp
2055 Src/Common: SortHeaderCtrl.cpp SortHeaderCtrl.h UniFile.cpp
2056 UniFile.h textfile.cpp textfile.h unicoder.cpp unicoder.h
2057 varprop.cpp varprop.h version.cpp version.h
2060 PATCH: [ 1178743 ] Disable lang menu if no additional langs installed
2061 Src: Merge.cpp Merge.h
2062 Src/Common: LanguageSelect.cpp LanguageSelect.h
2065 PATCH: [ 1433931 ] Add comment before isBin checks in DirView
2067 PATCH: [ 1424153 ] Remove VTS_PUI1 from lwdisp.h
2068 BUG: [ 1395475 ] VTS_UI1 & VTSPUI1 macro redefinition warnings (VS.NET)
2069 Src\Common: lwdisp.h
2070 PATCH: [ 1433927 ] Fix external editor default and messages
2071 BUG: [ 1433774 ] default editor is blank
2072 Src: MainFrm.cpp Merge.cpp Merge.rc OptionsInit.cpp resource.h
2073 Src/Languages/*: Merge*.rc
2074 PATCH: [ 1433353 ] Fix menu resources
2075 Src: MainFrm.cpp Merge.cpp Merge.rc resource.h
2076 Src/Languages/*: Merge*.rc
2078 2006-02-19 Christian
2079 PATCH: [ 1429125 ] Return number of diffs instead of true/false
2083 BUG: [ 1395483 ] Signed/unsigned mismatch warning from LocationView.cpp
2084 Src: LocationView.cpp
2087 BUG: [ 1395475 ] VTS_UI1 & VTSPUI1 macro redefinition warnings (VS.NET)
2088 Fixed VTS_PUI1 (which previous patch for this bug missed).
2089 Src\Common: lwdisp.h
2092 PATCH: [ 1424535 ] Czech Translation, Submitted by Jan Hryz
2093 Improve folder compare columns dialog (idea for new arrows from Catalan translation)
2095 Src/Languages/*: Merge*.rc
2098 PATCH: [ 1431771 ] Alter CheckTranslations.vbs to YesNoCancel
2099 Src/Languages: CheckTranslations.vbs
2100 PATCH: [ 1419582 ] Polish translation update for latest v2.5
2101 Contributed by dr_prozac
2102 Src/Languages/Polish: MergePolish.rc
2103 PATCH: [ 1431846 ] Update Czech Translation
2104 Contributed by Jan Hryz
2105 Src/Languages/Czech: MergeCzech.rc
2106 ShellExtension/Languages/ShellExtensionCzech.rc
2107 A few control adjustments matching Czech to English (many left)
2108 Src/Languages/Czech: MergeCzech.rc
2111 PATCH: [ 1431636 ] IgnoreEOL broken in cvs trunk
2112 Src: PropCompare.cpp
2115 PATCH: [ 1431768 ] Write paths to patch files as given
2116 Src: DiffWrapper.cpp
2119 PATCH: [ 1431205 ] Fix ViewWhitespace \r\n bug
2120 BUG: [ 1431012 ] View line differences adds additional EOL char
2121 Src/editlib: ccrystaltextview.cpp
2122 PATCH: [ 1431197 ] Fix off-by-one highlight error
2123 Src: stringdiffs.cpp
2124 Fix button movement on LanguageSelect (broken by PATCH#1423461).
2125 Also add cvs id comment at top, and doxygen file label.
2126 Src\Common: LanguageSelect.cpp
2129 BUG: [ 1197976 ] GeneratePatch file browse not intialized correctly
2130 Fix submitted by Perry
2134 PATCH: [ 1431131 ] Fix VS.NET 2003 compilation
2135 Src\Common: coretools.cpp scbarg.cpp scbarg.h sizecbar.cpp sizecbar.h
2136 Shrink Swedish dialog IDD_PROPPAGE_LARGE to same size as English
2137 (all controls already were the same size anyway)
2138 Src\Languages\Swedish: MergeSwedish.rc
2141 PATCH: [ 1212124 ] File encoding GUI
2142 Src: DiffContext.cpp DiffFileInfo.cpp DiffFileInfo.h DiffItem.cpp
2143 DiffItem.h DiffThread.cpp DiffWrapper.cpp DirActions.cpp
2144 DirScan.cpp DirView.cpp DirView.h DirViewColItems.cpp FileLocation.h
2145 MainFrm.cpp Merge.dsp Merge.rc MergeDoc.cpp MergeDoc.h OpenDlg.cpp
2146 codepage_detect.cpp codepage_detect.h resource.h
2147 NEW Src: FileTextEncoding.cpp FileTextEncoding.h IntToIntMap.h
2148 LoadSaveCodepageDlg.cpp LoadSaveCodepageDlg.h MergeDocEncoding.cpp
2149 dlgutil.cpp dlgutil.h
2152 Adjust whitespace to match English translation
2153 Also update Russian options/editor controls to match English
2154 Src\Languages\Russian: MergeRussian.rc
2155 Src\Languages\Slovak: MergeSlovak.rc
2156 Src\Languages\Swedish: MergeSwedish.rc
2157 Src\Languages\Turkish: MergeTurkish.rc
2158 PATCH: [ 1424681 ] Widen labels on unpacker dialog
2160 Src\Languages: Merge*.rc
2163 PATCH: [ 1429517 ] Fix coretools.cpp compilation (for MakeResDll)
2164 Src/Common: coretools.cpp
2165 PATCH: [ 1427838 ] code cleanup bottom of merge.cpp
2167 Synchronizing Turkish translation to English where feasible.
2168 Src/Languages/Turkish: MergeTurkish.rc
2169 Update Swedish Options/Editor to current English layout
2170 Src/Languages/Swedish: MergeSwedish.rc
2173 PATCH: [ 1428800 ] Fix ListCopy/AllLeft
2174 BUG: [ 1428791 ] All Left gave me a bunch of msgboxes
2175 Src: MergeDoc.cpp MergeDoc.h
2176 PATCH: [ 1428726 ] Fix for compilation under VS2005
2177 Src: BCMenu.cpp DiffWrapper.cpp DirCmpReport.cpp
2178 DirColsDlg.cpp DirViewColHandler.cpp GhostTextBuffer.cpp
2179 MergeArgs.cpp MergeDiffDetailView.cpp MergeDoc.cpp
2181 Src\Common: LanguageSelect.cpp SuperComboBox.cpp UniFile.cpp
2182 coretools.cpp multiformatText.cpp scbarg.cpp scbarg.h
2183 sizecbar.cpp sizecbar.h
2184 Src\editlib: asp.cpp basic.cpp batch.cpp ccrystaltextview.cpp
2185 cplusplus.cpp crystaltextblock.cpp csharp.cpp dcl.cpp
2186 fortran.cpp html.cpp ini.cpp innosetup.cpp is.cpp java.cpp
2187 lisp.cpp nsis.cpp pascal.cpp perl.cpp php.cpp python.cpp
2188 rexx.cpp rsrc.cpp sgml.cpp sh.cpp siod.cpp sql.cpp
2189 tcl.cpp tex.cpp xml.cpp
2190 PATCH: [ 1427563 ] Give descriptive name to CMergeDoc::SaveHelper
2191 Src: MainFrm.cpp MergeDiffDetailView.cpp MergeDoc.cpp
2192 MergeDoc.h MergeEditView.cpp
2193 PATCH: [ 1426593 ] Remove empty CMergeDoc::SetDiffViewMode()
2195 Src: MergeDoc.cpp MergeDoc.h
2197 2006-02-09 WinMerge experimental release 2.5.3.2 (cvs)
2200 PATCH: [ 1427851 ] Small cleanup for FileFilterMgr::AddFilter()
2201 Src: FileFilterMgr.cpp
2202 Add Jan Hryz as Czech translator and contributor
2203 Docs/Users: Contributors.txt
2206 PATCH: [ 1427845 ] Double-click fails to open, no message
2208 BUG: [ 1427956 ] Differences count in Folder Compare wrong?
2209 Make sure to set diff count to 0 just before counting them
2210 Src: DiffWrapper.cpp
2213 PATCH: [ 1426499 ] Move Save Projectfile to File menu
2214 Src: DirDoc.cpp DirDoc.h MainFrm.cpp MainFrm.h Merge.rc MergeDoc.cpp
2215 MergeDoc.h OpenDlg.cpp OpenDlg.h resource.h
2216 Src/Languages/*: Merge*.rc
2219 PATCH: [ 1424884 ] Fix UniStdioFile encoding of TCHAR
2220 BUG: [ 1402379 ] A character display and save error with encoding of unicode
2221 Src\Common: UniFile.cpp unicoder.cpp unicoder.h
2224 Current selftests status: Failure count: 0 (of 756)
2227 PATCH: [ 1426552 ] Add selftests between platform versions
2228 Src: Changes.txt ConfigLog.cpp DiffWrapper.cpp DiffWrapper.h
2229 DirDoc.cpp MainFrm.cpp MergeArgs.cpp MergeDoc.cpp
2230 MergeDocLineDiffs.cpp OptionsDef.h OptionsInit.cpp PatchTool.cpp
2231 PropCompare.cpp PropCompare.h
2232 Src\editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h
2235 Current selftests status: Failure count: 0 (of 588)
2238 PATCH: [ 1424867 ] Fix common prefix code for \r\n
2239 Src\diffutils\src: IO.C
2240 PATCH: [ 1426793 ] Fix diffutils that counts lines in suffix
2241 Src\diffutils\src: IO.C
2244 Current selftests status: Failure count: 0 (of 588)
2247 PATCH: [ 1424535 ] Czech Translation, Submitted by Jan Hryz
2248 Fix dir compare report dialog layout
2250 Src/Languages/*: Merge*.rc
2253 Synchronizing Slovak translation to English where feasible.
2254 Src/Languages/Slovak: MergeSlovak.rc
2255 Synchronizing Swedish translation to English where feasible.
2256 Src/Languages/Swedish: MergeSwedish.rc
2257 PATCH: [ 1392413 ] Track lossy encodings & warn user
2258 Src: FileFilterMgr.cpp Merge.rc MergeDoc.cpp files.h resource.h
2259 Src/Common: UniFile.cpp UniFile.h unicoder.cpp
2260 PATCH: [ 1392413 ] Track lossy encodings & warn user
2261 Src/Languages/*: Merge*.rc
2264 PATCH: [ 1414201 ] Cleanup Merge Line Flags
2265 Src: LocationView.cpp Merge.dsp MergeDiffDetailView.cpp MergeDoc.cpp
2266 MergeEditView.cpp MergeEditView.h
2267 NEW Src: MergeLineFlags.h
2270 PATCH: [ 1424264 ] Use 'Item' instead of file in View-menu
2272 Src/Language: */Merge*.rc
2275 Fix Italian Edit/Options/Editor line selection controls.
2276 Src/Languages/Italian/MergeItalian.rc
2277 PATCH: [ 1414904 ] updated italian translation for winmerge 2.5.3.1
2278 Submitted by A. Decorte
2279 New updates for selecting current diffs and wrap lines.
2280 Src/Languages/Italian/MergeItalian.rc
2283 BUG: [ 1422257 ] Wrong text in tooltip
2284 (Dutch translation had wrong shortcut keys in tooltip)
2285 Src/Languages/Dutch/MergeDutch.rc
2286 PATCH: [ 1424535 ] Czech Translation
2287 Submitted by Jan Hryz
2288 Src/Languages/Czech/MergeCzech.rc
2291 PATCH: [ 1424142 ] Wrap two lwdisp macros in ifndef
2292 Src/Common: lwdisp.h
2293 Undo PATCH: [ 1424142 ] Wrap two lwdisp macros in ifndef
2294 Src/Common: lwdisp.h
2295 BUG: [ 1383052 ] warning C4005: 'COMPILE_MULTIMON_STUBS' : macro redefinition
2296 (Wrap multimon def with ifndef
2298 PATCH: [ 1423461 ] Rearrange language select dialog
2299 Revise patch applied earlier: put Ok on left and Cancel on right.
2300 (Also fix French dialog which was left out before.)
2302 Src/Languages: */Merge*.rc
2303 PATCH: [ 1421199 ] Fix plugin menu for when location or diff detail view active
2304 Src: ChildFrm.cpp ChildFrm.h MainFrm.cpp MainFrm.h MergeDoc.cpp MergeDoc.h
2305 PATCH: [ 1414904 ] updated italian translation for winmerge 2.5.3.1
2306 Submitted by A. Decorte
2307 Src/Languages/Italian: MergeItalian.rc
2308 PATCH: [ 1423907 ] Fix diffutils hashing of \r
2309 Src/diffutils: IO.C UTIL.C
2310 Current selftests status: Failure count: 0 (of 480)
2311 Created branch "R_diffutils_branch"
2314 PATCH: [ 1409651 ] fix diffutils handling trailing whitespace
2315 Src/diffutils/src: IO.C UTIL.C
2316 Current selftests status: Failure count: 24 (of 480)
2317 Failing -b t002 (u & m platforms, all 4 builds)
2318 Failing -bi t002 (u & m platforms, all 4 builds)
2319 Failing -b bug1406950 (u & m platforms, all 4 builds)
2322 PATCH: [ 1423060 ] Modify perl selftest to test all 4 builds
2324 Current selftests status: Failure count: 36 (of 480)
2325 Failing -b t002 (all 3 platforms, all 4 builds)
2326 Failing -bi t002 (all 3 platforms, all 4 builds)
2327 Failing -b bug1406950 (all 3 platforms, all 4 builds)
2328 PATCH: [ 1421694 ] Widen comments label in Rational ClearCase dialog
2330 Src/Languages: */Merge*.rc
2331 PATCH: [ 1423461 ] Rearrange language select dialog
2332 Src: MainFrm.cpp MainFrm.h Merge.rc OpenDlg.cpp OpenDlg.h
2333 Src/Common: LanguageSelect.cpp LanguageSelect.h
2334 Src/Languages: */Merge*.rc
2337 PATCH: [ 1422052 ] Correction of Swedish for 2.5.3.1+
2338 Contributed by Hans Eriksson
2339 Src/Languages/Swedish: Merge Swedish
2342 PATCH: [ 1412386 ] Adding readme files
2343 New WinMerge/readme.txt
2344 (Various other directories affected -- readme.txt & Changes.txt files)
2347 PATCH: [ 1419329 ] Select Line Difference
2348 Src: Merge.rc MergeDiffDetailView.cpp MergeDiffDetailView.h MergeEditView.cpp
2349 MergeEditView.h resource.h
2350 Src/Language: */Merge*.rc
2353 BUG: [ 1419317 ] link error on 8-bit cvs trunk
2354 Add HtmlHelp.lib to link lines MergeRelease, MergeDebug, MergeUnicodeRelease.
2356 PATCH: [ 1419582 ] Polish translation update for latest v2.5
2357 Contributed by dr_prozac
2358 Src/Languages/Polish: MergePolish.rc
2359 PATCH: [ 1421018 ] Fix handle leak in GetOpenFileName
2360 BUG: [ 1418765 ] 2.4.4.0U maintain opened a handle on folders
2361 Adds new method paths_GetWindowsDirectory & resets current
2362 directory to WINDIR after GetOpenFileName call
2363 Src: MainFrm.cpp OpenDlg.cpp paths.cpp paths.h
2364 Cosmetic: synchronizing whitespace to English version
2365 Src/Languages/*: MergeTurkish.rc MergeSwedish.rc MergeSpanish.rc
2366 Cosmetic: synchronizing whitespace to English version
2367 Src/Languages/*: MergePolish.rc
2368 Updating Polish dialog control layout to English (except where
2369 would hinder appearance)
2370 Src/Languages/*: MergePolish.rc
2373 PATCH: [ 1419171 ] Various Updates in German Translation for WinMerge 2.5
2374 Src/Languages/German: MergeGerman.rc
2377 PATCH: [ 1415895 ] Split cmdline help string into chunks
2378 Src: Merge.cpp Merge.h Merge.rc MergeArgs.cpp resource.h
2379 Src/Languages: */*.rc
2382 PATCH: [ 1414904 ] updated italian translation for winmerge 2.5.3.1
2383 Submitted by A. Decorte
2384 InnoSetup\Languages: Italian.isl
2385 PATCH: [ 1415165 ] Updated Swedish translation for 2.5.3.1+
2386 Submitted by Hans Eriksson
2387 Src\Languages\Swedish: MergeSwedish.rc
2388 PATCH: [ 1414195 ] Delete two old TODO notes
2390 PATCH: [ 1414196 ] Delete useless CChildFrame::OnNotify method
2391 Src: ChildFrm.cpp ChildFrm.h
2392 PATCH: [ 1414199 ] Fix outdated comment on DirView.cpp :: NumToStr
2396 PATCH: [ 1413230 ] Use HtmlHelp API to open help
2397 Src: MainFrm.cpp Merge.dsp
2400 BUG: [ 1412237 ] InitOption return value wrong if RegCreateKey fails
2401 Fix unused wrong return value of InitOption & improve one comment
2402 Src/Common: OptionsMgr.cpp
2403 BUG: [ 1414868 ] Bug in byte_compare (early finish)
2404 (Also added some comments.)
2405 Src: DiffWrapper.cpp
2407 2006-01-24 WinMerge experimental release 2.5.3.1 (cvs)
2410 PATCH: [ 1406840 ] Use HTMLHelp locally
2412 PATCH: [ 1411727 ] Merge inactive diff when cursor is inside it
2413 Src: MergeDoc.cpp MergeDoc.h MergeEditView.cpp MergeEditView.h
2416 Add repro files to selftests from
2417 BUG [ 1406950 ] QuickCompare vs diffutils, disagree on trailing whitespace
2418 Current selftests status: Failure count: 9 (of 108)
2419 Failing -b t002 (all 3 platforms)
2420 Failing -bi t002 (all 3 platforms)
2421 Failing -b bug1406950 (all 3 platforms)
2422 PATCH: [ 1406950 ] QuickCompare vs diffutils, disagree on trailing whitespace
2423 Src: ByteComparator.cpp
2424 (selftests results unimproved, because selftest uses diffutils core, not QuickCompare)
2427 PATCH: [ 1405540 ] Cleanup filters dialog
2428 Src: FileFiltersDlg.cpp FileFiltersDlg.h
2431 PATCH: [ 1411102 ] Add '*.dsl' and '*.jsp' to syntax highlighter
2432 Src/editlib: ccrystaleditview.cpp
2435 PATCH: [ 1411406 ] self-tests and new arguments and new diff2winmerge.exe
2436 Src: Changes.txt MainFrm.cpp MainFrm.h Merge.cpp Merge.h MergeArgs.cpp
2437 Src/Common: OptionsMgr.cpp OptionsMgr.h
2438 New directory WinMerge/diff2winmerge, for diff2winmerge utility
2439 New directory WinMerge/selftests added
2440 Current selftests status: Failure count: 6 (of 108)
2441 Failing -b t002 (all 3 platforms)
2442 Failing -bi t002 (all 3 platforms)
2445 PATCH: [ 1411150 ] Add GetActiveMergeView for MergeDoc
2446 Src: MergeDoc.cpp MergeDoc.h
2449 PATCH: [ 1407740 ] Polish translation update (for version 2.4.4.0)
2450 Submitted by dr_prozac
2451 (Perry merging many of these to cvs trunk)
2452 Src/Language/Polish: MergePolish.rc
2455 BUG: [ 1408587 ] Unused DoScroll() function in Merge*View
2456 Remove DoScroll() from CMergeEditView and CMergeDiffDetailView
2457 Src: MergeDiffDetailView.cpp MergeDiffDetailView.h MergeEditView.cpp
2461 PATCH: [ 1406207 ] Fix error message for unique folders
2462 Src: DirView.cpp Merge.rc resource.h
2463 Src/Language: */Merge*.rc
2466 PATCH: [ 1401711 ] A hybrid of word diff and char diff
2467 Submitted by Takashi Sawanaka
2468 Src: MergeDocLineDiffs.cpp PropEditor.cpp
2469 stringdiffs.cpp stringdiffs.h
2472 PATCH: [ 1406203 ] Open unique files to external editor
2473 Src: DirView.cpp Merge.rc resource.h
2474 Src/Language: */Merge*.rc
2477 PATCH: [ 1333600 ] Get rid of global MainFrame pointer (part1)
2478 Src: DirActions.cpp DirDoc.cpp DirView.cpp FileActionScript.cpp
2479 MainFrm.cpp MainFrm.h Merge.cpp MergeDoc.cpp MergeEditView.cpp
2480 OpenDlg.cpp PropRegistry.cpp
2481 Src\Common: PreferencesDlg.cpp
2484 PATCH: [ 1403457 ] Support Unicode file filter files
2485 Src: FileFilterMgr.cpp
2488 PATCH: [ 1372044 ] Add FileActionScript for folder compare actions
2489 Src: DirActions.cpp DirView.h Merge.dsp
2490 Src new files: FileActionScript.cpp FileActionScript.h
2491 PATCH: [ 1385672 ] Replace some 'file's with 'item's
2493 Src/Language: */Merge*.rc
2494 PATCH: [ 1405340 ] Add XP shadow to folderskip.ico
2496 Src/res: folderskip.ico
2499 TODO: [ 1395638 ] CChildFrame::PreCreateWindow() does nothing
2500 Src: ChildFrm.cpp ChildFrm.h MainFrm.cpp
2503 PATCH: [ 1403454 ] Add comment to UniStdioFile.h
2505 Src/Common: UniFile.h
2506 PATCH: [ 1403893 ] Fix whitespace error in ByteCompare
2507 BUG: [ 1400779 ] Whitespace bug in ByteComparator
2508 Src: ByteComparator.cpp
2511 PATCH: [ 1039677 ] Alter text of Reset button label
2513 Src/Language: */Merge*.rc
2516 PATCH: [ 1399263 ] Captioned panes (new style)
2517 Src: ChildFrm.cpp DiffViewBar.h LocationBar.h Merge.dsp Merge.rc resource.h
2518 Src/Common new files: scbarcf.cpp scbarcf.h
2519 Src/Language: */Merge*.rc
2520 PATCH: [ 1399738 ] Filename bars to use caption colors
2521 Src: ChildFrm.cpp FilePathEdit.cpp FilePathEdit.h
2524 PATCH: [ 1403412 ] German: Option 'Line Difference Coloring' looks broken
2525 Src/Languages/German: MergeGerman.rc
2527 2006-01-11 WinMerge beta release 2.5.2
2530 PATCH: [ 1402774 ] Use dark red color for 'binarydiff.ico'
2532 Src/res: binarydiff.ico
2533 PATCH: [ 1400845 ] Allow Shift+Ctrl+F3 to search selected text backwards
2534 With addition from Takashi for Shift+F3 backwards search
2536 Src/editlib: ccrystaltextview.cpp
2537 Src/Language: */Merge*.rc
2538 BUG: [ 1400829 ] Crash trying to open location pane context menu
2539 Src: LocationView.cpp
2542 PATCH: [ 1401420 ] New 'MergeDir' icon
2543 Src/res: MergeDir.ico
2546 PATCH: [ 1400830 ] Fix drop to only do LoadProjectFile when 1 file dropped
2547 BUG: [ 1400797 ] Dropping two project files doesn't work to compare them
2548 (Also fixes extension test to be case-sensitive)
2552 BUG: [ 1396222 ] CDirView::MoveSelection() is confused
2553 (Rename MoveSelection to MoveFocus & add more commenting)
2554 Src: DirActions.cpp DirView.cpp DirView.h
2557 PATCH: [ 1398064 ] Catalan translation update
2559 Src/Languages/Catalan: MergeCatalan.rc
2560 PATCH: [ 1398959 ] Implement GuessEncoding in QuickCompare
2561 Src: codepage_detect.cpp DiffWrapper.cpp DiffWrapper.h
2563 2006-01-05 WinMerge experimental release 2.5.0.5 (cvs)
2566 PATCH: [ 1393635 ] Save pane sizes and positions when they change
2567 Src: ChildFrm.cpp ChildFrm.h DiffViewBar.cpp DiffViewBar.h LocationBar.cpp
2568 LocationBar.h LocationView.cpp LocationView.h MergeDiffDetailView.cpp
2569 MergeDiffDetailView.h StdAfx.h
2570 PATCH: [ 1396413 ] Update Open dialog controls when its activated
2571 Src: OpenDlg.cpp OpenDlg.h
2574 Cosmetic; normalizing blank lines to agree with English Merge.rc
2576 Brazilian\MergeBrazilian.rc
2577 ChineseSimplified\MergeChineseSimplified.rc
2578 Korean\MergeKorean.rc
2579 Norwegian\MergeNorwegian.rc
2582 PATCH: [ 1394877 ] Find selected text with Ctrl+F3
2584 Src/editlib: ccrystaltextview.cpp
2585 Src/Language: */Merge*.rc
2586 PATCH: [ 1395584 ] Update CSizingControlBar to latest version
2587 Src: DiffViewBar.cpp DiffViewBar.h LocationBar.cpp LocationBar.h Merge.dsp StdAfx.h
2588 Src/Common: sizecbar.cpp sizecbar.h
2589 Src/Common new files: scbarg.cpp scbarg.h
2590 Src/Common deleted files: sizecbarg.cpp sizecbarg.h
2591 PATCH: [ 1383262 ] Fix bitmap leak in ShellExtension
2592 Also bump version number to 1.7.1
2594 ShellExtension: ShellExtension.rc WinMergeShell.cpp WinMergeShell.h
2597 PATCH: [ 1390104 ] fix for BUG: [ 1384069 ] Wrapped lines have incorrect column
2598 Src: MergeEditView.cpp
2599 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
2602 BUG: [ 1390849 ] cvs trunk MergeChineseSimplified doesn't compile
2603 Src/Languages: ChineseSimplified: MergeChineseSimplified.rc
2604 PATCH: [ 1212161 ] Fix handling of \r\n in ByteComparator
2605 Src: ByteComparator.cpp
2608 PATCH: [ 1383802 ] Cleanup line difference options in Editor-options
2609 Src: Merge.rc PropEditor.cpp PropEditor.h resource.h
2610 PATCH: [ 1383802 ] Cleanup line difference options in Editor-options
2612 Src/Language: */Merge*.rc
2613 PATCH: [ 1391550 ] vbs script to check & optionally merge WinMerge resources
2614 Src: new CheckTranslations.vbs
2617 PATCH: [ 1395474 ] Define WINVER for compiling with VS.net
2619 PATCH: [ 1395018 ] Small cleanup for CMergeDoc::PrimeTextBuffers()
2620 Src: DiffList.cpp DiffList.h MergeDoc.cpp
2623 PATCH: [ 1395487 ] Unused local variable in UniStdioFile::DoOpen()
2624 (Delete unused variable)
2625 Src/Common: UniFile.cpp
2626 BUG: [ 1395497 ] Unused local variables in CMergeDoc::GetWordDiffArray()
2627 (Delete unused variables)
2628 Src: MergeDocLineDiffs.cpp
2629 BUG: [ 1395494 ] stringdiffs.cpp / LastChar() returning uninitialized value?
2630 Src: stringdiffs.cpp
2633 Remove unused variable from VSSHelper.cpp/VSSHelper::ReLinkVCProj()
2637 PATCH: [ 1392647 ] Prefix members with m_ in storage_for_plugins
2638 Src/Common: multiformatText.cpp multiformatText.h
2639 PATCH: [ 1394717 ] Fix resource.h include for translations
2640 Src/Languages: */Merge*.rc
2641 Src/Languages deleted: UpdateAll_resource_h.bat
2642 Src/Languages deleted: */resource.h (localized versions of resource.h)
2643 BUG: [ 1395107 ] MergeKorean.rc not compile in cvs trunk
2644 (resource.h => ..\..\resource.h fix missed Korean somehow)
2645 Src/Languages/Korean: MergeKorean.rc
2646 PATCH: [ 1394073 ] Fix ByteComparator: m_bol0
2647 (Change in ByteComparator.h is cosmetic typo fix in comment)
2648 (Fixes some bad tabbing as well)
2649 Src: ByteComparator.cpp ByteComparator.h
2652 PATCH: [ 1394759 ] Allows quotes in Rational ClearCase checkout comment
2653 Submitted by Gal Hammer
2655 Add Gal Hammer to contributors list
2656 Docs/Users: Contributors.txt
2659 BUG: [ 1394857 ] cvs trunk does not compile, ANSI, FindEncodingIdFromNameOrAl
2660 Src: codepage_detect.cpp
2663 PATCH: [ 1392347 ] Fix status after synching unique binary files
2665 PATCH: [ 1394464 ] Find again code doesn't recognize dos/mac EOLs
2666 Src/editlib: ccrystaltextview.cpp
2667 BUG: [ 1394851 ] cvs trunk does not compile (DirScan.cpp, sRule)
2671 PATCH: [ 1394247 ] Fix GuessEncoding recognition of codepages
2672 BUG: [ 1394234 ] GuessEncodings fails to recognize CP-437
2673 Src: codepage_detect.cpp
2674 PATCH: [ 1393979 ] Delete unused DiffWrapper fnc cleanup_script
2675 Src: DiffWrapper.cpp
2678 PATCH: [ 1391732 ] Do not offer to unify codepages in UNICODE build
2679 Also introduces new error IDS_DIFFERENT_UNICODINGS and new
2680 global function IsUnicodeBuild.
2682 Doing language synchronizations for this patch.
2684 Languages\Brazilian\MergeBrazilian.rc
2685 Languages\Bulgarian\MergeBulgarian.rc
2686 Languages\Catalan\MergeCatalan.rc
2687 Languages\ChineseSimplified\MergeChineseSimplified.rc
2688 Languages\ChineseTraditional\MergeChineseTraditional.rc
2689 Languages\Czech\MergeCzech.rc
2690 Languages\Danish\MergeDanish.rc
2691 Languages\Dutch\MergeDutch.rc
2692 Languages\German\MergeGerman.rc
2693 Languages\Hungarian\MergeHungarian.rc
2694 Languages\Italian\MergeItalian.rc
2695 Languages\Japanese\MergeJapanese.rc
2696 Languages\Korean\MergeKorean.rc
2697 Languages\Norwegian\MergeNorwegian.rc
2698 Languages\Polish\MergePolish.rc
2699 Languages\Russian\MergeRussian.rc
2700 Languages\Slovak\MergeSlovak.rc
2701 Languages\Spanish\MergeSpanish.rc
2702 Languages\Swedish\MergeSwedish.rc
2703 Languages\Turkish\MergeTurkish.rc
2704 PATCH: [ 1212368 ] Display correct paths in context patches
2706 Revising patched code, removing unneeded dispname added when patch applied
2707 Src: DiffWrapper.cpp
2708 diffutils\src: CONTEXT.C DIFF.H
2709 PATCH: [ 1393239 ] Split functions out of RunFileDiff
2710 Src: DiffWrapper.cpp DiffWrapper.h
2711 PATCH: [ 1392229 ] Fix Column item handling
2712 Src: DirView.h DirViewColHandler.cpp DirViewColItems.cpp
2716 PATCH: [ 1390774 ] Rename CRegOptions to CRegOptionsMgr
2717 Docs\Developers: Options.html
2718 Src\Common: OptionsMgr.cpp OptionsMgr.h
2719 Src: FileTransform.cpp MainFrm.cpp MainFrm.h SyntaxColors.cpp
2720 SyntaxColors.h codepage.h
2721 PATCH: [ 1392650 ] Fix locals of CDiffWrapper::RunFileDiff
2722 Src: DiffWrapper.cpp DiffWrapper.h MergeDoc.cpp PatchTool.cpp
2723 PATCH: [ 1392729 ] Cleanup variables in RunFileDiff
2724 Src: DiffWrapper.cpp
2725 BUG: [ 1369646 ] Confusing half-commented lines in DiffFileData::prepAndCompa
2726 Src: DiffWrapper.cpp
2727 BUG: [ 1392740 ] Clutter in debug output
2729 PATCH: [ 1391766 ] Sync language resources to English
2731 Languages\Brazilian\MergeBrazilian.rc
2732 Languages\Bulgarian\MergeBulgarian.rc
2733 Languages\Catalan\MergeCatalan.rc
2734 Languages\ChineseSimplified\MergeChineseSimplified.rc
2735 Languages\ChineseTraditional\MergeChineseTraditional.rc
2736 Languages\Czech\MergeCzech.rc
2737 Languages\Danish\MergeDanish.rc
2738 Languages\Dutch\MergeDutch.rc
2739 Languages\German\MergeGerman.rc
2740 Languages\Hungarian\MergeHungarian.rc
2741 Languages\Italian\MergeItalian.rc
2742 Languages\Japanese\MergeJapanese.rc
2743 Languages\Korean\MergeKorean.rc
2744 Languages\Norwegian\MergeNorwegian.rc
2745 Languages\Polish\MergePolish.rc
2746 Languages\Russian\MergeRussian.rc
2747 Languages\Slovak\MergeSlovak.rc
2748 Languages\Spanish\MergeSpanish.rc
2749 Languages\Swedish\MergeSwedish.rc
2750 Languages\Turkish\MergeTurkish.rc
2751 PATCH: [ 1212368 ] Display correct paths in context patches
2752 Src: DiffWrapper.cpp DiffWrapper.h
2753 diffutils\src: CONTEXT.C DIFF.H
2754 PATCH: [ 1390454 ] new commandline arguments (prediffer, ignorews...)
2755 Src: ConfigLog.cpp DirDoc.cpp DirDoc.h FileTransform.cpp
2756 MainFrm.cpp MainFrm.h Merge.cpp Merge.dsp Merge.h
2757 MergeEditView.cpp MergeEditView.h
2758 PluginManager.cpp PluginManager.h Plugins.cpp Plugins.h
2760 Src New files: MergeArgs.h MergeArgs.cpp
2761 Src/Common: CmdArgs.cpp CmdArgs.h OptionsMgr.cpp OptionsMgr.h
2764 PATCH: [ 1391732 ] Do not offer to unify codepages in UNICODE build
2765 Also introduces new error IDS_DIFFERENT_UNICODINGS and new
2766 global function IsUnicodeBuild.
2767 Src: ConfigLog.cpp MainFrm.cpp Merge.rc resource.h StdAfx.cpp StdAfx.h
2770 PATCH: [ 1390793 ] New global function GetOptionMgr
2771 Src: DirActions.cpp DirDoc.cpp DirView.cpp DirViewColHandler.cpp
2772 LocationView.cpp MainFrm.cpp MainFrm.h MergeDiffDetailView.cpp
2773 MergeDoc.cpp MergeEditView.cpp OpenDlg.cpp
2774 Src/Common: OptionsMgr.h
2777 PATCH: [ 1382130 ] New line-based RCLocalizationHelper
2781 PATCH: [ 1388704 ] Simplified Chinese language .rc file for RC1
2782 Src/Languages/ChineseSimplified: MergeChineseSimplified.rc
2783 Update language versions of resource.h
2784 Src/Languages/*: resource.h
2787 Update & synchronize translations: Danish Dutch French Hungarian Italian Japanese
2790 Danish: MergeDanish.rc
2791 Dutch: MergeDutch.rc
2792 French: MergeFrench.rc
2793 Hungarian: MergeHungarian.rc
2794 Italian: MergeItalian.rc
2795 Japanese: MergeJapanese.rc
2796 Remove needless cast
2797 Src/Common: unicoder.cpp
2798 Update & synchronize translations: Korean Norwegian Polish Russian
2801 Korean: MergeKorean.rc
2802 Norwegian: MergeNorwegian.rc
2803 Polish: MergePolish.rc
2804 Russian: MergeRussian.rc
2807 PATCH: [ 1388456 ] Convert rest of folder compare bitmaps to icons
2808 Icons from Tim (Thanks!)
2809 Src: CompareStatisticsDlg.cpp DirView.cpp Merge.dsp Merge.rc resource.h
2810 Src/res added files: binarydiff.ico equalbinary.ico equalfile.ico error.ico
2811 fileskip.ico folderup.ico folderup_disable.ico lfile.ico notequalfile.ico
2812 rfile.ico sigma.ico unknown.ico
2813 Src/res removed files: binary.bmp binarydiff.bmp error.bmp fileskip.bmp
2814 folderup.bmp folderup_disable.bmp lfile.bmp notequal.bmp rfile.bmp
2815 sigma.bmp unknown.bmp
2816 Src/Languages: *.rc resource.h
2818 2005-12-21 WinMerge experimental release 2.5.0.4 (cvs)
2821 BUG: [ 1385518 ] Batch file syntax highlighting weirdness
2823 Src/editlib: batch.cpp
2824 PATCH: [ 1387297 ] Swedish translation update for 2.5.0.3+
2825 Submitted by Hans Eriksson
2826 Src/Languages/Swedish: MergeSwedish.rc
2829 PATCH: [ 1386442 ] Local variable uses m_ prefix in CChildFrame
2833 PATCH: [ 1384646 ] Replace Question icons with warning icons in messageboxes
2834 Src: DirActions.cpp FileFiltersDlg.cpp MainFrm.cpp MergeDoc.cpp PatchDlg.cpp
2837 PATCH: [ 1383120 ] Fix background colors in WinMerge
2838 Src: SyntaxColors.cpp SyntaxColors.h
2839 Src/Common: OptionsMgr.cpp OptionsMgr.h
2840 PATCH: [ 1384181 ] Fix byte difference fencepost/infinite loop
2841 Src: CompareOptions.h ConfigLog.cpp DiffWrapper.cpp DiffWrapper.h
2842 Merge.dsp PatchDlg.cpp stringdiffs.cpp
2845 BUG: [ 1379277 ] typo fix for docs
2846 Docs/Developers: Plugins.html
2847 BUG: [ 1375661 ] Readme incomplete in WinMerge 2.5.0.3
2848 Docs/Users: ReadMe.txt
2849 PATCH: [ 1382966 ] Remove empty CMergeEditView::AddMod() and ResetMod()
2850 Src: MergeEditView.cpp MergeEditView.h
2853 PATCH: [ 1378771 ] Fix for BUG:[ 1376552 ] char offset not getting updated when...
2854 Src: ChildFrm.cpp MergeEditView.cpp
2857 PATCH: [ 1378795 ] The searched word is not highlighted correctly
2858 Src/editlib: ccrystaltextview.cpp
2861 PATCH: [ 1382955 ] Remove unused CompareStats.h include from DirFrame.cpp
2863 PATCH: [ 1376711 ] Change CFile::GetStatus to paths_DoesPathExist
2864 Src: files.cpp MainFrm.cpp MainFrm.h Merge.cpp MergeDoc.cpp OpenDlg.cpp
2866 Src/Common: coretools.cpp
2869 PATCH: [ 1381984 ] Folder compare progressdialog could be drawn off-screen
2870 Src: DirCompProgressDlg.cpp
2873 PATCH: [ 1380083 ] Fix EditBinaryFiles Plugin BuildTmp paths
2874 Plugins\src_VCPP\EditBinaryFiles: EditBinaryFiles.dsp
2877 PATCH: [ 1381975 ] Don't open Open-dialog outside screen
2878 Src: MainFrm.cpp OpenDlg.cpp
2879 Src removed file: multimon.h
2882 BUG: [ 1380019 ] Bulgarian translation has wrong language id
2883 Src/Languages/Bulgarian: MergeBulgarian.rc
2884 PATCH: [ 1382131 ] English rc file has numbers instead of symbols for language
2886 PATCH: [ 1379227 ] Fix ExpatLibs BuildTmp paths
2887 Src/ExpatLib: expat_static.dsp
2888 Src/ExpatMapLib: expat_maps_static.dsp
2889 PATCH: [ 1379228 ] Fix Merge7zInstaller BuildTmp paths
2890 Merge7zInstaller: Merge7zInstaller.dsp
2893 PATCH: [ 1381935 ] Simplify DirView icon loading
2897 BUG: [ 1382021 ] Merge7z432 missing?
2898 Merge7z new files: Merge7z431.dsp Merge7z432.dsp
2901 PATCH: [ 1188787 ] New Chinese translation rc file (from PATCH 1183476)
2902 Some more synchronizing from submitted patch
2903 Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
2904 PATCH: [ 1379226 ] Fix Display Plugins BuildTmp paths
2906 PATCH: [ 1188787 ] New Chinese translation rc file (from PATCH 1183476)
2907 Last updates from submitted patch
2908 Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
2909 BUG: [ 1381879 ] Unused variable in unicoder.cpp
2910 Src/common: unicoder.cpp
2913 Update & synchronize translations: ChineseTraditional Czech Danish Dutch
2915 ChineseTraditional: MergeChineseTraditional.rc
2916 Czech: MergeCzech.rc
2917 Danish: MergeDanish.rc
2918 Dutch: MergeDutch.rc
2919 Update & synchronize translations: French German Hungarian Italian Japanese
2921 French: MergeFrench.rc
2922 German: MergeGerman.rc
2923 Hungarian: MergeHungarian.rc
2924 Italian: MergeItalian.rc
2925 Japanese: MergeJapanese.rc
2928 PATCH: [ 1379894 ] Fix handling of unknown encoding
2930 Src/Common: unicoder.cpp
2931 Update & synchronize translations: Brazilian Bulgarian Catalan ChineseSimplified
2933 Brazilian: MergeBrazilian.rc
2934 Bulgarian: MergeBulgarian.rc
2935 Catalan: MergeCatalan.rc
2936 ChineseSimplified: MergeChineseSimplified.rc
2939 PATCH: [ 1378174 ] Share Src/res between translations
2941 Src/Languages/res: removed .bmp .cur and .ico files and WinMergeSplash.psd
2942 splash1.bmp and splash WinMergeSplash.psd not removed from Catalan
2945 PATCH: [ 1377545 ] Remove needless casts
2948 PATCH: [ 1372549 ] readme for Merge7z distributables
2952 PATCH: [ 1371994 ] Enable hi-color icons for folder compare
2953 Icons from Tim (Thanks!)
2954 Src: CompareStatisticsDlg.cpp DirView.cpp Merge.rc resource.h
2955 res new files: folder.ico folderskip.ico lfolder.ico rfolder.ico
2956 res deleted files: folder.bmp folderskip.bmp lfolder.bmp rfolder.bmp
2957 Src/Languages: *.rc resource.h
2958 Src/Languages/res: new and deleted files like in res above
2961 PATCH: [ 1371384 ] Move Expat maps into WinMerge src
2962 Plugins\src_VCPP\DisplayXMLFiles: DisplayXMLFiles.dsp
2963 Src\ExpatMapLib added
2964 Many files moved from DisplayXMLFiles to new ExpatMapLib
2965 PATCH: [ 1373020 ] Carry unicoding, codepage, & file path together
2966 & PATCH: [ 1377545 ] Remove needless casts
2967 Src: DiffWrapper.cpp DiffWrapper.h DirScan.cpp DirView.cpp
2968 MainFrm.cpp MainFrm.h Merge.dsp MergeDoc.cpp MergeDoc.h
2969 Src\Common: RegKey.cpp
2970 NEW Src\FileLocation.h
2973 PATCH: [ 1188787 ] New Chinese translation rc file (from PATCH 1183476)
2974 Remainder of dialogs
2975 Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
2976 BUG: [ 1376825 ] infinite loop bug in byte diffs
2977 Src: stringdiffs.cpp
2978 PATCH: [ 1188787 ] New Chinese translation rc file (from PATCH 1183476)
2979 A few string resources
2980 Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
2981 PATCH: [ 1249007 ] Short size column
2982 Src: DirViewColItems.cpp locality.cpp locality.h Merge.rc resource.h
2983 PATCH: [ 1377362 ] Fix coretools to MakeResDll compiles
2984 BUG: [ 1377361 ] MakeResDll broken b/c coretools broken
2985 Src/Common: coretools.cpp
2988 PATCH: [1374728 ] Fix filter dialog delete
2989 Src: FileFilterMgr.cpp
2992 PATCH: [ 1374782 ] fix for bug 1300957 Crash on save 'unique' file comparison
2993 Submitted by Oliver Mellet, some additional comment improvements by me.
2995 Takashi is now developer, Olivier Mellet submitted a patch
2996 Docs/Users: Contributors.txt
2999 PATCH: [ 1376457 ] Need clarification in platform test in ShellExtension
3000 ShellExtension: ShellExtension.cpp
3003 fix two-line-end-markers bug that was reported in:
3004 "PATCH: [ 1372716 ] patch for RFE:[ 922992 ] Word Wrap/split long lines"
3005 Src: stringdiffs.cpp
3008 PATCH: [ 1372716 ] patch for RFE:[ 922992 ] Word Wrap/split long lines
3009 Src: Merge.rc MergeDoc.cpp MergeEditView.cpp MergeEditView.h OptionsDef.h
3010 OptionsInit.cpp resource.h
3011 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h ccrystaltextview2.cpp
3012 crystalparser.cpp editcmd.h
3013 Src/Languages: *.rc resource.h
3016 PATCH [ 1374931 ] Bugfixes & upload binary for RCLocalizationHelper
3017 (RCLocalizationHelper plugin)
3020 PATCH [ 1372575 ] Fix link for DisplayXmlFiles plugin
3021 (DisplayXMLFiles plugin)
3022 TODO [ 1341058 ] ToDoDeleteThisValidateColumnOrdering()
3023 Src: DirView.cpp DirView.h DirViewColHandler.cpp
3025 2005-12-06 WinMerge experimental release 2.5.0.3 (cvs)
3028 PATCH: [ 1372589 ] Document tildas in config
3031 PATCH: [ 1373037 ] Fix filter dialog to correctly add new filters
3033 Src: FileFiltersDlg.cpp
3034 PATCH: [ 1370183 ] ShellExtension: better way to check for WinMerge executable
3035 ShellExtension: WinMergeShell.cpp
3036 Bump ShellExtension version to 1.7.0
3037 ShellExtension: ShellExtension.rc
3040 PATCH: [ 1372974 ] Make local function "GuessEncoding_from_bytes" static
3041 Src: codepage_detect.cpp
3042 PATCH: [ 1368762 ] Fix assignment in DirScan_GetItems
3043 Also add explanatory comment, for what variable does.
3047 CMarkdown::FileImage::GuessByteOrder(), GuessCodepageEncoding(): Fix UTF-8 signature detection
3048 CMarkdown::GetTagName(): Strip bogus trailing slash in name of empty tag
3049 Src: markdown.cpp codepage_detect.cpp
3052 PATCH: [ 1335128 ] Ignore uninstalled codepages
3053 Src: MergeDoc.cpp MergeDoc.h codepage.cpp codepage_detect.cpp
3054 Src/Common: unicoder.cpp
3057 PATCH: [ 1358408 ] Import and export for options
3058 Increase buffer size
3059 Src/Common: OptionsMgr.cpp
3062 PATCH: [ 1369660 ] Delete unused variables m_msgUpdateStatus
3064 Src: DirDoc.cpp DiffContext.cpp DiffContext.h DiffThread.cpp
3068 PATCH: [ 1369657 ] Delete unused variable DiffFuncStruct::msgStatusUpdate
3070 BUG: [ 1369856 ] Crashed when interface language is changed
3072 BUG: [ 1368755 ] Want comment on format line in 7ZCommon.cpp
3073 Cosmetic: adding explanatory comment to Merge7z::Proxy::operator->
3077 PATCH: [ 1369544 ] Catalan translation update
3078 Submitted by Jordi Vilar
3079 Docs/Users/Languages: ReadMe-Catalan.txt
3080 Src/Languages/Catalan: MergeCatalan.rc
3081 PATCH: [ 1265295 ] Swap file compare panes (use pointers for buffers)
3082 Forgot to update resource.h in language folders
3083 Src/Languages: resource.h
3086 Cosmetic: add comment to DiffThread giving value of msgID variable
3087 (to help debugging).
3091 BUG: [ 1368492 ] cvs ASSERT failing
3092 Fix reversion bug from Patch [ 1265295 ]
3095 PATCH: [ 1265295 ] Swap file compare panes (use pointers for buffers)
3096 Submitted by Takashi Sawanaka
3097 Src: ChildFrm.cpp DiffList.cpp DiffList.h DirDoc.cpp EditorFilepathBar.cpp
3098 EditorFilepathBar.h LocationView.cpp LocationView.h MainFrm.cpp Merge.rc
3099 MergeDiffDetailView.cpp MergeDiffDetailView.h MergeDoc.cpp MergeDoc.h
3100 MergeDocLineDiffs.cpp MergeEditView.cpp MergeEditView.h PathContext.cpp
3101 PathContext.h resource.h
3102 Src/Languages: *.rc resource.h
3105 PATCH: [ 1336598 ] Add extensions DisplayXMLFiles plugin
3106 Add several new extensions, bump version (1.0.2.0 -> 1.0.3.0)
3107 Plugins\src_VCPP\DisplayXMLFiles:
3108 DisplayXMLFiles.dsp DisplayXMLFiles.rc WinMergeScript.cpp
3113 PATCH: [ 1241935 ] Implement Line Diff coloring on byte diffs
3114 Src: MergeDoc.cpp MergeDoc.h MergeDocLineDiffs.cpp PropEditor.cpp
3116 2005-11-23 WinMerge experimental release 2.5.0.2 (cvs)
3119 PATCH: [ 1363114 ] Add '*.ctl;*.pag;*.dsr' to Visual Basic highlighter
3120 Src/editlib: ccrystaltextview.cpp
3123 PATCH: [ 1362882 ] Remove option for autoclosing compare statepane
3124 Src: Merge.rc OptionsDef.h OptionsInit.cpp PropGeneral.cpp PropGeneral.h resource.h
3125 Src/Languages: *.rc resource.h
3126 BUG: [ 1355884 ] 2.4.2 fails to open dvd files
3127 File/folder selection dialog couldn't open read-only folders
3131 PATCH: [ 1334277 ] Show asterisk in #diffs for QuickCompare results
3132 Src: DiffWrapper.cpp DiffWrapper.h DirViewColItems.cpp
3133 PATCH: [ 1334589 ] Encoding maps for Expat parser, for DisplayXmlFiles plugin
3134 Plugins/src_VCPP/DisplayXMLFiles
3135 BUG: [ 1277320 ] Plugins.txt not up-to-date
3136 Plugins/dll/IgnoreCommentsC
3139 Merge7z DllBuild 0017
3140 Merge7z: StdAfx.h Merge7zCommon.cpp Merge7zCommon.h revision.txt
3141 Merge7z new files: Merge7z430.dsp
3142 Merge7zInstaller: Files.rc2 Installer.cpp Merge7zInstaller.dsp
3145 PATCH: [ 1358408 ] Import and export for options
3146 Src: Merge.rc resource.h
3147 Src/Common: OptionsMgr.cpp OptionsMgr.h PreferencesDlg.cpp PreferencesDlg.h
3148 Src/Languages: *.rc resource.h
3151 PATCH: [ 1349645 ] Folder Compare Statistics dialog
3152 PATCH: [ 1347787 ] Use non-modal dialog for dir compare status
3153 Src: DirDoc.cpp DirDoc.h DirFrame.cpp DirFrame.h DirView.cpp DirView.h Merge.cpp Merge.dsp
3155 Src new files: CompareStatisticsDlg.cpp CompareStatisticsDlg.h DirCompProgressDlg.cpp
3156 DirCompProgressDlg.h
3157 Src deleted files: DirCompStateBar.cpp DirCompStateBar.h
3158 Src/res new file: sigma.bmp
3159 Src/Languages: *.rc resource.h
3162 PATCH: [ 1356783 ] Use OptionsMgr in SyntaxColors class
3163 Src: MainFrm.cpp SyntaxColors.cpp SyntaxColors.h
3166 PATCH: [ 1350638 ] Move options read/write code to options panels
3167 Src: MainFrm.cpp Merge.dsp PropArchive.cpp PropArchive.h PropCodepage.cpp PropCodepage.h
3168 PropColors.cpp PropColors.h PropCompare.cpp PropCompare.h PropEditor.cpp PropEditor.h
3169 PropGeneral.cpp PropGeneral.h PropRegistry.cpp PropRegistry.h PropVss.cpp PropVss.h
3170 Src new file: IOptionsPanel.h
3171 Src/Common: PreferencesDlg.cpp PreferencesDlg.h
3174 Merge Perry's fix for OpenDlg/SelectFile() to Merge.cpp/SelectFile() (PATCH #1348733)
3176 PATCH: [ 1350489 ] Use SelectFile() for external editor selection
3177 Src: PropRegistry.cpp
3180 PATCH: [ 1327413 ] Fix bug in CDirDoc::AllowUpwardDirectory()
3181 Change CDirView::AreItemsOpenable() to consider archive files as openable
3182 Src: DirActions.cpp DirDoc.cpp DirView.cpp
3185 PATCH: [ 1337905 ] Allow comparing binary files with binary unpacker
3187 PATCH: [ 1348733 ] Fix open dialog for cvs version 2.4
3191 PATCH: [ 1335072 ] Add text to Plugins.txt to cover DisplayXMLFiles
3192 Plugins/dlls: Plugins.txt
3194 2005-11-02 WinMerge experimental release 2.5.0.1 (cvs)
3197 BUG: [ 1341243 ] Current Find string is too fragile
3198 Was resetting find string after rescanning
3199 Src/editlib: ccrystaltextview.cpp
3200 PATCH: [ 1342550 ] Modernize file selection dialog
3201 PATCH: [ 1345110 ] Properly compare projectfile extension
3202 Src: Merge.cpp Merge.h OpenDlg.cpp
3203 Bump ShellExtension version to 1.6.2
3204 ShellExtension: ShellExtension.rc
3207 PATCH: [ 1345382 ] Translated Shell Extension to German
3208 ShellExtension/Languages: ShellExtensionGerman.rc
3211 RFE: [ 1324314 ] CTRL+W to close current diff
3214 PATCH: [ 1342871 ] Disable Copy Filenames for folders
3215 Src: DirView.cpp DirView.h
3216 PATCH: [ 1343059 ] Swedish translation update for 2.5.0.1 experimental
3217 Submitted by Hans Eriksson
3218 Src/Languages/Swedish: MergeSwedish.rc
3221 PATCH: [ 1341813 ] VSS project linking misdetects project files
3223 PATCH: [ 1310710 ] Fix bug #1309450
3225 Src: DiffContext.cpp DiffContext.h DiffFileInfo.cpp DiffFileInfo.h DirScan.cpp
3228 PATCH: [ 1341183 ] Fix VSS checkout canceling
3229 Src: DirActions.cpp MainFrm.cpp
3230 Open 2.4 manual (update link)
3234 PATCH: [ 1334444 ] Remove needless (& therefore confusing) cast
3235 Src: LocationView.cpp
3238 PATCH: [ 1334484 ] Skip location view paint if buffer not initialized
3239 Src: LocationView.cpp MergeDoc.cpp MergeDoc.h
3240 MergeEditView.cpp MergeEditView.h
3241 Cosmetic changes to GetFunctionsFromScript, to document
3242 arguments passed to GetTypeInfo.
3246 PATCH: [ 1333545 ] Small improvement to Open-dialog folder selection
3248 PATCH: [ 1333581 ] Increase quick compare limit and make it option
3249 Src: DiffContext.h DiffWrapper.cpp DirDoc.cpp OptionsDef.h OptionsInit.cpp
3252 PATCH: [ 1330179 ] Icon for 'Print'
3253 Src: MainFrm.cpp Merge.rc resource.h
3254 Src/res new file: print.bmp
3255 Src/Languages: *.rc resource.h
3256 Src/Languages/res new file: print.bmp
3259 PATCH: [ 1332365 ] Make some DirActions.cpp functions consts
3260 Src: DirActions.cpp DirView.h
3263 PATCH: [ 1329951 ] Readme.txt points to version 2.2 manual
3264 Docs/Users: ReadMe.txt
3265 Docs/Users/Languages: ReadMe-Catalan.txt ReadMe-Swedish.txt
3266 BUG: [ 1326621 ] Extention ".WinMerge" is omitted
3270 PATCH: [ 1330059 ] Translated 3 missing sentences to German
3271 Src/Languages/German: MergeGerman.rc
3274 PATCH: [ 1326813 ] Fix binary detection to allow archives
3278 PATCH: [ 1305541 ] Rational ClearCase support
3279 Submitted by Greg (rys1908)
3280 Src: CCPrompt.cpp CCprompt.h DirActions.cpp MainFrm.cpp MainFrm.h Merge.rc resource.h
3281 Src/Common: coretools.cpp
3282 Src/Languages: *.rc resource.h
3285 PATCH: [ 1323107 ] Patch for crash on save filenames with different cases
3286 From anonymous submitter
3288 PATCH: [ 1286629 ] print support
3289 Submitted by Markus Rollmann
3290 Src: MainFrm.cpp Merge.rc MergeEditView.cpp MergeEditView.h
3291 Src/Common: SplitterWndEx.cpp SplitterWndEx.h
3292 Src/editlib: ccrystaleditview.cpp
3294 Add Markus Rollmann to Contributors.txt
3295 Docs/Users/Contributors.txt
3298 PATCH: [ 1242008 ] Update status to binary if open fails because binary
3299 Follow on for 2nd case
3300 Src: DirView.cpp MergeDoc.cpp
3303 PATCH: [ 1302710 ] generating a report is slow
3304 Perry added comments explaining one code line
3305 Src: DirCmpReport.cpp
3308 PATCH: [ 1302710 ] generating a report is slow
3309 Submitted by Takashi Sawanaka
3310 Src: DirCmpReport.cpp
3311 PATCH: [ 1310214 ] Shell extension italian translation
3312 Submitted by Andrea Decorte
3313 ShellExtension/Languages: ShellExtensionItalian.rc
3316 PATCH: [ 1253949 ] cosmetic comment fix
3318 PATCH: [ 1253950 ] cosmetic--remove old code in InitInstance
3320 PATCH: [ 1253951 ] trivial cosmetic comment upgrade in arg parsing
3324 Merge7z DllBuild 0015
3325 Merge7z: Merge7zCommon.cpp Merge7zCommon.h revision.txt
3326 Merge7z new files: Merge7z427.dsp Merge7z428.dsp Merge7z429.dsp
3327 Merge7zInstaller update
3328 Merge7zInstaller: Files.rc2 Installer.cpp Installer.rc
3331 PATCH: [ 1309423 ] Small typo in MergeSwedish.rc
3332 Submitted by Hans Eriksson
3333 Src/Languages/Swedish: MergeSwedish.rc
3336 PATCH: [ 1229867 ] RFE [ 1205516 ], RFE [ 887948 ], and other issues
3337 Cosmetic, transcribing comment from patch discussion
3341 PATCH: [ 1302608 ] crash on generating a report
3342 Submitted by Takashi Sawanaka
3343 Src: DirCmpReport.cpp
3346 BUG: [ 1298687 ] The files marked as 'skipped' are compared
3347 Fix from Takashi Sawanaka, comment updates by me
3351 PATCH: [ 1301504 ] Danish ShellExtension translation
3352 Submitted by Christial List
3353 ShellExtension/Languages: ShellExtensionDanish.rc
3356 PATCH: [ 1297642 ] Japanese translation update
3357 Submitted by Takashi Sawanaka
3358 ShellExtension/Languages: ShellExtensionJapanese.rc
3359 Src/Languages/Japanese: MergeJapanese.rc
3362 PATCH: [ 1297406 ] updated hungarian translation
3363 Submitted by Márton Balázs
3364 Src/Languages/Hungarian: MergeHungarian.rc
3367 PATCH: [ 1295701 ] Scrolling for dir compare report filename
3370 PATCH: [ 1295758 ] Update URL for downloads page (archive options)
3371 Src: PropArchive.cpp
3374 PATCH: [ 1295767 ] German Translation for 'Highlight Line * Diff'
3375 Src/Languages/German: MergeGerman.rc
3378 PATCH: [ 1294514 ] Set file loading traces debug-only
3380 PATCH: [ 1295473 ] updated italian rc file for winmerge 2.3.6
3381 Submitted by Andrea Decorte
3382 Src/Languages/Italian: MergeItalian.rc
3385 PATCH: [ 1292120 ] More significant diff navigations fixes
3386 Src: DiffList.cpp DiffList.h MergeDoc.cpp MergeEditView.cpp
3387 BUG: [ 1290305 ] ShellExtensionU.dll info missing from config log
3391 PATCH: [ 1292279 ] Various Updates in German Translation
3392 Src/Languages/German: MergeGerman.rc
3395 PATCH: [ 1290477 ] Catalan translation update
3396 Submitted by Jordi Vilar
3397 Src/Languages/Catalan: MergeCatalan.rc
3400 PATCH: [ 1289037 ] Some (non)significant diff count fixes
3401 Src: DiffList.cpp DiffList.h MergeDoc.cpp MergeEditView.cpp
3404 PATCH: [ 1284150 ] Fix Shell Extension registering problem
3405 Also bump version to 1.6
3406 ShellExtension: ShellExtension.cpp ShellExtension.rc
3409 BUG: [ 1284304 ] StaticLink crashes after mouse over event
3410 Changed signature of CStaticLink::OnSetCursor to start with CWnd *
3411 Src\Common: StaticLink.cpp StaticLink.h
3414 PATCH: [ 1285404 ] Various Updates in German Translation
3415 Src/Languages/German: MergeGerman.rc
3418 PATCH: [ 1284890 ] Use Changes.txt instead of readme.txt for ChangeLog
3419 Added ChangeLogs folder to project, and put Changes.txt (this),
3420 readme.txt, and CHANGELO into new ChangeLogs folder.
3421 PATCH: [ 1283466 ] French translation
3422 New translation by Jean-F Jolin
3423 Src/Languages/French: MergeFrench.rc
3426 Previous change history is in file readme.txt