3 (This summarizes all changes to all files under Src, including Src\Languages.)
6 PATCH: [ 1664689 ] French translation
7 Submitted by Jean-F Jolin
8 Src/Languages/French: MergeFrench.rc
11 Czech translation - update
12 Src/Languages/Czech/MergeCzech.rc
15 PATCH: [ 1667564 ] Various Updates in German Translation
16 Src/Languages/German: MergeGerman.rc
19 Cleanup WMGotoDlg constructor
21 CleanUp VSS dialog class
25 BUG: [ 1664731 ] Margin and line numbers not separated
26 Src/editlib: ccrystaltextview.cpp
27 BUG: [ 1664727 ] Empty file compare looks broken
28 Fix revision marks for scratchpads
29 Src/editlib: ccrystaltextview.cpp
30 BUG: [ 1664832 ] Typo Error in the Registry
31 ShellExtension: WinMergeShell.rgs
32 BUG: [ 1666559 ] Error on save option (WinMerge 2.7.1.7)
36 BUG: [ 1664727 ] Empty file compare looks broken
37 Src/editlib: ccrystaltextview.cpp
39 2007-02-20 WinMerge experimental release 2.7.1.7 (SVN revision 4120)
42 PATCH: [ 1663798 ] Add option and menuitem for file compare selection margin
43 Src: Merge.rc MergeEditView.cpp MergeEditView.h OptionsDef.h OptionsInit.cpp
45 Src/editlib: ccrystaltextview.cpp
46 Src/Languages/*: Merge*.rc
47 Remove commented out lines
51 PATCH: [ 1663012 ] Fix total count for compare progress dialog
52 Src: DirCompProgressDlg.cpp DirCompProgressDlg.h
53 Bug: [ 1663197 ] s/inproper/improper [in Changes.txt]
55 PATCH: [ 1642876 ] Open manual for command line help
56 Src: Merge.cpp Merge.h Merge.rc resource.h
57 Src/Languages/*: Merge*.rc
60 Czech translation - update
61 Src/Languages/Czech/MergeCzech.rc
64 PATCH: [ 1662002 ] Use two threads for folder compare
65 Src: Diffcontext.cpp Diffcontext.h DiffThread.cpp DiffThread.h DirScan.cpp
69 PATCH: [ 1640274 ] Icons for folder compare popup menu
70 Src: MainFrm.cpp Merge.dsp Merge.rc resource.h
71 Src/res new files: both.bmp left.bmp left_to_browse.bmp left_to_right.bmp
72 move_left_to_browse.bmp move_right_to_browse.bmp right.bmp
73 right_to_browse.bmp right_to_left.bmp
74 Src/Languages/*: Merge*.rc
77 PATCH: [ 1659183 ] Add Vista security attributes to manifest files
78 Src/res: WinMerge.exe.manifest WinMergeU.exe.manifest
81 PATCH: [ 1657664 ] Swedish translation update for Backup options
82 Submitted by Hans Eriksson
83 Src/Languages/Swedish: MergeSwedish.rc
86 Fix compile with VC6 (doesn't have CString::Append() or CString::AppendChar())
87 Src: MainFrm.cpp PropBackups.cpp
90 PATCH: [ 1650831 ] Polish translation update for WinMerge 2.6.4
91 Submitted by dr_prozac
92 Src/Languages/Polish: MergePolish.rc
95 Add accelerator keys to new Backup options dialog
97 Src/Languages/*: Merge*.rc
100 PATCH: [ 1582537 ] CSS syntax highlighter
102 editlib: ccrystaltextview.cpp ccrystaltextview.h
103 editlib new file: css.cpp
106 PATCH: [ 1652696 ] Add more options for backup files
107 Src: FileActionScript.cpp MainFrm.cpp MainFrm.h Merge.dsp Merge.rc MergeDoc.cpp
108 OptionsDef.h OptionsInit.cpp PropGeneral.cpp PropGeneral.h resource.h
109 Src new files: PropBackups.cpp PropBackups.h
110 Src/Common: PreferencesDlg.cpp PreferencesDlg.h
111 Src/Languages/*: Merge*.rc
114 Remove unused enum definition
122 Remove unused parameter from CMainFrame::SyncFileToVCS()
123 Src: FileActionScript.cpp MainFrm.cpp MainFrm.h
125 2007-02-01 WinMerge experimental release 2.7.1.6 (SVN revision 4094)
128 PATCH: [ 1636314 ] Fix limiting to single file compare window (2)
131 PATCH: [ 1639493 ] Updated Bulgarian language files
132 Submitted by tigertron
133 Src/Languages/Bulgarian: MergeBulgarian.rc
134 Docs/Users/Languages: Readme-Bulgarian.txt
135 PATCH: [ 1650043 ] Convert CDiffWrapper to use CompareOptions
136 Src: CompareOptions.cpp CompareOptions.h DiffWrapper.cpp DiffWrapper.h
137 Remove commented out include line
141 PATCH: [ 1648182 ] Separate Compare options from DiffWrapper
142 Src: CompareOptions.h DiffWrapper.h DirDoc.cpp DirDoc.h Merge.dsp
143 Src new file: CompareOptions.cpp
144 PATCH: [ 1646638 ] Catalan translation update
145 Submitted by Jordi Vilar
146 Src/Languages/Catalan: MergeCatalan.rc
149 Merge7z DllBuild 0019 - Unassociate .exe filename extension from NSIS format
150 ArchiveSupport/Merge7z: Merge7zCommon.cpp Merge7zCommon.h revision.txt
151 Support 7-Zip versions 4.43 & 4.44
152 ArchiveSupport/Merge7z new files: Merge7z443.dsp Merge7z444.dsp
153 ArchiveSupport/Merge7zInstaller: Files.rc2
156 PATCH: [ 1640741 ] patch for BUG:[ 1635100 ] Inefficient word-wrap code
157 Src: MergeEditView.cpp MergeEditView.h
158 Src/edtlib: ccrystaltextview.cpp ccrystaltextview.h
161 PATCH: [ 1644668 ] Fix ANSI regexps(2)
162 Src: DiffWrapper.cpp FileFilterHelper.cpp FilterList.cpp
165 PATCH: [ 1644668 ] Fix ANSI regexps
166 Src: DiffWrapper.cpp FileFilterHelper.cpp FilterList.cpp FilterList.h
167 PATCH: [ 1644820 ] Implement post-compare linefilters for folder compare
168 Src: DiffContext.cpp DiffContext.h DiffThread.cpp DiffThread.h DirDoc.cpp
169 DirDoc.h FolderCmp.cpp FolderCmp.h
172 PATCH: [ 1644785 ] 24bit icons for "Window" menu
173 Based on icons by Alexander Skinner
174 Src/res: cascade.bmp change_pane.bmp close.bmp horizontally.bmp vertically.bmp
175 PATCH: [ 1644800 ] 24bit "Goto" icon
176 Based on icons by Alexander Skinner
180 PATCH: [ 1642809 ] Move compare code out from DiffFileData
181 Src: DiffFileData.cpp DiffFileData.h DiffWrapper.cpp DirScan.cpp
182 DirViewColItems.cpp Merge.dsp
183 Src new files: FolderCmp.cpp FolderCmp.h
186 BUG: [ 1637433 ] Forget selected filter after close
187 Src: Merge.cpp OptionsInit.cpp
190 PATCH: [ 1636314 ] Fix limiting to single file compare window
192 Move options function call out of if() (for easier debugging)
196 PATCH: [ 1620076 ] Add Bazaar and Mercurial to SourceControl.flt
197 Submitted by René Leonhardt
198 Filters: SourceControl.flt
199 Add René Leonhardt to Contributors.txt
200 Docs/Users: Contributors.txt
201 PATCH: [ 1634968 ] Swedish translation update for 2.7.1.5+
202 Submitted by Hans Eriksson
203 Src/Languages/Swedish: MergeSwedish.rc
206 Update manual URL point to 2.6 version manual in readme.txt
207 Docs/Users/ReadMe.txt
208 Docs/Users/Languages/ReadMe-*.txt
209 PATCH: [ 1633581 ] Restrict expanding env variables in open dialog
210 Src: OpenDlg.cpp OpenDlg.h paths.cpp paths.h
213 PATCH: [ 1633194 ] Add editor tab setting to configuration log
214 Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
216 2007-01-10 WinMerge experimental release 2.7.1.5 (SVN revision 4030)
219 PATCH: [ 1631796 ] Use PCRE for filemask filtering
220 Src: DiffWrapper.cpp DirDoc.h FileFilterHelper.cpp FileFilterHelper.h Merge.cpp
221 Merge.dsp Ucs2Utf8.cpp Ucs2Utf8.h
222 Src/Common removed files: Regexp.cpp RegExp.h
223 PATCH: [ 1631806 ] Fix Filterspath initialization
224 Src: MainFrm.cpp MainFrm.h Merge.cpp Merge.h OptionsInit.cpp
227 BUG: [ 1631613 ] WinMerge crashes when editing code files
228 Src/editlib: ccrystaleditview.cpp
231 BUG: [ 1630630 ] Unexpected selection of text after changing pane
232 Src: MergeEditView.cpp
235 PATCH: [ 1597814 ] 'Wrap Lines' + 'Next Diff' Bug (3)
236 Src: MergeEditView.cpp MergeEditView.h
239 PATCH: [ 1631215 ] Remove used files
241 Src/Common deleted: listvwex.cpp listvwex.h
244 PATCH: [ 1593810 ] Line-filtering post compare
245 Src: DiffWrapper.cpp DiffWrapper.h MainFrm.cpp MainFrm.h Merge.dsp MergeDoc.cpp
246 Src new files: FilterList.cpp FilterList.h
249 BUG: [ 1597939 ] Rename Edits Wrong Field in Folder Compare List
253 BUG: [ 1567749 ] "Unable to compare files" needs short result
254 Src: DirViewColItems.cpp Merge.rc resource.h
255 Src/Languages/*: Merge*.rc
258 TODO: [ 1489875 ] Mimimum height for location pane visible area indicator
259 Src: LocationView.cpp
260 TODO: [ 1485038 ] Rename DIFFITEM::IsSideLeft() and IsSideRight()
261 Src: CompareStats.cpp DiffContext.cpp DiffFileData.cpp DiffItem.cpp DiffItem.h
262 DirActions.cpp DirDoc.cpp DirScan.cpp DirView.cpp DirViewColHandler.cpp
264 PATCH: [ 1567773 ] Change "Only in xxxxxxxxxx" to "Right Only: xxxxxxxxxx"
265 Src: DirViewColItems.cpp Merge.rc resource.h
266 Src/Languages/*: Merge*.rc
267 ConvertFilter() function in FileOrFolderSelect can be a static function
268 Src: FileOrFolderSelect.cpp FileOrFolderSelect.h
271 PATCH: [ 1628203 ] Reduce options caching in MergeEditView
272 Src: MergeEditView.cpp MergeEditView.h
273 PATCH: [ 1628299 ] Use OptionsMgr for archive options
275 PATCH: [ 1628263 ] Add debug-menuitem for resetting options
276 Src: MainFrm.cpp MainFrm.h Merge.rc resource.h
277 Src/Languages/*: Merge*.rc
280 PATCH: [ 1625344 ] Move OptionsMgr from MainFrame to MergeApp
281 Src: FileActionScript.cpp MainFrm.cpp MainFrm.h Merge.cpp Merge.h
282 OptionsInit.cpp PropRegistry.cpp PropTextColors.cpp SourceControl.cpp
283 Src/Common: OptionsMgr.h
284 Use Empty() method for CString instead of assigning empty string into it
285 Src/Common: varprop.h
288 PATCH: [ 1625022 ] Constify OptionsManager parameters
289 Src/Common: OptionsMgr.cpp OptionsMgr.h
292 PATCH: [ 1623772 ] Constify PathContext parameter strings
293 Src: PathContext.cpp PathContext.h
295 2006-12-21 WinMerge experimental release 2.7.1.4 (SVN revision 3991)
298 BUG: [ 1603061 ] "Copy Left/Right To .." doesn't work correctly(2)
299 Src: FileActionScript.cpp DirActions.cpp
302 BUG: [ 1606583 ] VC6 build is broken
303 Backout of patch [ 1603769 ] Send MergeCmdLineInfo between instances
304 Src: MainFrm.cpp Merge.cpp MergeCmdLineInfo.cpp MergeCmdLineInfo.h
305 Bump ShellExtension version to 1.10
306 ShellExtension: ShellExtension.rc
307 BUG: [ 1619689 ] Filefilter: ASP.NET Devel
311 PATCH: [ 1618358 ] Fix warning about non-standard extension with enum
313 PATCH: [ 1618364 ] Make GPL URL const string
317 PATCH: [ 1617502 ] Cleanup use of enum in MovedLines
321 BUG: [ 1614558 ] Goto line doesn't work when word wrap is enabled
322 Src: MergeEditView.cpp
325 BUG: [ 1602219 ] Crappy save of project files
326 Src: MainFrm.cpp ProjectFilePathsDlg.cpp
329 PATCH: [ 1614442 ] Swedish translation update for WinMerge 2.6.2
330 Submitted by Hans Eriksson
331 Src/Languages/Swedish: MergeSwedish.rc
334 BUG: [ 1584068 ] location pane is inaccurate when word wrap is on (2)
335 Src: LocationView.cpp LocationView.h MergeEditView.cpp
338 Fix error in logical condition for checking if item is directory
340 PATCH: [ 1610998 ] Splash screen does not stop timer
342 PATCH: [ 1611060 ] Move constants from Merge.cpp to FileOrFolderSelect.cpp
343 Src: FileOrFolderSelect.cpp Merge.cpp
346 BUG: [ 1611542 ] "Wrap lines" does not work for diff pane
347 Src: MergeDiffDetailView.cpp MergeDiffDetailView.h
350 PATCH: [ 1447744 ] Match lines inside diff blocks (based on Perry's patch)
351 Src new files: MergeDocDiffSync.cpp
352 Src: DiffList.h Merge.dsp Merge.rc MergeDoc.cpp MergeDoc.h OptionsDef.h OptionsInit.cpp
353 PropCompare.cpp PropCompare.h resource.h
354 Src/Languages/*: Merge*.rc
357 BUG: [ 1584068 ] location pane is inaccurate when word wrap is on
358 Src: LocationView.cpp LocationView.h MergeEditView.cpp MergeEditView.h
361 BUG: [ 1604115 ] No copyright info in aboutbox for translations
365 BUG: [ 1610877 ] wrong shortcut (localizazion IT, italian)
366 Src/Languages/Italian: MergeItalian.rc
369 PATCH: [ 1610442 ] Make time getting faster for files
370 Src: DirScan.cpp FileInfo.cpp
371 PATCH: [ 1610477 ] Fix UniFile for weird filetimes
372 Src/Common: UniFile.cpp UniFile.h
375 Add missing include to fix ANSI build target
376 Src: FileOrFolderSelect.cpp
378 2006-12-05 WinMerge experimental release 2.7.1.3 (SVN revision 3919)
381 PATCH: [ 1608846 ] Create a class for moved blocks
382 Src: DiffWrapper.cpp DiffWrapper.h Merge.dsp MergeDoc.cpp MergeDoc.h
383 Src new files: MovedLines.cpp MovedLines.h
384 PATCH: [ 1557295 ] Exclude Source Control files and directories filter
385 Submitted by Paul Welter
386 Filters new file: SourceControl.flt
387 Add Peter Welter and Ivan Masár to contributors
388 Docs/Users: Contributors.txt
391 PATCH: [ 1607193 ] INI Syntax Improvements
393 PATCH: [ 1608541 ] Use INI highlighter for VB6 project files
394 Src/editlib: ccrystaltextview.cpp
397 PATCH: [ 1607823 ] Remove manifest loading from lang dlls
398 Src/Languages/*: Merge*.rc
401 PATCH: [ 1597814 ] 'Wrap Lines' + 'Next Diff' Bug (2)
402 Src: MergeEditView.cpp
405 PATCH: [ 1556688 ] Fix maketstring to check for zero-term by MultiByteToWideCha
406 Src: Common/unicoder.cpp
407 PATCH: [ 1606496 ] Slovak translation (update)
408 Submitted by Ivan Masár
409 Src/Languages/Slovak: MergeSlovak.rc
412 Remove commented out code
416 BUG: [ 1589324 ] WinMegee crashes on copy
417 Src: FileFilterMgr.cpp
420 Fix filefilter regexp uppercasing for trunk
421 Src: FileFilterMgr.cpp
424 BUG: [ 1603077 ] Doesn't filter the file vc60.idb using "Merge_VC_loose.flt"
425 Filters: Merge_VC_loose.flt
428 BUG: [ 1603061 ] "Copy Left/Right To .." doesn't work correctly
432 PATCH: [ 1606496 ] Slovak translation
433 Submitted by Ivan Masár
434 ShellExtension/Languages: ShellExtensionSlovak.rc
435 Src/Languages/Slovak: MergeSlovak.rc
438 PATCH: [ 1597814 ] 'Wrap Lines' + 'Next Diff' Bug
439 Src: MergeEditView.cpp
442 PATCH: [ 1605682 ] Add Syntax Highlight option to config log
443 Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
444 PATCH: [ 1556685 ] Avoid infinite loop in character loop in crystal c++ parser
446 Src/editlib: asp.cpp basic.cpp batch.cpp cplusplus.cpp csharp.cpp dcl.cpp fortran.cpp
447 html.cpp innosetup.cpp is.cpp java.cpp lisp.cpp nsis.cpp. pascal.cpp perl.cpp php.cpp
448 python.cpp rexx.cpp rsrc.cpp ruby.cpp sgml.cpp sh.cpp siod.cpp sql.cpp tcl.cpp tex.cpp
452 BUG: [ 1603230 ] DirView icons isn't shown correctly on NT4.0
453 Src/res: equalfile.ico fileskip.ico lfile.ico notequalfile.ico rfile.ico
456 PATCH: [ 1604078 ] Hide skipped items by default
460 PATCH: [ 1603769 ] Send MergeCmdLineInfo between instances
461 Src: MainFrm.cpp Merge.cpp MergeCmdLineInfo.cpp MergeCmdLineInfo.h
464 BUG: [ 1602214 ] Incorrect work with associated files in WinMerge 2.7.1.2
466 PATCH: [ 1603196 ] Allow Open-dialog kind of folder selection for project files
467 Src: FileOrFolderSelect.cpp FileOrFolderSelect.h OpenDlg.cpp OpenDlg.h
470 BUG: [ 1603562 ] Location pane's bar outlines
471 Src: LocationView.cpp
474 Perry is not active developer
475 Docs/Users: Contributors.txt
478 PATCH: [ 1602365 ] Move SelectFile and SelectFolder routines to separate file
479 Src: DirActions.cpp DirCmpReportDlg.cpp FileFiltersDlg.cpp MainFrm.cpp Merge.cpp
480 Merge.dsp Merge.h MergeDoc.cpp OpenDlg.cpp PatchDlg.cpp ProjectFilePathsDlg.cpp
481 PropRegistry.cpp PropVss.cpp
482 Src/Common: PreferencesDlg.cpp
483 Src new files: FileOrFolderSelect.cpp FileOrFolderSelect.h
486 Fix bunch of doxygen warnings (wrong parameter names etc)
487 Src: CmdLineParser.h DiffWrapper.cpp DirDoc.cpp FilepathEdit.cpp files.cpp
488 paths.cpp PropEditor.cpp WMGotoDlg.h
490 2006-11-23 WinMerge experimental release 2.7.1.2 (SVN revision 3844)
493 PATCH: [ 1512881 ] Fix memleak from charsets.c
494 Src: charsets.cp charsets.h Merge.cpp
495 PATCH: [ 1596285 ] Unresolved external symbol __abs64 with VC7.1
496 Submitted by Gal, minor edit by Kimmo
497 Src: StdAfx.cpp StdAfx.h
498 BUG: [ 1584068 ] location pane is inaccurate when word wrap is on
500 Src: LocationView.cpp
503 PATCH: [ 1600714 ] Allow canceling when started from commandline
504 Src: Merge.cpp Merge.h
507 PATCH: [ 1600000 ] Fix project file Has*() functions
508 Src: ProjectFile.cpp ProjectFile.h
511 BUG: [ 1599631 ] WinMerge 2.7.1.1 ignores left dir in project file
515 PATCH: [ 1590831 ] Handle minimize argument (Bug 1570351)
516 Src: MergeDiffDetailView.cpp
517 Src/Common: SplitterWndEx.cpp
520 PATCH: [ 1598194 ] New command line parser
521 Src: MainFrm.cpp Merge.cpp Merge.dsp Merge.h
522 Src added files: ClearCaseCmdLineParser.cpp ClearCaseCmdLineParser.h
523 CmdLineParser.h MergeCmdLineInfo.cpp MergeCmdLineInfo.h
524 WinMergeCmdLineParser.cpp WinMergeCmdLineParser.h
525 Src removed files: CmdArgs.cpp CmdArgs.h MergeArgs.cpp
528 PATCH: Moved white-space trimming to FileFilterHelper class
529 Src: FileFilterHelper.cpp
531 2006-11-16 WinMerge experimental release 2.7.1.1 (SVN revision 3810)
534 PATCH: [ 1596692 ] Change the way modified docs are saved to fix several issues
535 Src: MainFrm.cpp MergeDiffDetailView.cpp MergeDoc.cpp MergeDoc.h
538 BUG: [ 1596285 ] Unresolved external symbol __abs64 with VC7.1
539 Src: StdAfx.cpp StdAfx.h
542 BUG: [ 1594188 ] /x option does not work
546 PATCH: [ 1586689 ] True color bookmark icon
547 Src/editlib: ccrystaltextview.cpp
548 Src/res: mg_icons.bmp
551 PATCH: [ 1590737 ] BCMenu update to v3.036
552 Src: BCMenu.cpp BCMenu.h
555 PATCH: [ 1591532 ] Remove unused XmlDoc class
557 Src removed files: XmlDoc.cpp XmlDoc.h
560 Add PCRE 6.7 (with windows build files from ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Contrib/)
561 New folder: /Externals/pcre
562 PATCH: [ 1591605 ] Add PCRE regexps and convert file filtering to PCRE
563 Src: FileFilterMgr.cpp FileFilterMgr.h Merge.dsp Plugins.cpp
564 Src new files: Ucs2Utf8.cpp Ucs2Utf8.h
567 PATCH: [ 1586705 ] DirView icons (Tim made [not]equalfile.ico)
568 Src/res: equalfile.ico fileskip.ico lfile.ico notequalfile.ico rfile.ico
571 PATCH: [ 1590892 ] Handle unicode paths for project files
575 PATCH: [ 1589427 ] Add back read-only handling for project files
577 PATCH: [ 1589438 ] Add read-only info to ProjectFile dialog
579 PATCH: [ 1589563 ] Fix crash with weird filetimes (and cleanup the code)
580 Src: DiffFileInfo.cpp DiffFileInfo.h DirScan.cpp DirViewColHandler.cpp
581 DirViewColItems.cpp FileInfo.cpp FileInfo.h
584 PATCH: [ 1589601 ] Add "ReDim" keyword to Visual Basic highlighter
585 Src\editlib: basic.cpp
588 Add Expat version 2.0.0 to /Externals/expat (revision: 3749)
589 New folder: /Externals/Expat
590 Add SCEW version 0.4.0 to /Externals/scew (revision: 3750)
591 New folder: /Externals/scew
592 PATCH: [ 1587574 ] Convert project files code to use expat+SCEW
593 Src: Merge.dsp ProjectFile.cpp ProjectFile.h
594 Remove folder: Src/ExpatLib/*
595 PATCH: [ 1588212 ] Add manifest file to resource file
597 Src/Languages/*: Merge*.rc
598 Move files from Installer/InnoSetup: WinMerge.exe.manifest WinMergeU.exe.manifest
602 PATCH: [ 1586869 ] Fix File Select -dialog modality (commit the file I missed in previous commit)
603 Src/Common: PreferencesDlg.cpp
606 PATCH: [ 1586869 ] Fix File Select -dialog modality
607 Src: DirCmpReportDlg.cpp FileFiltersDlg.cpp MainFrm.cpp Merge.cpp Merge.h
608 MergeDoc.cpp PatchDlg.cpp ProjectFilePathsDlg.cpp PropRegistry.cpp PropVss.cpp
609 PATCH: [ 1586892 ] Remove unused unknown.ico and code loading it
610 Src: DirView.cpp Merge.rc resource.h
611 Src/Languages/*: Merge*.rc
612 Remove file: Src/Res: unknown.ico
615 BUG: [ 1418805 ] Menu colors incorrect with non-standard color scheme
619 PATCH: [ 1584004 ] Delete "Toolbar.bmp"
620 Src/res deleted file: Toolbar.bmp
623 Fix compile warnings (some of them 64-bit), remove unused variables and code, fix types
625 Remove unused function, fix improper pointer usage
626 Src: FileFilterHelper.cpp
627 Fix casting a pointer type to DWORD (not 64-bit compatible)
628 Src: DirView.cpp DirView.h
631 PATCH: [ 1578419 ] Fix creating WinMerge folder to MyFolders always
632 Src: MainFrm.cpp MainFrm.h
633 Trivial type fixes, coding style fixes and converting comments to doxygen
634 Src: StdAfx.cpp StdAfx.h
635 Fix misuse of reference parameters (compiler warning)
639 PATCH: [ 1574696 ] Fix problem in saving filefilter to project file
640 Src: ProjectFilePathsDlg.cpp
643 BUG: [ 1573240 ] Crash in subversion trunk
644 Src: MainFrm.cpp MainFrm.h OptionsInit.cpp
647 BUG: [ 1570259 ] Bookmarks GUI get reset after save
648 Src/editlib: ccrystaltextview.cpp
651 BUG: [ 1570173 ] Crash when merging all differences
655 PATCH: [ 1555344 ] Separate active/inactive developers in Contributors.txt
656 Docs/Users: Contributors.txt
659 PATCH: [ 1572359 ] Various Updates in German Translation for WinMerge 2.6
660 Src/Languages/German: MergeGerman.rc
663 PATCH: [ 1570241 ] Various Updates in German Translation for WinMerge 2.6
664 Src/Languages/German: MergeGerman.rc
667 BUG: [ 1566783 ] Crash on Save Project when no file is selected
671 PATCH: [ 1567874 ] Change manual URL to point to 2.6 manual
675 BUG: [ 1564572 ] Leak memory on undoing
676 Src: GhostTextBuffer.h
677 Src/editlib: ccrystaltextbuffer.h
680 PATCH: [ 1565917 ] Register.bat to register ShellExt for 64-bit Windows
681 ShellExtension: Register.bat
682 BUG: [ 1563187 ] Can't close a file compare with -e switch
686 PATCH: [ 1565359 ] Various Updates in German Translation for WinMerge 2.6
687 Src/Languages/German: MergeGerman.rc
690 PATCH: [ 1564857 ] FindAnyFile function doesn't compile with VC6
691 Src/Common: coretools.cpp
694 PATCH: [ 1563171 ] Catalan translation update (Open-dialog)
695 Submitted by Jordi Vilar
696 Src/Languages/Catalan: MergeCatalan.rc
699 BUG: [ 1564283 ] Parameter -x causes files to be closed after merging
703 PATCH: [ 1564280 ] Stack corruption in LanguageSelect
704 Src/Common: LanguageSelect.cpp
707 Couple of type fixes to CMoveConstraint
708 Src/Common: CMoveConstraint.cpp CMoveConstraint.h
709 Fix check for pointer/value by using bit-shift instead of a cast + add trivial typecasts
710 Src: GhostTextBuffer.cpp
711 Src/editlib: ccrystaltextbuffer.cpp
714 PATCH: [ 1563157 ] Fix coretools.cpp for 64-bit
715 Src/Common: coretools.cpp coretools.h
716 Fix type in ccrystaltextbuffer.h
717 Src/editlib: ccrystaltextbuffer.h
718 PATCH: [ 1563171 ] Catalan translation update
719 Submitted by Jordi Vilar
720 Src/Languages/Catalan: MergeCatalan.rc
721 PATCH: [ 1563386 ] Spanish translation update
722 Submitted by Jesus M. Delgado 'Mack'
723 Src/Languages/Spanish: MergeSpanish.rc
724 Quiet warnings from DiffList.cpp
726 Some SPECIAL_ITEM_POS cleanups
727 Src: DirActions.cpp DirDoc.cpp DirView.cpp DirView.h
728 Fix check for pointer/value by using bit-shift instead of a cast
729 Src: GhostTextBuffer.h
730 Src/editlib: ccrystaltextbuffer.h
732 2006-09-21 WinMerge experimental release 2.5.7.1 (SVN revision 3600)
735 PATCH: [ 1558213 ] Tweak text positions in splash screen
737 Bump ShellExtension version to 1.9.0 (first 64-bit Windows version)
738 ShellExtension: ShellExtension.rc
739 Fix 64-bit typecast warning
740 Src: GhostTextBuffer.h
741 Fix 64-bit pointer truncation in SetWindowLongPtr call (the last I hope)
743 Minor tweaks to 64-bit ShellExtension project file
744 ShellExtension: ShellExtensionX64.vcproj
747 PATCH: [ 1561788 ] Fix 64-bit CFile constructor usage
748 Src/Common: UniFile.cpp
749 PATCH: [ 1561796 ] Get/SetWindowLong not supported in 64-bit Windows
750 Src: 7zCommon.cpp ChildFrm.cpp
751 Src/Common: CSubclass.cpp sizecbar.cpp
752 BUG: [ 1561781 ] 64-bit compile errors from 7zCommon.cpp
754 PATCH: [ 1561650 ] Separate FilterCommentsManager code from DiffWrapper
755 Src: DiffWrapper.cpp DiffWrapper.h Merge.dsp
756 Src new files: FilterCommentsManager.cpp FilterCommentsManager.h
757 Fix 64-bit compile warning by casting last SendMessage() param to LPARAM
759 Fix hex number used instead of INVALID_HANDLE_VALUE
760 Src/Common: sinstance.cpp
761 Fix 64-bit pointer truncation in SetWindowLongPtr call
765 PATCH: [ 1561001 ] Fix FileActionScript type in running actions
766 Src: FileActionScript.cpp
767 PATCH: [ 1561008 ] Warning fix for FileActionScript
769 PATCH: [ 1561080 ] Cleanup for loglevel definition
770 Src: DirDoc.cpp DirScan.cpp MainFrm.cpp Plugins.cpp StdAfx.cpp
771 Src/Common: LogFile.cpp LogFile.h
774 Cleanup 64-bit ShellExtension projectfile, add a debug target
775 ShellExtension: ShellExtensionX64.vcproj
778 PATCH: [ 1559619 ] 64-bit shellextension project file
779 ShellExtension new files: ShellExtensionX64.def ShellExtensionX64.vcproj
780 Remove unused variable
781 Src/editlib: memcombo.cpp
782 Remove unused variable
784 Fix typecasting warnings
785 Src: locality.cpp locality.h MergeDoc.cpp
786 Remove unused variable
787 Src: FileActionScript.cpp
788 Remove unused variable
789 Src: FileFiltersDlg.cpp
792 BUG: [ 1558839 ] ShellExtension does not compile as 64-bit
793 ShellExtension: WinMergeShell.cpp WinMergeShell.h
794 PATCH: [ 1558893 ] Fix incompatible prototype in MessageBoxDialog
795 Src/Common: MessageBoxDialog.cpp MessageBoxDialog.h
796 PATCH: [ 1558913 ] Fix OnTimer prototypes (64-bit compatibility)
797 Src: ChildFrm.cpp ChildFrm.h DircompProgressDlg.cpp DirCompProgressDlg.h DirView.cpp
798 Dirview.h MainFrm.cpp MainFrm.h MergeEditview.cpp MergeEditView.h OpenDlg.cpp
799 Opendlg.h Splash.cpp Splash.h
800 Src/Common: MessageBoxDialog.cpp MessageBoxDialog.h
801 Src/editlib: ccrystaltextview2.cpp ccrystaltextview.h
804 BUG: [ 1547247 ] WinMerge ANSI target does not compile with VS2005
806 Src: Common/SuperComboBox.cpp
807 PATCH: [ 1558152 ] Italian translation updated
808 Submitted by Andrea Decorte
809 Src/Languages/Italian: MergeItalian.rc
812 PATCH: [ 1555764 ] prevent from shaking in view when pressing F5 down
813 Src: GhostTextView.cpp MergeDiffDetailView.cpp
816 PATCH: [ 1556851 ] An Swedish translation update
817 Submitted by Hans Eriksson
818 Src/Languages/Swedish: MergeSwedish.rc
820 2006-09-11 WinMerge beta release 2.5.6 (revision 3552)
823 Japanese translation - update
824 Src/Languages/Japanese: MergeJapanese.rc
827 PATCH: [ 1555764 ] prevent from shaking in view when pressing F5 down
828 Src: GhostTextView.cpp GhostTextView.h MergeDiffDetailView.cpp MergeDiffDetailView.h
831 BUG: [ 1555664 ] fail to copy all to right when enabling moved block detect
835 Czech translation update from Jan Hryz
836 Src/Languages/Czech/MergeCzech.rc
837 PATCH: [ 1553714 ] Add new commandine switches to help dialog
838 Src: Merge.rc MergeArgs.cpp resource.h
839 Src/Languages/*: Merge*.rc
840 PATCH: [ 1552228 ] Don't use 'export' as variable name
844 RFE: [ 1533506 ] Need commandline switch for single-instance
848 PATCH: [ 1552901 ] Update VC loose filefilter
849 Filters: Merge_VC_loose.flt
850 PATCH: [ 1552917 ] Fix GUI for autocompletion option
852 Src/Languages/*: Merge*.rc
855 PATCH: [ 1552095 ] Fix last compare method not visible in GUI list
857 Src/Languages/*: Merge*.rc
860 PATCH: [ 1551332 ] defer loading plugin
861 Src: MainFrm.cpp Merge.rc MergeDoc.cpp MergeEditView.cpp MergeEditView.h
862 Src/Languages/*: Merge*.rc
865 BUG: [ 1550427 ] WinMerge 2.5.5.7 don't save "Include subfoders by default"
866 Src: PropRegistry.cpp
869 Japanese translation - update
870 Src/Languages/Japanese: MergeJapanese.rc
873 PATCH: [ 1544777 ] Compare by size
874 Forgot to commit Options-dialog changes last time so option for this wasn't visible
876 BUG: [ 1547262 ] Suspicious bit shift warning
878 Src/Common: UniFile.cpp
881 PATCH: [ 1547190 ] Fix VS2005 compile
885 BUG: [ 1546938 ] New toolbar icons only works for 'disabled' icons
886 Src/Languages/*/Merge*.rc
889 Fix compiling WinMerge after moving folders around (Merge7z moved under ArchiveSupport)
892 ***** Switch to Subversion *****
894 2006-08-24 WinMerge experimental release 2.5.5.7 (cvs)
897 PATCH: [ 1545411 ] Add some missing options to configlog
898 Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
899 PATCH: [ 1545165 ] WinMarge Bulgarian Translation
900 Submitted by tigertron
901 Src/Languages/Bulgarian: MergeBulgarian.rc
902 Docs/Users/Languages: Readme-Bulgarian.txt
903 Docs/Users/Contributors.txt
904 InnoSetup: WinMerge.iss
905 ShellExtension: ShellExtension.rc
906 ShellExtension/Languages: ShellExtensionBulgarian.rc
907 PATCH: [ 1545890 ] Swedish translation for update for WinMerge 2.5.5.7+
908 Submitted by Hans Eriksson
909 Src/Languages/Swedish: MergeSwedish.rc
910 BUG: [ 1545082 ] Crash when comparing .rc files
911 Fix submitted by Takashi
912 Src/editlib: ccrystaltextview.cpp
915 PATCH: [ 1544905 ] Use stat() to check if file is read-only
916 Src: files.cpp files.h
917 PATCH: [ 1544777 ] Compare by size
918 Src: DiffWrapper.h DirScan.cpp Merge.rc resource.h
919 Src/Languages/*: Merge*.rc
922 PATCH: [ 1541427 ] Using as an external diff tool (RFE 1454623)
923 Src: MainFrm.cpp MainFrm.h MergeArgs.cpp MergeDoc.cpp
926 PATCH: [ 1544784 ] Use as ClearCase external merge tool
930 BUG: [ 1543783 ] Misbehave margin draw
931 Src/editlib: ccrystaltextview.cpp
934 PATCH: [ 1544147 ] Add Install-feature for file filters
935 Src: FileFiltersDlg.cpp FileFiltersDlg.h Merge.rc resource.h
936 Src/Languages/*: Merge*.rc
937 BUG: [ 1534429 ] Message IDS_SUGGEST_IGNOREEOL incorrect
941 PATCH: [ 1424673 ] Widen labels on OpenDialog
944 Src/Languages/*: Merge*.rc
947 PATCH: [ 1542201 ] Change default user filter folder to WinMerge/Filters
949 PATCH: [ 1542829 ] Rename Format-item in File-menu to Convert
951 Src/Languages/*: Merge*.rc
954 PATCH: [ 1540090 ] Change horizontal scroll synch from relative to absolute
955 Src/Common: SplitterWndEx.cpp
958 PATCH: [ 1541158 ] New high-color toolbar icons
959 Src: BCMenu.cpp MainFrm.cpp MainFrm.h Merge.rc resource.h
960 Src/res: ToolbarDisabled.bmp ToolbarEnabled.bmp
963 PATCH: [ 1539568 ] draw icon at modified line (it was changed to line revision marks)
964 Src: GhostTextBuffer.cpp GhostTextBuffer.h MergeDoc.cpp MergeDoc.h
965 Src/editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h ccrystaltextview.cpp
968 PATCH: [ 1456356 ] Scrollbars sometimes not initially active
972 PATCH: [ 1540129 ] Fix indentation of diffutils io.c
973 Src/diffutils/src: IO.C
974 PATCH: [ 1540054 ] Remove Copy All -items from folder compare menu
976 Src/Languages/*: Merge*.rc
977 PATCH: [ 1535558 ] Add GUI for shell extension folder include
978 Src: Merge.rc PropRegistry.cpp PropRegistry.h resource.h
979 Src/Languages/*: Merge*.rc
982 BUG: [ 1538340 ] Undo enabled for folder compare.
983 Src: DirView.h DirView.cpp
986 Japanese translation - update
987 Src/Languages/Japanese: MergeJapanese.rc
990 PATCH: [ 1539204 ] Remove '#' from '#differences' column
992 Src/Languages/*: Merge*.rc
995 PATCH: [ 1538264 ] Split DiffFileData class to own files
996 Src: DiffWrapper.cpp DiffWrapper.h DirScan.cpp DirViewColItems.cpp Merge.dsp
997 Src new files: DiffFileData.cpp DiffFileData.h
998 PATCH: [ 1537261 ] Swedish 2.5.5.6+ translation update
999 Submitted by Hans Eriksson
1000 Src/Languages/Swedish: MergeSwedish.rc
1003 Fix doxygen comment for ImportOptions()
1004 Src/Common: OptionsMgr.cpp
1007 PATCH: Code cleanup. Removed commented out code.
1008 Src/Common: SuperComboBox.cpp
1010 BUG: [ 1531965 ] Crash undoing empty (?) event
1011 Src/editlib: ccrystaleditview.cpp
1014 Czech translation - update
1015 Src/Languages/Czech/MergeCzech.rc
1018 PATCH: [ 1310951 ] Option to copy DirCmpReport to clipboard
1019 Src: DirCmpReport.cpp DirCmpReport.h DirCmpReportDlg.cpp DirCmpReportDlg.h
1021 Src/Languages/*: Merge*.rc
1024 Czech translation - update
1025 Src/Languages/Czech/MergeCzech.rc
1027 2006-08-08 WinMerge experimental release 2.5.5.6 (cvs)
1030 BUG: [ 1535835 ] Import settings from the file
1031 Src/Common: PreferencesDlg.cpp PreferencesDlg.h
1032 PATCH: [ 1536240 ] Fix diff count numbers for real
1033 Src: DiffWrapper.cpp DirScan.cpp
1034 Src/diffutils/src: analyze.c UTIL.c
1037 PATCH: [ 1514487 ] Merge7z DllBuild 0018
1038 Merge7z: Merge7z311.cpp Merge7z409.cpp Merge7zCommon.cpp Merge7zCommon.h
1039 revision.txt Merge7z*.dsp
1040 Merge7z new files: Merge7z433.dsp Merge7z434.dsp Merge7z435.dsp Merge7z436.dsp
1041 Merge7z437.dsp Merge7z438.dsp Merge7z439.dsp Merge7z440.dsp Merge7z442.dsp
1042 Merge7zInstaller: Installer.cpp Installer.rc Files.rc2
1043 Change recommended version of 7-Zip to 4.42
1047 PATCH: [ 1535175 ] Shell ext: Add flag for subfolder inclusion
1048 ShellExtension: WinMergeShell.cpp WinMergeShell.h
1049 Bump ShellExtension version to 1.8.0
1050 ShellExtension: ShellExtension.rc
1053 BUG: [ 1533292 ] crash when specifying nonexistent project file.
1057 PATCH: [ 1534770 ] Add "don't wrap end of file" option for Find
1058 Src: Merge.rc resource.h
1059 Src/editlib: ccrystaleditview.cpp ccrystaltextview.cpp ccrystaltextview.h
1060 ceditreplacedlg.cpp cfindtextdlg.cpp cfindtextdlg.h
1061 Src/Languages/*: Merge*.rc
1062 BUG: [ 1534461 ] WinMerge 2.5.5.5 ingoring subfolders option in project files
1063 Src: MainFrm.cpp Merge.cpp
1066 Czech translation - update
1067 Src/Languages/Czech/MergeCzech.rc
1069 2006-08-03 WinMerge experimental release 2.5.5.5 (cvs)
1072 PATCH: [ 1533457 ] Add Refresh Selected -item to Folder compare main menu
1073 Src: DirActions.cpp DirView.cpp DirView.h Merge.rc
1074 Src/Languages/*: Merge*.rc
1077 PATCH: [ 1532743 ] Improve difference count columns in folder compare
1078 Src: DiffItem.h DiffItemList.cpp DirScan.cpp DirVierwColItems.cpp
1080 Src/Languages/*: Merge*.rc
1081 PATCH: [ 1529864 ] Stop using Application Data folders as filefilter folders
1082 Src: FileFilterHelper.cpp FileFilterHelper.h
1085 PATCH: [ 1531845 ] Fix memory leak after find
1086 Src/editlib: ccrystaltextview.cpp
1087 PATCH: [ 1531957 ] Fix imagelist memory leak in editor
1088 Src/editlib: ccrystaltextview.cpp
1089 PATCH: [ 1430331 ] New Debug menu
1090 Submitted by Perry, modified by me
1091 Src: MainFrm.cpp MainFrm.h Merge.rc resource.h
1092 Src/Languages/*: Merge*.rc
1093 PATCH: [ 1531319 ] Tidy Folder compare progress dialog
1095 Src/Languages/*: Merge*.rc
1098 PATCH: [ 1531293 ] Fix wrong cursor position after find
1099 Src: ccrystaltextview.cpp ccrystaltextview.h cfindtextdlg.cpp
1100 PATCH: [ 1406051 ] code cleanup for ScriptFileActions
1102 Src: DirActions.cpp FileActionScript.cpp FileActionScript.h
1103 PATCH: [ 1530459 ] Add some doxygen comments for ViewableWhitespace
1104 Src: ViewableWhitespace.cpp ViewableWhitespace.h
1107 BUG: [ 1528322 ] Crash when using F6 / Bugg for file differences
1108 Src: MergeEditView.cpp
1111 PATCH: [ 1530352 ] Start flashing WinMerge window when folder compare is ready
1112 Src: DirView.cpp MainFrm.cpp MainFrm.h
1113 PATCH: [ 1529995 ] Swedish translation update for 2.5.5.4+
1114 Submitted by Hans Eriksson
1115 Src/Languages/Swedish: MergeSwedish.rc
1116 PATCH: [ 1530655 ] Catalan translation update
1117 Submitted by Jordi Vilar
1118 Src/Languages/Catalan: MergeCatalan.rc
1121 PATCH: [ 1529915 ] Refresh menu on DirView does not work correctly
1122 Src: DirActions.cpp DirScan.cpp
1125 PATCH: [ 1529599 ] Cleanup DiffWrapper
1126 Src: DiffWrapper.cpp DiffWrapper.h MergeDoc.cpp PatchTool.cpp
1127 PATCH: [ 1529965 ] Add error messages for managing file filters
1128 Src: FileFiltersDlg.cpp FileFiltersDlg.h Merge.rc resource.h
1129 Src/Languages/*: Merge*.rc
1132 PATCH: [ 1527843 ] prevent dialog from flickering
1133 Src: DirCompProgressDlg.cpp DirView.cpp
1134 Src/Common: CMoveConstraint.cpp
1137 PATCH: [ 1528841 ] Cleanup ByteComparator
1138 Src: ByteComparator.cpp ByteComparator.h FileTextStats.h
1139 PATCH: [ 1528987 ] Use 64-bit variable as file position in Bytecompare
1140 Src: ByteComparator.cpp ByteComparator.h DiffWrapper.cpp FileTextStats.h
1141 PATCH: [ 1529053 ] Success message for loading/saving project file
1142 Src: Merge.rc ProjectFilePathsDlg.cpp resource.h
1143 Src/Languages/*: Merge*.rc
1146 PATCH: [ 1528444 ] Cleanup for AppSerialize
1147 Src: AppSerialize.cpp AppSerialize.h
1150 PATCH: [ 1527771 ] Remove Apply syntax highlight to other side option
1151 Src: Merge.rc MergeDoc.cpp OptionsDef.h OptionsInit.cpp PropEditor.cpp
1152 PropEditor.h resource.h
1153 Src/Languages/*: Merge*.rc
1156 PATCH: [ 1527947 ] Various Updates in German Translation for WinMerge 2.5
1157 Src/Languages/German: MergeGerman.rc
1160 PATCH: [ 1526918 ] Detect which side file is binary file
1161 Src: DiffItem.h DiffWrapper.cpp DiffWrapper.h
1162 Src/diffutils/src: DIFF.H IO.c analyze.c
1164 2006-07-20 WinMerge experimental release 2.5.5.4 (cvs)
1167 PATCH: [ 1525013 ] Add description for ASP.NET filter
1169 PATCH: [ 1525417 ] Move MovedBlock code to own file
1170 Src: DiffWrapper.cpp Merge.dsp
1171 Src new file: MovedBlocks.cpp
1172 PATCH: [ 1525531 ] Allow comparing project files from Open-dialog
1174 Config log files are .txt files (not .log)
1176 BUG: [ 1495212 ] Wrong cursor position after selecting wordwrapped line
1178 Src/editlib: ccrystaltextview.cpp
1181 Czech translation - update
1182 Src/Languages/Czech/MergeCzech.rc
1185 BUG: [ 1198248 ] version copyright symbol needs review
1186 Src/Languages/*: MergeChineseSimplified.rc MergeChineseTraditional.rc MergeJapanese.rc
1190 BUG: [ 1525451 ] ASSERT in CCrystalTextView::DrawSingleLine()
1191 Src/editlib: ccrystaltextview.cpp
1192 BUG: [ 1525466 ] ASSERT in CCrystalTextView::AssertValidTextPos()
1193 Src/editlib: ccrystaltextview2.cpp
1196 BUG: [ 1524832 ] Bogus include's
1197 Src: DirColsDlg.cpp PropEditor.cpp
1198 PATCH: [ 1522037 ] Add read-only option for paths in Project file
1199 Src: MainFrm.cpp Merge.cpp Merge.rc OpenDlg.cpp OpenDlg.h ProjectFile.cpp
1200 ProjectFile.h ProjectFilePathsDlg.cpp ProjectFilePathsDlg.h resource.h
1201 Src/Languages/*: Merge*.rc
1202 PATCH: [ 1525025 ] Copy/paste error in MainFrm.cpp
1204 PATCH: [ 1525198 ] Version info misses copyright (c) char
1208 Fix and improve comment for folder compare columns table
1210 BUG: [ 1524251 ] File filter does not work on 2.5.5.3
1211 Original fix from Takashi, modified by Kimmo
1212 Src: FileFilterMgr.cpp
1215 PATCH: [ 1517057 ] Option to Ignore Multiline Comments (bugfix for single-line comments)
1216 Submitted by David Maisonave
1217 Src: DiffWrapper.cpp
1220 Strip SuperComboBox strings before saving
1221 Src/Common: SuperComboBox.cpp
1223 2006-07-14 WinMerge experimental release 2.5.5.3 (cvs)
1226 BUG: [ 1521555 ] Location Pane - can't see current location because of color
1227 Use 3d-color instead of scrollbar color in location pane
1228 Src: LocationView.cpp
1229 PATCH: [ 1521696 ] Improve Text color option dialog
1230 Src: Merge.rc PropTextColors.cpp PropTextColors.h
1231 Src/Languages/*: Merge*.rc
1234 PATCH: [ 1521352 ] Cleanup char constants for CRegExep
1235 Src/Common: RegExp.cpp
1236 PATCH: [ 1521392 ] Fix reading last line in linefilter file
1237 Src: FileFilterMgr.cpp
1238 BUG: [ 1498511 ] Conflict accelerator key in IDR_DIRVIEWMENU
1240 Src/Languages/*: Merge*.rc
1241 PATCH: [ 1517057 ] Option to Ignore Multiline Comments (bugfix + rename to filtering)
1242 Submitted by David Maisonave
1243 Src: DiffWrapper.cpp DiffWrapper.h DirDoc.cpp MainFrm.cpp Merge.rc MergeDoc.cpp
1244 OptionsDef.h OptionsInit.cpp PropCompare.cpp Propcompare.h resource.h
1245 Src/Languages/*: Merge*.rc
1246 PATCH: [ 1517057 ] Option to Ignore Multiline Comments (bugfix)
1247 Submitted by David Maisonave
1248 Src: DiffWrapper.cpp
1251 PATCH: [ 1517057 ] Option to Ignore Multiline Comments
1252 Submitted by David Maisonave
1253 Src: DiffWrapper.cpp DiffWrapper.h DirDoc.cpp MainFrm.cpp Merge.rc MergeDoc.cpp
1254 OptionsDef.h OptionsInit.cpp PatchTool.cpp PropCompare.cpp Propcompare.h
1256 Src/Languages/*: Merge*.rc
1257 Add Ed_K and David Maisonave to Contributors
1258 Docs/Users: Contributors.txt
1259 Document UniMemFile::ReadString() function parameters and return values
1260 Src/Common: UniFile.cpp
1263 Quiet warning about deprecated function for VS2003 and later
1267 PATCH: [ 1517362 ] Ensure diff is visible in location view
1268 Src: LocationView.cpp
1269 Fix codinstyle in LocationView.cpp (messed up by patch #1517362)
1270 Src: LocationView.cpp
1271 Make VS2005 build less noisy by defining _CRT_SECURE_NO_DEPRECATE for it
1275 PATCH: [ 1516626 ] Enable double-click in column customization dialog
1276 Src: DirColsDlg.cpp DirColsDlg.h
1277 PATCH: [ 1514435 ] Optimize versioninfo reading
1278 Src: AboutDlg.cpp ConfigLog.cpp Splash.cpp
1279 Src/Common: version.cpp version.h
1282 BUG: [ 1303166 ] crash or freeze on closing all window
1285 2006-07-03 WinMerge experimental release 2.5.5.2 (cvs)
1288 PATCH: [ 1515380 ] Page Up/Down Anomaly
1290 Src/editlib: ccrystaltextview2.cpp
1291 PATCH: [ 1515966 ] Use View-IDs in MergeDoc.cpp
1292 Src: MergeDoc.cpp MergeDoc.h
1293 PATCH: [ 1516016 ] Fix poor handling of invalid tab size in Options-dialog
1294 Src: Merge.rc PropEditor.cpp PropEditor.h resource.h
1295 Src/Languages/*: Merge*.rc
1296 Fix comment in DiffList.cpp
1300 PATCH: [ 1515669 ] Add selected difference marker for locationview
1301 Src: LocationView.cpp LocationView.h
1304 PATCH: [ 1514459 ] Cleanup for LocationView code (use view ID)
1305 Src: LocationView.cpp LocationView.h StdAfx.h
1306 PATCH: [ 1514580 ] Tweak location view bar look
1307 Src: LocationView.cpp
1310 PATCH: [ 1514645 ] Various Updates in German Translation for WinMerge 2.5
1311 Src/Languages/German: MergeGerman.rc
1314 PATCH: [ 1513618 ] Fix Merge.rc translation id
1318 PATCH: [ 1512708 ] Fix compile with VS2005
1319 Also additional cleanup for CCrystalTextView::GetMarginWidth()
1320 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
1321 PATCH: [ 1512726 ] Fix combining filesize from two values
1322 Src: DiffFileInfo.cpp DirScan.cpp FileInfo.cpp FileInfo.h
1323 PATCH: [ 1512775 ] Fix encoding columns showing -1
1324 Src: FileTextEncoding.cpp FileTextEncoding.h
1327 PATCH: [ 1510596 ] Updated Readme-Swedish.txt
1328 Submitted by Hans Eriksson
1329 Docs/Users/Languages: ReadMe-Swedish.txt
1330 PATCH: [ 1510600 ] Updated MergeSwedish.rc file for 2.5.5.1+
1331 Submitted by Hans Eriksson
1332 Src/Languages/Swedish: MergeSwedish.rc
1333 BUG: [ 1483242 ] Needless resource file 'MergeSwedish_LastTranslation.rc'?
1334 Remove unneeded file
1335 Removed: Src/Languages/Swedish: MergeSwedish_LastTranslation.rc
1336 BUG: [ 1489034 ] Src/Common/LanguageSelect.rc unused?
1337 Remove unneeded file
1338 Removed: Src/Common/LanguageSelect.rc
1339 Remove unused files (language.h & language.c)
1340 Removed: Src: language.c language.h
1342 2006-06-21 WinMerge experimental release 2.5.5.1 (cvs)
1345 PATCH: [ 1509505 ] Manual: new compare method and options export/import
1346 Docs/Users/Manual: Configuration.xml
1347 Bump manual revision to 1.2.4
1348 Docs/Users/Manual: WinMerge_help.xml
1349 Bump ShellExtension version to 1.7.2
1350 ShellExtension: ShellExtension.rc
1353 BUG: [ 1505763 ] Crash after closing file compare window
1354 Src: MergeEditView.cpp
1355 PATCH: [ 1508865 ] Improve error handling for loading file filters
1356 Src: FileFilterHelper.cpp FileFilterMgr.cpp FileFilterMgr.h FileFiltersDlg.cpp
1358 PATCH: [ 1508898 ] Show binary as one of EOL types
1359 Src: DirViewColItems.cpp Merge.rc resource.h
1360 Src/Languages/*: Merge*.rc
1361 PATCH: [ 1506184 ] Polish translation update for WM 2.5.4.0
1362 Submitted by dr_prozac
1363 Src/Languages/Polish: MergePolish.rc
1364 PATCH:[ 1509495 ] Polish translation for ShellExtension
1365 Submitted by dr_prozac
1366 ShellExtension/Languages: ShellExtensionPolish.rc
1369 RFE: [ 1499245 ] Ruby Syntax Highlighting
1371 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h ruby.cpp
1374 BUG: [ 1494776 ] Can't rename files if '|' seperator exists
1375 Src: DirView.h DirView.cpp DirActions.cpp
1378 BUG: [ 1486434 ] Copy Pathnames for right-only dir copies parent dir only
1382 PATCH: [ 1483544 ] New compare method: by date and size
1383 Src: DiffWrapper.h DirScan.cpp Merge.rc PropCompare.cpp resource.h
1384 Src/Languages/*: Merge*.rc
1387 BUG: [ 1496066 ] WinMerge crashed with those files
1388 Src: GhostTextView.cpp GhostTextView.h
1391 BUG: [ 1494610 ] Wrong selection in ccrystalview2.cpp
1392 Src/editlib: ccrystaltextview2.cpp
1393 PATCH: [ 1497817 ] Cleanup CCrystalTextView::GetLineBySubLine
1394 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
1397 PATCH: [ 1497154 ] Fix memory leak in wordwrap code
1398 Src/editlib: ccrystaltextview.cpp
1399 PATCH: [ 1497068 ] Initialize cursorpositions in GhostTextView
1400 Src: GhostTextView.h
1401 PATCH: [ 1497147 ] Cleanup CCrystalTextView::ClientToText
1402 Src/editlib: ccrystaltextview.cpp
1405 BUG: [ 1494610 ] Wrong selection in ccrystalview2.cpp
1407 Src/editlib: ccrystaltextview2.cpp
1410 PATCH: [ 1495017 ] Translate 'Textcolors' options to German
1411 Src/Languages/German: MergeGerman.rc
1414 PATCH: [ 1494627 ] Skip processing empty paths in Open dialog
1416 Doxygen comments and trivial cleanups for paths.cpp & paths.h
1417 Src: paths.cpp paths.h
1420 PATCH: [ 1493742 ] Limit vertical scrolling to last line of files
1421 Src/editlib: ccrystaltextview.cpp
1422 PATCH: [ 1493868 ] Add bookmark by double-clicking selection frame
1423 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h ccrystaltextview2.cpp
1424 PATCH: [ 1492458 ] Swedish translation update for 2.5.4.0
1425 Submitted by Hans Eriksson
1426 Src/Languages/Swedish: MergeSwedish.rc
1427 Add some const keywords and fix comments, remove unused function.
1428 Src: DiffList.cpp DiffList.h
1429 BUG: [ 1488797 ] ASSERT in CMergeEditView::OnPrevdiff
1431 Src: MergeEditView.cpp
1434 PATCH: [ 1493713 ] Translate 'Bookmarks' feature to German
1435 Src/Languages/German: MergeGerman.rc
1438 PATCH: [ 1491436 ] Spanish Readme.txt
1439 Submitted by Jesus M. Delgado 'Mack'
1440 Docs/Users/Languages new file: ReadMe-Spanish.txt
1441 InnoSetup: WinMerge.iss
1444 PATCH: [ 1491993 ] Ability to rename files (RFE 1380228)
1445 Src: DirActions.cpp DirView.cpp DirView.h Merge.rc resource.h
1448 PATCH: [ 1491212 ] Czech Translation
1449 Submitted by: Jan Hryz
1450 Src/Languages/Czech/MergeCzec.rc
1451 PATCH: [ 1492025 ] Catalan translation update
1452 Submitted by Jordi Vilar
1453 Src/Languages/Catalan: MergeCatalan.rc
1454 PATCH: [ 1491424 ] Spanish translation for v2.5.3.7
1455 Submitted by Jesus M. Delgado 'Mack'
1456 Languages/Spanish: MergeSpanish.rc
1458 2006-05-18 WinMerge beta release 2.5.4
1461 PATCH: [ 1490540 ] Manual: add picture and explanation about our version tree
1462 Docs/Users/Manual: Introduction.xml
1463 Docs/Users/Manual/build: build_html.bat build_htmlhelp.bat
1464 Docs/Users/Manual/Art new files: WinMerge_versions.gif WinMerge_versions.odg
1467 PATCH: [ 1489824 ] Better default folder for user filters
1469 BUG: [ 1445975 ] BuildDll.bat exit is not good
1470 Src/Languages: BuildDll.bat
1471 PATCH: [ 1488387 ] Russian translation update for 2.4.6
1472 Submitted by Dmitriy Aleshkowskiy
1473 Src/Languages/Russian: MergeRussian.rc
1476 PATCH: [ 1489133 ] Manual: document new filter location(s)
1477 Docs/Users/Manual: Filters.xml
1478 PATCH: [ 1489091 ] Enable Help/Index
1480 PATCH: [ 1489098 ] Doesn't open Help TOC correctly
1482 BUG: [ 1487856 ] Long delay if many language dlls
1484 Src/Common: LanguageSelect.cpp LanguageSelect.h
1485 BUG: [ 1487854 ] ASSERT in CCrystalTextView::OnPrint
1486 Fix suggested by Mallato
1487 Src/editlib: ccrystaltextview.cpp
1488 Graphic Design: Alexander Skinner
1489 Docs/Users: Contributors.txt
1490 BUG: [ 1478057 ] Memory leak when cancelling print preview
1491 Fix suggested by Mallato
1492 Src/editlib: ccrystaltextview.cpp
1495 PATCH: [ 1488637 ] PHP/ASP Syntax Highlighting Fix (Bug 1441643)
1496 Src/editlib: asp.cpp php.cpp
1499 PATCH: [ 1485861 ] Czech translation - update
1500 Submitted by: Jan Hryz
1501 Src/Languages/Czech/MergeCzec.rc
1502 PATCH: [ 1483553 ] Swedish MergeSwedish.rc 1.304 2.5.3.7 update
1503 Submitted by Hans Eriksson
1504 Src/Languages/Swedish: MergeSwedish.rc
1505 PATCH: [ 1484004 ] Manual: new Open-dialog screenshot and small fixes
1506 Docs/Users/Manual: Quick_start.xml
1507 Docs/Users/Manual/screenshots: OpenDlg1.gif
1508 PATCH: [ 1484013 ] Manual: small changes to Introduction chapter
1509 Docs/Users/Manual: Introduction.xml
1510 PATCH: [ 1484092 ] Manual: preliminary whats new list for 2.5
1511 Docs/Users/Manual: Whatsnew_2_1.xml
1512 PATCH: [ 1484101 ] Manual: Add index
1513 Docs/Users/Manual: WinMerge_help.xml
1514 PATCH: [ 1484142 ] Manual: update some options descriptions
1515 Docs/Users/Manual: Configuration.xml
1518 PATCH: [ 1483344 ] Fix creating private file filters
1519 Src: FileFiltersDlg.cpp
1520 PATCH: [ 1483486 ] Add commenting for CLogFile
1521 Src/Common: LogFile.cpp LogFile.h
1524 PATCH: [ 1483107 ] Remove dublicated code from folder compare progress dlg
1525 Src: DirCompProgressDlg.cpp DirCompProgressDlg.h
1526 PATCH: [ 1483088 ] Add GUI for user to select filter folder
1527 Src: FileFilterHelper.cpp FileFilterHelper.h FileFiltersDlg.cpp MainFrm.cpp Merge.rc
1528 OptionsDef.h OptionsInit.cpp paths.cpp paths.h PropRegistry.cpp PropRegistry.h
1530 Src/Languages/*: Merge*.rc
1533 BUG: [ 1481053 ] Options: Text Colors should use 3D-Look too
1535 Src/Languages/*: Merge*.rc
1536 PATCH: [ 1482352 ] Icons for 'Bookmarks' feature
1537 Src: MainFrm.cpp Merge.rc resource.h
1538 Src/res new files: clear_bookmarks.bmp next_bookmark.bmp prev_bookmark.bmp
1540 Src/Languages/*: Merge*.rc
1543 BUG: [ 1363364 ] DisplayBinaryFiles extension list wrong
1544 Also bump version of plugin to 1.0.3.0
1545 Plugins/src_VCPP/DisplayBinaryFiles: ChangeLog.txt DisplayBinaryFiles.rc WinMergeScript.cpp
1546 Plugins/dlls: DisplayBinaryFiles.dll
1549 PATCH: [ 1482411 ] Add line before 'Open Project' in main menu
1551 Src/Languages/*: Merge*.rc
1554 PATCH: [ 1482688 ] sgml.cpp contains "lt" twice
1555 Src/editlib: sgml.cpp
1556 PATCH: [ 1482694 ] xml.cpp contains "lt" twice
1557 Src/editlib: xml.cpp
1558 PATCH: [ 1482765 ] Fix closing folder compare progress dialog
1559 Src: DirCompProgressDlg.cpp DirCompProgressDlg.h DirView.cpp
1561 2006-05-04 WinMerge experimental release 2.5.3.7 (cvs)
1564 PATCH: [ 1481213 ] Fix foldercompare short-size suffixes and localize them
1565 Src: DirViewColItems.cpp Merge.rc resource.h
1566 Src/Languages/*: Merge*.rc
1567 PATCH: [ 1481391 ] Make LocationView update from MergeView more safe
1568 Src: LocationView.cpp MergeEditView.cpp MergeEditView.h
1569 BUG: [ 1456356 ] Scrollbars sometimes not initially active
1570 Another possible fix..
1571 Src/editlib: ccrystaltextview.cpp
1574 PATCH: [ 1480652 ] Small fix for XML syntax highlight
1575 Src/editlib: xml.cpp
1578 PATCH: [ 1479007 ] WinMerge Icon Set Revision 3
1579 Submitted by Alexander Skinner
1581 BUG: [ 1474782 ] Crash when comparing SQL with with binary data
1582 Fix suggested by anonymous submitter
1583 Src/editlib: asp.cpp basic.cpp batch.cpp cplusplus.cpp csharp.cpp dcl.cpp
1584 fortran.cpp html.cpp ini.cpp innosetup.cpp is.cpp java.cpp lisp.cpp nsis.cpp
1585 pascal.cpp perl.cpp php.cpp python.cpp rexx.cpp rsrc.cpp sgml.cpp sh.cpp
1586 siod.cpp sql.cpp tcl.cpp tex.cpp xml.cpp
1587 PATCH: [ 1471835 ] Fix setting filename in folder-compare report dialog
1588 Fix bug in the original patch
1589 Src: DirCmpReportDlg.cpp
1592 PATCH: [ 1475649 ] Enable selection margin and line numbers
1593 Src/res new file: mg_icons.bmp
1596 PATCH: [ 1475649 ] Enable selection margin and line numbers
1597 Src: GhostTextView.cpp GhostTextView.h Merge.rc MergeEditView.cpp
1598 MergeEditView.h OptionsDef.h OptionsInit.cpp resource.h
1599 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h editcmd.h
1600 Src/Languages/*: Merge*.rc
1603 PATCH: [ 1477957 ] Fix 'Help' button position in German translation
1604 Src/Languages/German: MergeGerman.rc
1607 PATCH: [ 1476279 ] Cleanup CDiffContext::UpdateInfoFromDiskHalf() and its usage
1608 Src: Diffcontext.cpp DiffContext.h DirScan.cpp DirViewColItems.cpp
1611 PATCH: [ 1475776 ] Optimize dirview UI updates
1612 Src: DirActions.cpp DirDoc.cpp DirDoc.h
1613 PATCH: [ 1472622 ] Czech translation - update (more dialog fixes)
1614 Submitted by: Jan Hryz
1615 Src/Languages/*: Merge*.rc
1618 PATCH: [ 1474884 ] Fix XmlDoc not releasing file handles
1619 Src: XmlDoc.cpp XmlDoc.h
1620 PATCH: [ 1475092 ] Add DocumentsLoaded() to MergeDiffDetailView
1621 Src: MergeDiffDetailView.cpp MergeDiffDetailView.h MergeDoc.cpp
1622 Gal Hammer is now a developer
1623 Docs/Users: Contributors.txt
1626 PATCH: [ 1473902 ] Add dialog for editing and saving project files
1627 Src: DirDoc.cpp DirDoc.h MainFrm.cpp MainFrm.h Merge.dsp Merge.rc MergeDoc.cpp
1628 MergeDoc.h resource.h
1629 Src new files: ProjectFilePathsDlg.cpp ProjectFilePathsDlg.h
1630 Src/Languages/*: Merge*.rc
1631 PATCH: [ 1472622 ] Czech translation - update
1632 Submitted by: Jan Hryz
1633 Src/Languages/Czech/MergeCzec.rc
1634 PATCH: [ 1472622 ] Czech translation - update (apply dialog fixes)
1635 Submitted by: Jan Hryz
1636 Src/Languages/*: Merge*.rc
1639 PATCH: [ 1473635 ] Move some results update code to DirDoc
1640 Src: DirActions.cpp DirDoc.cpp DirDoc.h
1641 PATCH: [ 1468691 ] Center folder compare status dialog to mainframe
1642 Adding line I missed previous time applying the patch (2006-04-12)
1646 TODO: [ 1469363 ] Need image for aborted status in folder compare
1648 Src: DirView.cpp Merge.rc resource.h
1649 Src/res new file: aborted.ico
1650 Src/Languages/*: Merge*.rc
1651 PATCH: [ 1400653 ] Write project files using objects
1653 Src: Merge.dsp ProjectFile.cpp ProjectFile.h
1654 Src new files: XmlDoc.cpp XmlDoc.h
1657 PATCH: [ 1471835 ] Fix setting filename in folder-compare report dialog
1658 Src: DirCmpReportDlg.cpp DirCmpReportDlg.h
1661 PATCH: [ 1445996 ] Fix wrong PgDown scrolling after mousescroll(2)
1662 Src/editlib: ccrystaltextview2.cpp
1664 2006-04-12 WinMerge experimental release 2.5.3.6 (cvs)
1667 PATCH: [ 1468691 ] Center folder compare status dialog to mainframe
1669 PaTCH: [ 1468783 ] Fix disabled scrollbars after loading files
1670 Src: MergeDoc.cpp MergeEditView.cpp MergeEditView.h
1673 PATCH: [ 1467872 ] Fix diff navigation for first-line of diff
1674 Src: MergeEditView.cpp
1675 PATCH: [ 1443719 ] xml output reports
1676 Submitted by Perry, modified by me
1677 Src: DirCmpReport.cpp DirCmpReport.h DirCmpReportDlg.cpp DirCmpReportDlg.h
1678 DirView.cpp DirView.h Merge.dsp Merge.rc resource.h
1679 Src new file: DirReportTypes.h
1682 PATCH: [ 1467305 ] Beep when long compare is ready
1683 Src: DirView.cpp DirView.h
1686 BUG: [ 1461375 ] Forgot old patch #981526 for sgml.cpp, sh.cpp and tcl.cpp?
1687 Src\editlib: sgml.cpp sh.cpp tcl.cpp
1690 BUG: [ 1383719 ] ShellExtension resources opening in IDE fails
1692 ShellExtension/Languages/*.rc
1693 BUG: [ 1465893 ] Compile error with VC6 (SuperComboBox.cpp)
1695 Src/Common: SuperComboBox.cpp
1698 BUG: [ 1463137 ] MergeArgs.h is empty file?
1701 Src removed file: MergeArgs.h
1704 PATCH: [ 1461896 ] Syntax highlighting of HTML for ASP not complete
1705 Src\editlib: asp.cpp
1708 PATCH: [ 1460749 ] Print relative paths to patch files
1709 Src: DiffWrapper.cpp DiffWrapper.h MainFrm.cpp MergeDoc.cpp PatchDlg.h
1710 PatchTool.cpp PatchTool.h
1711 BUG: [ 1461328 ] Commandline handling overwrites flags?
1714 BUG: [ 1460236 ] Splash localization is broken
1715 Src: Merge.rc resource.h Splash.cpp
1716 Src/Languages/*: Merge*.rc
1717 PATCH: [ 1445426 ] Clear PrivateBuild flag in SetResourceVersions.wsf
1719 Src: SetResourceVersions.wsf
1722 BUG: [ 1458714 ] [Replace All] doesn't work
1723 Src/editlib: ceditreplacedlg.cpp
1726 PATCH: [ 1459284 ] Update of MergeSwedish.rc for WinMerge 2.5.3.5+
1727 Submitted by Hans Eriksson
1728 Src/Languages/Swedish: MergeSwedish.rc
1729 PATCH: [ 1458852 ] Fix UI for multiple file patches
1730 Src: PatchDlg.cpp PatchDlg.h
1731 PATCH: [ 1441718 ] Auto Complete on files or folders selection
1732 Submitted by Gal Hammer
1733 Src/Common: SuperComboBox.cpp SupercompoBox.h
1734 Src: Merge.rc OpenDlg.cpp OptionsDef.h OptionsInit.cpp PropGeneral.cpp
1735 PropGeneral.h resource.h
1736 Src/Languages/*: Merge*.rc
1739 PATCH: [ 1458066 ] Use / as path delimiter in patch files
1740 Src: DiffWrapper.cpp
1741 PATCH: [ 1406944 ] Compute text statistics in QuickCompare
1742 Src new file: FileTextStats.h
1745 PATCH: [ 1457203 ] Create patch from multiple files in folder compare
1746 Src: DirView.cpp DirView.h MainFrm.cpp
1749 PATCH: [ 1457306 ] Revamped Visual Basic syntax highlighter
1750 Src\editlib: basic.cpp
1753 BUG: [ 1455656 ] GPL text still contains 'How to Apply These Terms...'
1756 2006-03-22 WinMerge experimental release 2.5.3.5 (cvs)
1759 PATCH: [ 1455706 ] Catalan translation update
1760 Submitted by Jordi Vilar
1761 Src/Languages/Catalan: MergeCatalan.rc
1762 PATCH: [ 1406944 ] Compute text statistics in QuickCompare
1763 Src: ByteComparator.cpp ByteComparator.h DiffFileInfo.cpp DiffFileInfo.h DiffWrapper.cpp
1764 Diffwrapper.h DirScan.cpp DirViewColItems.cpp Merge.dsp Merge.rc resource.h
1765 Src/diffutils/src: DIFF.H IO.C
1766 Src/Languages/*: Merge*.rc
1769 PATCH: [ 1455663 ] Add new keywords to Visual Basic highlighter
1770 Src\editlib: basic.cpp
1773 PATCH: [ 1448599 ] WinMerge Program Icon Set
1774 Submitted by Alexander Skinner
1776 PATCH: [ 1452288 ] Add ASP.NET filefilter
1777 By By Jon Galloway and Josh Blair
1778 Filters new file: ASPNET.flt
1779 PATCH: [ 1454720 ] Fix resizable dialogs missing captionbar close button
1781 Src/Languages/*: Merge*.rc
1782 PATCH: [ 1455430 ] New Splash Screen Revision 2
1783 Submitted by Alexander Skinner
1785 Remove obsolete splashscreen image (for old splashscreen)
1786 Src/res removed file: WinMergesplash.psd
1789 PATCH: [ 1449892 ] Add compare method to configlog
1790 Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
1791 PATCH: [ 1453252 ] Fix closing filecompare after error
1792 Src: MainFrm.cpp MergeDoc.cpp
1795 PATCH: [ 1449571 ] Add '*.pm' and '*.plx' to Perl highlighter
1796 Src/editlib: ccrystaleditview.cpp
1799 BUG: [ 1449947 ] Looks like diffutils bug for mac-style
1800 BUG: [ 1449949 ] crash comparing two simple test mac files
1801 Fix looping which missed mac case
1805 PATCH: [ 1449868 ] Fix difference counts
1806 Src: DiffWrapper.cpp
1809 PATCH: [ 1449038 ] Add Help-button to Open-dialog
1810 Src: FileFiltersDlg.cpp FileFiltersDlg.h Merge.rc OpenDlg.cpp OpenDlg.h
1811 PropLineFilter.cpp PropLineFilter.h
1812 Src/Common: PreferencesDlg.cpp
1813 Src/Languages/*: Merge*.rc
1816 PATCH: [ 1447927 ] Add Help Search to menu, open correct manual location
1817 Src: DirView.cpp DirView.h MainFrm.cpp MainFrm.h Merge.rc MergeEditView.cpp
1818 MergeEditView.h resource.h
1819 Src/Languages/*: Merge*.rc
1822 PATCH: [ 1447506 ] Don't include splash bitmap to lang files
1823 Src/Languages/*: Merge*.rc
1824 Remove Catalan localized splash screen
1825 Src/Languages/Catalan/res removed files: splash1.bmp WinMergeSplash.psd
1826 BUG: [ 1447851 ] Not enough space for version info in new splash screen
1828 PaTCH: [ 1445377 ] WinMerge Logos (72 DPI)
1829 Submitted by Alexander Skinner
1830 Add new folder Docs/Logos
1831 New Docs/Logos files: readme.txt WinMerge_logo_24bit.png
1832 WinMerge_logo_shadow_24bit.png WinMerge_logo_shadow_trans.tif
1833 WinMerge_logo_trans.gif
1834 Change Splashscreen text to according to Dean's wish
1836 Add Alexander Skinner to contributors list
1837 Docs/Users: Contributors.txt
1838 PATCH: [ 1447348 ] Build language files to Build directory
1839 Src/Languages: BuildDll.bat
1840 PATCH: [ 1447806 ] Use JPEG splashscreen
1841 Src: Merge.dsp Merge.rc resource.h Splash.cpp Splash.h
1842 Src/Common new files: Picture.cpp Picture.h
1843 Src/res new file: splash.jpg
1844 Src/res deleted file: splash1.bmp
1845 Src/Languages/*: Merge*.rc
1848 BUG: [ 1441389 ] Comparing root directory - mysterious
1849 Src: DiffWrapper.cpp
1852 PATCH: [ 1447539 ] Add explanatory comment to CCrystalTextBuffer::MoveLine
1853 Src/editlib: ccrystaltextbuffer.cpp
1854 PATCH: [ 1447547 ] Add more comments to CMergeDoc::PrimeTextBuffers
1858 Remove unneeded splash image (Splash2.bmp) as noted in Patch item #1441392
1859 Src/res removed file: Splash2.bmp
1862 PATCH: [ 1445434 ] SyntaxColors scrambling reg values
1863 Src: SyntaxColors.cpp
1865 2006-03-10 WinMerge experimental release 2.5.3.4 (cvs)
1868 PATCH: [ 1445996 ] Fix wrong PgDown scrolling after mousescroll
1869 Src/editlib: ccrystaltextview2.cpp
1870 BUG: [ 1446648 ] cvs trunk doesn't compile
1874 PATCH: [ 1441392 ] New Splash Screen
1875 Submitted by Alexander Skinner
1877 Src/res: splash1.bmp
1880 Update MakeResDll readme with current information (MSVC.Net 2003 works
1881 now), and better explanation of how to pick a specific version.
1882 MakeResDll: readme.txt
1883 PATCH: [ 1443391 ] Update MakeResDll for VS.NET 2005
1884 MakeResDll: MakeResDll.cpp MakeResDll.dsp MakeResDll.rc
1885 StdAfx.cpp StdAfx.h readme.txt resource.h
1886 New MakeResDll: Merge.ico VsVersionDlg.cpp VsVersionDlg.h
1887 Bump MakeResDll version from 1.0.6.0 to 1.0.7.0.
1888 MakeResDll: MakeResDll.rc
1889 PATCH: [ 1442844 ] Make GetFileExt easier to understand
1890 Src: MergeDoc.cpp MergeDoc.h
1891 Add two minor comments to PropRegistry.
1894 2006-03-06 WinMerge experimental release 2.5.3.3 (cvs)
1897 BUG: [ 1444211 ] bug in current SelectFile
1899 PATCH: [ 1443841 ] Add header comment to Src/Changes.txt
1903 BUG: [ 1442866 ] German RC format error
1904 Src/Languages/German: MergeGerman.rc
1905 BUG: [ 1442865 ] languages lack generate patch & report bitmaps
1906 Src/Languages/*: Merge*.rc
1909 PATCH: [ 1435361 ] Fix and cleanup project file code
1910 Src: DiffContext.cpp DiffContext.h DirDoc.cpp MainFrm.cpp
1911 Merge.cpp Merge.h Merge.rc MergeArgs.cpp ProjectFile.cpp
1913 Src/Languages/*: Merge*.rc
1916 PATCH: [ 1396506 ] customizable text colors
1917 Fix compilation (MSVC.NET 2003 correctly gave error that MSVC6 ignored)
1918 Src: PreferencesDlg.cpp
1919 PATCH: [ 1442125 ] Improvements for MakeResDll parsing
1920 MakeResDll: MakeResDll.cpp MakeResDll.rc resource.h
1921 Src\Common: RegKey.cpp RegKey.h
1922 PATCH: [ 1442134 ] MakeResDll: check that RC file exists
1923 MakeResDll: MakeResDll.cpp MakeResDll.rc resource.h
1924 PATCH: [ 1442238 ] Fix MakeResDll to work with VS.NET 2003
1925 MakeResDll: MakeResDll.cpp MakeResDll.rc
1926 PATCH: [ 1442791 ] Update MakeResDll project
1927 Add Changes.txt to project.
1928 Change version copyright from "2003" to "2003-2006"
1929 MakeResDll: MakeResDll.dsp MakeResDll.rc
1931 2006-03-04 Perry (MSVC6)
1932 Current selftests status: Failure count: 0 (of 756)
1935 PATCH: [ 1396506 ] customizable text colors
1936 Src: MainFrm.cpp MainFrm.h Merge.dsp Merge.rc MergeDoc.cpp
1937 OptionsDef.h OptionsInit.cpp PropArchive.cpp PropArchive.h
1938 PropCodepage.cpp PropCodepage.h PropColors.cpp PropColors.h
1939 PropCompare.cpp PropCompare.h PropEditor.h PropGeneral.h
1940 PropRegistry.h PropSyntaxColors.cpp PropSyntaxColors.h
1941 PropVss.h SyntaxColors.cpp SyntaxColors.h resource.h
1942 Src\Common: PreferencesDlg.cpp PreferencesDlg.h
1943 Src/Languages/*: Merge*.rc
1944 PATCH: [ 1439335 ] Reset cwd in Merge.cpp SelectFile
1945 Src: Merge.cpp OpenDlg.cpp
1946 PATCH: [ 1442082 ] Fix MakeDirs to not error if directory exists
1947 Src\Common: coretools.cpp
1948 PATCH: [ 1396506 ] customizable text colors
1950 Src: new PropTextColors.cpp PropTextColors.h
1953 PATCH: [ 1442699 ] New Changes.txt file for MakeResDll
1954 Add Changes.txt change log (this file).
1955 MakeResDll: new Changes.txt
1956 PATCH: [ 1424636 ] New BuildOneLanguage.vbs & fix MakeResDll exit
1957 MakeResDll: MakeResDll.cpp StdAfx.h
1958 Src\Languages: BuildDll.bat BuildOneLanguage.vbs
1961 PATCH: [ 1441387 ] Improve File Encoding dialog
1963 Src/Languages/*: Merge*.rc
1964 PATCH: [ 1442107 ] Move About-dialog code to separate files from Merge.cpp
1965 Src: Merge.cpp Merge.dsp
1966 Src new files: AboutDlg.cpp AboutDlg.h
1969 PATCH: [ 1437770 ] Icons for 'Generate Patch' and 'Generate Report'
1970 Src: MainFrm.cpp Merge.rc resource.h
1971 Src/res new files: patch.bmp report.bmp
1974 PATCH: [ 1441124 ] Improve filter test dialog
1976 Src/Languages/*: Merge*.rc
1979 PATCH: [ 1424535 ] Czech Translation, Submitted by Jan Hryz
1980 Improve unpacker selection dialog and new filter location selection dialog
1982 Src/Languages/*: Merge*.rc
1985 PATCH: [ 1438233 ] New icons for 'notequalfile', 'lfile' and 'rfile'
1986 Src/res: lfile.ico notequalfile.ico rfile.ico
1989 PATCH: [ 1436855 ] Typo in lang files (change pactch to patch)
1990 Src/Languages/*: Merge*.rc
1991 BUG: [ 1440774 ] Test button for file filters enabled for no filter
1992 Fix submitted by Gal Hammer
1993 Src: FileFiltersDlg.cpp
1994 PATCH: [ 1395847 ] Integration with Rational ClearCase
1995 Submitted by Gal Hammer
1996 Src: MainFrm.cpp MainFrm.h Merge.h MergeArgs.cpp MergeDoc.cpp MergeDoc.h
1997 Src/Common: coretools.cpp coretools.h
2000 BUG: [ 1439360 ] Native languages sometimes suppressed in Unicode Build
2001 Add note to CLanguageSelect::GetNativeLanguageNameString
2002 explaining why codepage check is done even for Unicode build.
2003 Src/Common: LanguageSelect.cpp
2006 BUG: [ 1439350 ] Russian language name in LanguageSelect?
2007 Src/Common: LanguageSelect.cpp
2010 PATCH: [ 1435470 ] Remove CTextFile
2012 Deleted Src\Common: textfile.cpp textfile.h
2013 PATCH: [ 1439229 ] Fix CMergeDoc::SanityCheckD not to dereference illegal lines
2014 BUG: [ 1438390 ] Crash when editting the attached files
2016 PATCH: [ 1434007 ] Move source control code out of MainFrm.cpp
2017 Src: MainFrm.cpp MainFrm.h Merge.dsp
2018 New Src: SourceControl.cpp
2021 PATCH: [ 1437758 ] Improve diff selection when selected diff not visible
2022 Src: MergeEditView.cpp MergeEditView.h
2023 PATCH: [ 1431607 ] Fix worddiff highlight error
2025 Src: stringdiffs.cpp
2028 PATCH: [ 1437677 ] Various Updates in German Translation for WinMerge 2.5
2029 Src/Languages/German: MergeGerman.rc
2032 PATCH: [ 1435431 ] Fix GenerateReport lines
2034 Src: DirCmpReport.cpp
2035 PATCH: [ 1395721 ] VS.NET 2003 warning of SEH bug
2037 PATCH: [ 1428686 ] Catalan translation update
2039 Src/Languages/Catalan: MergeCatalan.rc
2040 PATCH: [ 1430321 ] Swedish translation update and feedback on WinMerge 2.5.3.2
2042 Src\Languages\Swedish: MergeSwedish.rc
2043 PATCH: [ 1434270 ] Fix difference counts
2045 Src: DiffWrapper.cpp
2048 PATCH: [ 1435384 ] Add context menu for diff pane
2049 Src: Merge.rc MergeDiffDetailView.cpp MergeDiffDetailView.h resource.h
2050 Src/Languages/*: Merge*.rc
2051 PATCH: [ 1433125 ] Trap errors from filesystem during actions
2052 Src: FileActionScript.cpp
2055 PATCH: [ 1405603 ] New Test dialog for file filters
2056 (Forgot to do all the language resources)
2057 and misc RC file fixes (eg, many fixes in editor proppage)
2058 New: Src/Languages: WinMerge_Resource_Discrepencies.txt
2061 PATCH: [ 1405603 ] New Test dialog for file filters
2062 Src: FileFilterMgr.cpp FileFilterMgr.h FileFiltersDlg.cpp
2063 FileFiltersDlg.h Merge.dsp Merge.rc resource.h
2064 Src new: TestFilterDlg.cpp TestFilterDlg.h
2065 PATCH: [ 1433312 ] Add cvs tags to source files
2066 Src: ByteComparator.cpp SharedFilterDlg.cpp StdAfx.cpp
2067 TestFilterDlg.cpp TestFilterDlg.h ViewableWhitespace.cpp
2068 Src/Common: SortHeaderCtrl.cpp SortHeaderCtrl.h UniFile.cpp
2069 UniFile.h textfile.cpp textfile.h unicoder.cpp unicoder.h
2070 varprop.cpp varprop.h version.cpp version.h
2073 PATCH: [ 1178743 ] Disable lang menu if no additional langs installed
2074 Src: Merge.cpp Merge.h
2075 Src/Common: LanguageSelect.cpp LanguageSelect.h
2078 PATCH: [ 1433931 ] Add comment before isBin checks in DirView
2080 PATCH: [ 1424153 ] Remove VTS_PUI1 from lwdisp.h
2081 BUG: [ 1395475 ] VTS_UI1 & VTSPUI1 macro redefinition warnings (VS.NET)
2082 Src\Common: lwdisp.h
2083 PATCH: [ 1433927 ] Fix external editor default and messages
2084 BUG: [ 1433774 ] default editor is blank
2085 Src: MainFrm.cpp Merge.cpp Merge.rc OptionsInit.cpp resource.h
2086 Src/Languages/*: Merge*.rc
2087 PATCH: [ 1433353 ] Fix menu resources
2088 Src: MainFrm.cpp Merge.cpp Merge.rc resource.h
2089 Src/Languages/*: Merge*.rc
2091 2006-02-19 Christian
2092 PATCH: [ 1429125 ] Return number of diffs instead of true/false
2096 BUG: [ 1395483 ] Signed/unsigned mismatch warning from LocationView.cpp
2097 Src: LocationView.cpp
2100 BUG: [ 1395475 ] VTS_UI1 & VTSPUI1 macro redefinition warnings (VS.NET)
2101 Fixed VTS_PUI1 (which previous patch for this bug missed).
2102 Src\Common: lwdisp.h
2105 PATCH: [ 1424535 ] Czech Translation, Submitted by Jan Hryz
2106 Improve folder compare columns dialog (idea for new arrows from Catalan translation)
2108 Src/Languages/*: Merge*.rc
2111 PATCH: [ 1431771 ] Alter CheckTranslations.vbs to YesNoCancel
2112 Src/Languages: CheckTranslations.vbs
2113 PATCH: [ 1419582 ] Polish translation update for latest v2.5
2114 Contributed by dr_prozac
2115 Src/Languages/Polish: MergePolish.rc
2116 PATCH: [ 1431846 ] Update Czech Translation
2117 Contributed by Jan Hryz
2118 Src/Languages/Czech: MergeCzech.rc
2119 ShellExtension/Languages/ShellExtensionCzech.rc
2120 A few control adjustments matching Czech to English (many left)
2121 Src/Languages/Czech: MergeCzech.rc
2124 PATCH: [ 1431636 ] IgnoreEOL broken in cvs trunk
2125 Src: PropCompare.cpp
2128 PATCH: [ 1431768 ] Write paths to patch files as given
2129 Src: DiffWrapper.cpp
2132 PATCH: [ 1431205 ] Fix ViewWhitespace \r\n bug
2133 BUG: [ 1431012 ] View line differences adds additional EOL char
2134 Src/editlib: ccrystaltextview.cpp
2135 PATCH: [ 1431197 ] Fix off-by-one highlight error
2136 Src: stringdiffs.cpp
2137 Fix button movement on LanguageSelect (broken by PATCH#1423461).
2138 Also add cvs id comment at top, and doxygen file label.
2139 Src\Common: LanguageSelect.cpp
2142 BUG: [ 1197976 ] GeneratePatch file browse not intialized correctly
2143 Fix submitted by Perry
2147 PATCH: [ 1431131 ] Fix VS.NET 2003 compilation
2148 Src\Common: coretools.cpp scbarg.cpp scbarg.h sizecbar.cpp sizecbar.h
2149 Shrink Swedish dialog IDD_PROPPAGE_LARGE to same size as English
2150 (all controls already were the same size anyway)
2151 Src\Languages\Swedish: MergeSwedish.rc
2154 PATCH: [ 1212124 ] File encoding GUI
2155 Src: DiffContext.cpp DiffFileInfo.cpp DiffFileInfo.h DiffItem.cpp
2156 DiffItem.h DiffThread.cpp DiffWrapper.cpp DirActions.cpp
2157 DirScan.cpp DirView.cpp DirView.h DirViewColItems.cpp FileLocation.h
2158 MainFrm.cpp Merge.dsp Merge.rc MergeDoc.cpp MergeDoc.h OpenDlg.cpp
2159 codepage_detect.cpp codepage_detect.h resource.h
2160 NEW Src: FileTextEncoding.cpp FileTextEncoding.h IntToIntMap.h
2161 LoadSaveCodepageDlg.cpp LoadSaveCodepageDlg.h MergeDocEncoding.cpp
2162 dlgutil.cpp dlgutil.h
2165 Adjust whitespace to match English translation
2166 Also update Russian options/editor controls to match English
2167 Src\Languages\Russian: MergeRussian.rc
2168 Src\Languages\Slovak: MergeSlovak.rc
2169 Src\Languages\Swedish: MergeSwedish.rc
2170 Src\Languages\Turkish: MergeTurkish.rc
2171 PATCH: [ 1424681 ] Widen labels on unpacker dialog
2173 Src\Languages: Merge*.rc
2176 PATCH: [ 1429517 ] Fix coretools.cpp compilation (for MakeResDll)
2177 Src/Common: coretools.cpp
2178 PATCH: [ 1427838 ] code cleanup bottom of merge.cpp
2180 Synchronizing Turkish translation to English where feasible.
2181 Src/Languages/Turkish: MergeTurkish.rc
2182 Update Swedish Options/Editor to current English layout
2183 Src/Languages/Swedish: MergeSwedish.rc
2186 PATCH: [ 1428800 ] Fix ListCopy/AllLeft
2187 BUG: [ 1428791 ] All Left gave me a bunch of msgboxes
2188 Src: MergeDoc.cpp MergeDoc.h
2189 PATCH: [ 1428726 ] Fix for compilation under VS2005
2190 Src: BCMenu.cpp DiffWrapper.cpp DirCmpReport.cpp
2191 DirColsDlg.cpp DirViewColHandler.cpp GhostTextBuffer.cpp
2192 MergeArgs.cpp MergeDiffDetailView.cpp MergeDoc.cpp
2194 Src\Common: LanguageSelect.cpp SuperComboBox.cpp UniFile.cpp
2195 coretools.cpp multiformatText.cpp scbarg.cpp scbarg.h
2196 sizecbar.cpp sizecbar.h
2197 Src\editlib: asp.cpp basic.cpp batch.cpp ccrystaltextview.cpp
2198 cplusplus.cpp crystaltextblock.cpp csharp.cpp dcl.cpp
2199 fortran.cpp html.cpp ini.cpp innosetup.cpp is.cpp java.cpp
2200 lisp.cpp nsis.cpp pascal.cpp perl.cpp php.cpp python.cpp
2201 rexx.cpp rsrc.cpp sgml.cpp sh.cpp siod.cpp sql.cpp
2202 tcl.cpp tex.cpp xml.cpp
2203 PATCH: [ 1427563 ] Give descriptive name to CMergeDoc::SaveHelper
2204 Src: MainFrm.cpp MergeDiffDetailView.cpp MergeDoc.cpp
2205 MergeDoc.h MergeEditView.cpp
2206 PATCH: [ 1426593 ] Remove empty CMergeDoc::SetDiffViewMode()
2208 Src: MergeDoc.cpp MergeDoc.h
2210 2006-02-09 WinMerge experimental release 2.5.3.2 (cvs)
2213 PATCH: [ 1427851 ] Small cleanup for FileFilterMgr::AddFilter()
2214 Src: FileFilterMgr.cpp
2215 Add Jan Hryz as Czech translator and contributor
2216 Docs/Users: Contributors.txt
2219 PATCH: [ 1427845 ] Double-click fails to open, no message
2221 BUG: [ 1427956 ] Differences count in Folder Compare wrong?
2222 Make sure to set diff count to 0 just before counting them
2223 Src: DiffWrapper.cpp
2226 PATCH: [ 1426499 ] Move Save Projectfile to File menu
2227 Src: DirDoc.cpp DirDoc.h MainFrm.cpp MainFrm.h Merge.rc MergeDoc.cpp
2228 MergeDoc.h OpenDlg.cpp OpenDlg.h resource.h
2229 Src/Languages/*: Merge*.rc
2232 PATCH: [ 1424884 ] Fix UniStdioFile encoding of TCHAR
2233 BUG: [ 1402379 ] A character display and save error with encoding of unicode
2234 Src\Common: UniFile.cpp unicoder.cpp unicoder.h
2237 Current selftests status: Failure count: 0 (of 756)
2240 PATCH: [ 1426552 ] Add selftests between platform versions
2241 Src: Changes.txt ConfigLog.cpp DiffWrapper.cpp DiffWrapper.h
2242 DirDoc.cpp MainFrm.cpp MergeArgs.cpp MergeDoc.cpp
2243 MergeDocLineDiffs.cpp OptionsDef.h OptionsInit.cpp PatchTool.cpp
2244 PropCompare.cpp PropCompare.h
2245 Src\editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h
2248 Current selftests status: Failure count: 0 (of 588)
2251 PATCH: [ 1424867 ] Fix common prefix code for \r\n
2252 Src\diffutils\src: IO.C
2253 PATCH: [ 1426793 ] Fix diffutils that counts lines in suffix
2254 Src\diffutils\src: IO.C
2257 Current selftests status: Failure count: 0 (of 588)
2260 PATCH: [ 1424535 ] Czech Translation, Submitted by Jan Hryz
2261 Fix dir compare report dialog layout
2263 Src/Languages/*: Merge*.rc
2266 Synchronizing Slovak translation to English where feasible.
2267 Src/Languages/Slovak: MergeSlovak.rc
2268 Synchronizing Swedish translation to English where feasible.
2269 Src/Languages/Swedish: MergeSwedish.rc
2270 PATCH: [ 1392413 ] Track lossy encodings & warn user
2271 Src: FileFilterMgr.cpp Merge.rc MergeDoc.cpp files.h resource.h
2272 Src/Common: UniFile.cpp UniFile.h unicoder.cpp
2273 PATCH: [ 1392413 ] Track lossy encodings & warn user
2274 Src/Languages/*: Merge*.rc
2277 PATCH: [ 1414201 ] Cleanup Merge Line Flags
2278 Src: LocationView.cpp Merge.dsp MergeDiffDetailView.cpp MergeDoc.cpp
2279 MergeEditView.cpp MergeEditView.h
2280 NEW Src: MergeLineFlags.h
2283 PATCH: [ 1424264 ] Use 'Item' instead of file in View-menu
2285 Src/Language: */Merge*.rc
2288 Fix Italian Edit/Options/Editor line selection controls.
2289 Src/Languages/Italian/MergeItalian.rc
2290 PATCH: [ 1414904 ] updated italian translation for winmerge 2.5.3.1
2291 Submitted by A. Decorte
2292 New updates for selecting current diffs and wrap lines.
2293 Src/Languages/Italian/MergeItalian.rc
2296 BUG: [ 1422257 ] Wrong text in tooltip
2297 (Dutch translation had wrong shortcut keys in tooltip)
2298 Src/Languages/Dutch/MergeDutch.rc
2299 PATCH: [ 1424535 ] Czech Translation
2300 Submitted by Jan Hryz
2301 Src/Languages/Czech/MergeCzech.rc
2304 PATCH: [ 1424142 ] Wrap two lwdisp macros in ifndef
2305 Src/Common: lwdisp.h
2306 Undo PATCH: [ 1424142 ] Wrap two lwdisp macros in ifndef
2307 Src/Common: lwdisp.h
2308 BUG: [ 1383052 ] warning C4005: 'COMPILE_MULTIMON_STUBS' : macro redefinition
2309 (Wrap multimon def with ifndef
2311 PATCH: [ 1423461 ] Rearrange language select dialog
2312 Revise patch applied earlier: put Ok on left and Cancel on right.
2313 (Also fix French dialog which was left out before.)
2315 Src/Languages: */Merge*.rc
2316 PATCH: [ 1421199 ] Fix plugin menu for when location or diff detail view active
2317 Src: ChildFrm.cpp ChildFrm.h MainFrm.cpp MainFrm.h MergeDoc.cpp MergeDoc.h
2318 PATCH: [ 1414904 ] updated italian translation for winmerge 2.5.3.1
2319 Submitted by A. Decorte
2320 Src/Languages/Italian: MergeItalian.rc
2321 PATCH: [ 1423907 ] Fix diffutils hashing of \r
2322 Src/diffutils: IO.C UTIL.C
2323 Current selftests status: Failure count: 0 (of 480)
2324 Created branch "R_diffutils_branch"
2327 PATCH: [ 1409651 ] fix diffutils handling trailing whitespace
2328 Src/diffutils/src: IO.C UTIL.C
2329 Current selftests status: Failure count: 24 (of 480)
2330 Failing -b t002 (u & m platforms, all 4 builds)
2331 Failing -bi t002 (u & m platforms, all 4 builds)
2332 Failing -b bug1406950 (u & m platforms, all 4 builds)
2335 PATCH: [ 1423060 ] Modify perl selftest to test all 4 builds
2337 Current selftests status: Failure count: 36 (of 480)
2338 Failing -b t002 (all 3 platforms, all 4 builds)
2339 Failing -bi t002 (all 3 platforms, all 4 builds)
2340 Failing -b bug1406950 (all 3 platforms, all 4 builds)
2341 PATCH: [ 1421694 ] Widen comments label in Rational ClearCase dialog
2343 Src/Languages: */Merge*.rc
2344 PATCH: [ 1423461 ] Rearrange language select dialog
2345 Src: MainFrm.cpp MainFrm.h Merge.rc OpenDlg.cpp OpenDlg.h
2346 Src/Common: LanguageSelect.cpp LanguageSelect.h
2347 Src/Languages: */Merge*.rc
2350 PATCH: [ 1422052 ] Correction of Swedish for 2.5.3.1+
2351 Contributed by Hans Eriksson
2352 Src/Languages/Swedish: Merge Swedish
2355 PATCH: [ 1412386 ] Adding readme files
2356 New WinMerge/readme.txt
2357 (Various other directories affected -- readme.txt & Changes.txt files)
2360 PATCH: [ 1419329 ] Select Line Difference
2361 Src: Merge.rc MergeDiffDetailView.cpp MergeDiffDetailView.h MergeEditView.cpp
2362 MergeEditView.h resource.h
2363 Src/Language: */Merge*.rc
2366 BUG: [ 1419317 ] link error on 8-bit cvs trunk
2367 Add HtmlHelp.lib to link lines MergeRelease, MergeDebug, MergeUnicodeRelease.
2369 PATCH: [ 1419582 ] Polish translation update for latest v2.5
2370 Contributed by dr_prozac
2371 Src/Languages/Polish: MergePolish.rc
2372 PATCH: [ 1421018 ] Fix handle leak in GetOpenFileName
2373 BUG: [ 1418765 ] 2.4.4.0U maintain opened a handle on folders
2374 Adds new method paths_GetWindowsDirectory & resets current
2375 directory to WINDIR after GetOpenFileName call
2376 Src: MainFrm.cpp OpenDlg.cpp paths.cpp paths.h
2377 Cosmetic: synchronizing whitespace to English version
2378 Src/Languages/*: MergeTurkish.rc MergeSwedish.rc MergeSpanish.rc
2379 Cosmetic: synchronizing whitespace to English version
2380 Src/Languages/*: MergePolish.rc
2381 Updating Polish dialog control layout to English (except where
2382 would hinder appearance)
2383 Src/Languages/*: MergePolish.rc
2386 PATCH: [ 1419171 ] Various Updates in German Translation for WinMerge 2.5
2387 Src/Languages/German: MergeGerman.rc
2390 PATCH: [ 1415895 ] Split cmdline help string into chunks
2391 Src: Merge.cpp Merge.h Merge.rc MergeArgs.cpp resource.h
2392 Src/Languages: */*.rc
2395 PATCH: [ 1414904 ] updated italian translation for winmerge 2.5.3.1
2396 Submitted by A. Decorte
2397 InnoSetup\Languages: Italian.isl
2398 PATCH: [ 1415165 ] Updated Swedish translation for 2.5.3.1+
2399 Submitted by Hans Eriksson
2400 Src\Languages\Swedish: MergeSwedish.rc
2401 PATCH: [ 1414195 ] Delete two old TODO notes
2403 PATCH: [ 1414196 ] Delete useless CChildFrame::OnNotify method
2404 Src: ChildFrm.cpp ChildFrm.h
2405 PATCH: [ 1414199 ] Fix outdated comment on DirView.cpp :: NumToStr
2409 PATCH: [ 1413230 ] Use HtmlHelp API to open help
2410 Src: MainFrm.cpp Merge.dsp
2413 BUG: [ 1412237 ] InitOption return value wrong if RegCreateKey fails
2414 Fix unused wrong return value of InitOption & improve one comment
2415 Src/Common: OptionsMgr.cpp
2416 BUG: [ 1414868 ] Bug in byte_compare (early finish)
2417 (Also added some comments.)
2418 Src: DiffWrapper.cpp
2420 2006-01-24 WinMerge experimental release 2.5.3.1 (cvs)
2423 PATCH: [ 1406840 ] Use HTMLHelp locally
2425 PATCH: [ 1411727 ] Merge inactive diff when cursor is inside it
2426 Src: MergeDoc.cpp MergeDoc.h MergeEditView.cpp MergeEditView.h
2429 Add repro files to selftests from
2430 BUG [ 1406950 ] QuickCompare vs diffutils, disagree on trailing whitespace
2431 Current selftests status: Failure count: 9 (of 108)
2432 Failing -b t002 (all 3 platforms)
2433 Failing -bi t002 (all 3 platforms)
2434 Failing -b bug1406950 (all 3 platforms)
2435 PATCH: [ 1406950 ] QuickCompare vs diffutils, disagree on trailing whitespace
2436 Src: ByteComparator.cpp
2437 (selftests results unimproved, because selftest uses diffutils core, not QuickCompare)
2440 PATCH: [ 1405540 ] Cleanup filters dialog
2441 Src: FileFiltersDlg.cpp FileFiltersDlg.h
2444 PATCH: [ 1411102 ] Add '*.dsl' and '*.jsp' to syntax highlighter
2445 Src/editlib: ccrystaleditview.cpp
2448 PATCH: [ 1411406 ] self-tests and new arguments and new diff2winmerge.exe
2449 Src: Changes.txt MainFrm.cpp MainFrm.h Merge.cpp Merge.h MergeArgs.cpp
2450 Src/Common: OptionsMgr.cpp OptionsMgr.h
2451 New directory WinMerge/diff2winmerge, for diff2winmerge utility
2452 New directory WinMerge/selftests added
2453 Current selftests status: Failure count: 6 (of 108)
2454 Failing -b t002 (all 3 platforms)
2455 Failing -bi t002 (all 3 platforms)
2458 PATCH: [ 1411150 ] Add GetActiveMergeView for MergeDoc
2459 Src: MergeDoc.cpp MergeDoc.h
2462 PATCH: [ 1407740 ] Polish translation update (for version 2.4.4.0)
2463 Submitted by dr_prozac
2464 (Perry merging many of these to cvs trunk)
2465 Src/Language/Polish: MergePolish.rc
2468 BUG: [ 1408587 ] Unused DoScroll() function in Merge*View
2469 Remove DoScroll() from CMergeEditView and CMergeDiffDetailView
2470 Src: MergeDiffDetailView.cpp MergeDiffDetailView.h MergeEditView.cpp
2474 PATCH: [ 1406207 ] Fix error message for unique folders
2475 Src: DirView.cpp Merge.rc resource.h
2476 Src/Language: */Merge*.rc
2479 PATCH: [ 1401711 ] A hybrid of word diff and char diff
2480 Submitted by Takashi Sawanaka
2481 Src: MergeDocLineDiffs.cpp PropEditor.cpp
2482 stringdiffs.cpp stringdiffs.h
2485 PATCH: [ 1406203 ] Open unique files to external editor
2486 Src: DirView.cpp Merge.rc resource.h
2487 Src/Language: */Merge*.rc
2490 PATCH: [ 1333600 ] Get rid of global MainFrame pointer (part1)
2491 Src: DirActions.cpp DirDoc.cpp DirView.cpp FileActionScript.cpp
2492 MainFrm.cpp MainFrm.h Merge.cpp MergeDoc.cpp MergeEditView.cpp
2493 OpenDlg.cpp PropRegistry.cpp
2494 Src\Common: PreferencesDlg.cpp
2497 PATCH: [ 1403457 ] Support Unicode file filter files
2498 Src: FileFilterMgr.cpp
2501 PATCH: [ 1372044 ] Add FileActionScript for folder compare actions
2502 Src: DirActions.cpp DirView.h Merge.dsp
2503 Src new files: FileActionScript.cpp FileActionScript.h
2504 PATCH: [ 1385672 ] Replace some 'file's with 'item's
2506 Src/Language: */Merge*.rc
2507 PATCH: [ 1405340 ] Add XP shadow to folderskip.ico
2509 Src/res: folderskip.ico
2512 TODO: [ 1395638 ] CChildFrame::PreCreateWindow() does nothing
2513 Src: ChildFrm.cpp ChildFrm.h MainFrm.cpp
2516 PATCH: [ 1403454 ] Add comment to UniStdioFile.h
2518 Src/Common: UniFile.h
2519 PATCH: [ 1403893 ] Fix whitespace error in ByteCompare
2520 BUG: [ 1400779 ] Whitespace bug in ByteComparator
2521 Src: ByteComparator.cpp
2524 PATCH: [ 1039677 ] Alter text of Reset button label
2526 Src/Language: */Merge*.rc
2529 PATCH: [ 1399263 ] Captioned panes (new style)
2530 Src: ChildFrm.cpp DiffViewBar.h LocationBar.h Merge.dsp Merge.rc resource.h
2531 Src/Common new files: scbarcf.cpp scbarcf.h
2532 Src/Language: */Merge*.rc
2533 PATCH: [ 1399738 ] Filename bars to use caption colors
2534 Src: ChildFrm.cpp FilePathEdit.cpp FilePathEdit.h
2537 PATCH: [ 1403412 ] German: Option 'Line Difference Coloring' looks broken
2538 Src/Languages/German: MergeGerman.rc
2540 2006-01-11 WinMerge beta release 2.5.2
2543 PATCH: [ 1402774 ] Use dark red color for 'binarydiff.ico'
2545 Src/res: binarydiff.ico
2546 PATCH: [ 1400845 ] Allow Shift+Ctrl+F3 to search selected text backwards
2547 With addition from Takashi for Shift+F3 backwards search
2549 Src/editlib: ccrystaltextview.cpp
2550 Src/Language: */Merge*.rc
2551 BUG: [ 1400829 ] Crash trying to open location pane context menu
2552 Src: LocationView.cpp
2555 PATCH: [ 1401420 ] New 'MergeDir' icon
2556 Src/res: MergeDir.ico
2559 PATCH: [ 1400830 ] Fix drop to only do LoadProjectFile when 1 file dropped
2560 BUG: [ 1400797 ] Dropping two project files doesn't work to compare them
2561 (Also fixes extension test to be case-sensitive)
2565 BUG: [ 1396222 ] CDirView::MoveSelection() is confused
2566 (Rename MoveSelection to MoveFocus & add more commenting)
2567 Src: DirActions.cpp DirView.cpp DirView.h
2570 PATCH: [ 1398064 ] Catalan translation update
2572 Src/Languages/Catalan: MergeCatalan.rc
2573 PATCH: [ 1398959 ] Implement GuessEncoding in QuickCompare
2574 Src: codepage_detect.cpp DiffWrapper.cpp DiffWrapper.h
2576 2006-01-05 WinMerge experimental release 2.5.0.5 (cvs)
2579 PATCH: [ 1393635 ] Save pane sizes and positions when they change
2580 Src: ChildFrm.cpp ChildFrm.h DiffViewBar.cpp DiffViewBar.h LocationBar.cpp
2581 LocationBar.h LocationView.cpp LocationView.h MergeDiffDetailView.cpp
2582 MergeDiffDetailView.h StdAfx.h
2583 PATCH: [ 1396413 ] Update Open dialog controls when its activated
2584 Src: OpenDlg.cpp OpenDlg.h
2587 Cosmetic; normalizing blank lines to agree with English Merge.rc
2589 Brazilian\MergeBrazilian.rc
2590 ChineseSimplified\MergeChineseSimplified.rc
2591 Korean\MergeKorean.rc
2592 Norwegian\MergeNorwegian.rc
2595 PATCH: [ 1394877 ] Find selected text with Ctrl+F3
2597 Src/editlib: ccrystaltextview.cpp
2598 Src/Language: */Merge*.rc
2599 PATCH: [ 1395584 ] Update CSizingControlBar to latest version
2600 Src: DiffViewBar.cpp DiffViewBar.h LocationBar.cpp LocationBar.h Merge.dsp StdAfx.h
2601 Src/Common: sizecbar.cpp sizecbar.h
2602 Src/Common new files: scbarg.cpp scbarg.h
2603 Src/Common deleted files: sizecbarg.cpp sizecbarg.h
2604 PATCH: [ 1383262 ] Fix bitmap leak in ShellExtension
2605 Also bump version number to 1.7.1
2607 ShellExtension: ShellExtension.rc WinMergeShell.cpp WinMergeShell.h
2610 PATCH: [ 1390104 ] fix for BUG: [ 1384069 ] Wrapped lines have incorrect column
2611 Src: MergeEditView.cpp
2612 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
2615 BUG: [ 1390849 ] cvs trunk MergeChineseSimplified doesn't compile
2616 Src/Languages: ChineseSimplified: MergeChineseSimplified.rc
2617 PATCH: [ 1212161 ] Fix handling of \r\n in ByteComparator
2618 Src: ByteComparator.cpp
2621 PATCH: [ 1383802 ] Cleanup line difference options in Editor-options
2622 Src: Merge.rc PropEditor.cpp PropEditor.h resource.h
2623 PATCH: [ 1383802 ] Cleanup line difference options in Editor-options
2625 Src/Language: */Merge*.rc
2626 PATCH: [ 1391550 ] vbs script to check & optionally merge WinMerge resources
2627 Src: new CheckTranslations.vbs
2630 PATCH: [ 1395474 ] Define WINVER for compiling with VS.net
2632 PATCH: [ 1395018 ] Small cleanup for CMergeDoc::PrimeTextBuffers()
2633 Src: DiffList.cpp DiffList.h MergeDoc.cpp
2636 PATCH: [ 1395487 ] Unused local variable in UniStdioFile::DoOpen()
2637 (Delete unused variable)
2638 Src/Common: UniFile.cpp
2639 BUG: [ 1395497 ] Unused local variables in CMergeDoc::GetWordDiffArray()
2640 (Delete unused variables)
2641 Src: MergeDocLineDiffs.cpp
2642 BUG: [ 1395494 ] stringdiffs.cpp / LastChar() returning uninitialized value?
2643 Src: stringdiffs.cpp
2646 Remove unused variable from VSSHelper.cpp/VSSHelper::ReLinkVCProj()
2650 PATCH: [ 1392647 ] Prefix members with m_ in storage_for_plugins
2651 Src/Common: multiformatText.cpp multiformatText.h
2652 PATCH: [ 1394717 ] Fix resource.h include for translations
2653 Src/Languages: */Merge*.rc
2654 Src/Languages deleted: UpdateAll_resource_h.bat
2655 Src/Languages deleted: */resource.h (localized versions of resource.h)
2656 BUG: [ 1395107 ] MergeKorean.rc not compile in cvs trunk
2657 (resource.h => ..\..\resource.h fix missed Korean somehow)
2658 Src/Languages/Korean: MergeKorean.rc
2659 PATCH: [ 1394073 ] Fix ByteComparator: m_bol0
2660 (Change in ByteComparator.h is cosmetic typo fix in comment)
2661 (Fixes some bad tabbing as well)
2662 Src: ByteComparator.cpp ByteComparator.h
2665 PATCH: [ 1394759 ] Allows quotes in Rational ClearCase checkout comment
2666 Submitted by Gal Hammer
2668 Add Gal Hammer to contributors list
2669 Docs/Users: Contributors.txt
2672 BUG: [ 1394857 ] cvs trunk does not compile, ANSI, FindEncodingIdFromNameOrAl
2673 Src: codepage_detect.cpp
2676 PATCH: [ 1392347 ] Fix status after synching unique binary files
2678 PATCH: [ 1394464 ] Find again code doesn't recognize dos/mac EOLs
2679 Src/editlib: ccrystaltextview.cpp
2680 BUG: [ 1394851 ] cvs trunk does not compile (DirScan.cpp, sRule)
2684 PATCH: [ 1394247 ] Fix GuessEncoding recognition of codepages
2685 BUG: [ 1394234 ] GuessEncodings fails to recognize CP-437
2686 Src: codepage_detect.cpp
2687 PATCH: [ 1393979 ] Delete unused DiffWrapper fnc cleanup_script
2688 Src: DiffWrapper.cpp
2691 PATCH: [ 1391732 ] Do not offer to unify codepages in UNICODE build
2692 Also introduces new error IDS_DIFFERENT_UNICODINGS and new
2693 global function IsUnicodeBuild.
2695 Doing language synchronizations for this patch.
2697 Languages\Brazilian\MergeBrazilian.rc
2698 Languages\Bulgarian\MergeBulgarian.rc
2699 Languages\Catalan\MergeCatalan.rc
2700 Languages\ChineseSimplified\MergeChineseSimplified.rc
2701 Languages\ChineseTraditional\MergeChineseTraditional.rc
2702 Languages\Czech\MergeCzech.rc
2703 Languages\Danish\MergeDanish.rc
2704 Languages\Dutch\MergeDutch.rc
2705 Languages\German\MergeGerman.rc
2706 Languages\Hungarian\MergeHungarian.rc
2707 Languages\Italian\MergeItalian.rc
2708 Languages\Japanese\MergeJapanese.rc
2709 Languages\Korean\MergeKorean.rc
2710 Languages\Norwegian\MergeNorwegian.rc
2711 Languages\Polish\MergePolish.rc
2712 Languages\Russian\MergeRussian.rc
2713 Languages\Slovak\MergeSlovak.rc
2714 Languages\Spanish\MergeSpanish.rc
2715 Languages\Swedish\MergeSwedish.rc
2716 Languages\Turkish\MergeTurkish.rc
2717 PATCH: [ 1212368 ] Display correct paths in context patches
2719 Revising patched code, removing unneeded dispname added when patch applied
2720 Src: DiffWrapper.cpp
2721 diffutils\src: CONTEXT.C DIFF.H
2722 PATCH: [ 1393239 ] Split functions out of RunFileDiff
2723 Src: DiffWrapper.cpp DiffWrapper.h
2724 PATCH: [ 1392229 ] Fix Column item handling
2725 Src: DirView.h DirViewColHandler.cpp DirViewColItems.cpp
2729 PATCH: [ 1390774 ] Rename CRegOptions to CRegOptionsMgr
2730 Docs\Developers: Options.html
2731 Src\Common: OptionsMgr.cpp OptionsMgr.h
2732 Src: FileTransform.cpp MainFrm.cpp MainFrm.h SyntaxColors.cpp
2733 SyntaxColors.h codepage.h
2734 PATCH: [ 1392650 ] Fix locals of CDiffWrapper::RunFileDiff
2735 Src: DiffWrapper.cpp DiffWrapper.h MergeDoc.cpp PatchTool.cpp
2736 PATCH: [ 1392729 ] Cleanup variables in RunFileDiff
2737 Src: DiffWrapper.cpp
2738 BUG: [ 1369646 ] Confusing half-commented lines in DiffFileData::prepAndCompa
2739 Src: DiffWrapper.cpp
2740 BUG: [ 1392740 ] Clutter in debug output
2742 PATCH: [ 1391766 ] Sync language resources to English
2744 Languages\Brazilian\MergeBrazilian.rc
2745 Languages\Bulgarian\MergeBulgarian.rc
2746 Languages\Catalan\MergeCatalan.rc
2747 Languages\ChineseSimplified\MergeChineseSimplified.rc
2748 Languages\ChineseTraditional\MergeChineseTraditional.rc
2749 Languages\Czech\MergeCzech.rc
2750 Languages\Danish\MergeDanish.rc
2751 Languages\Dutch\MergeDutch.rc
2752 Languages\German\MergeGerman.rc
2753 Languages\Hungarian\MergeHungarian.rc
2754 Languages\Italian\MergeItalian.rc
2755 Languages\Japanese\MergeJapanese.rc
2756 Languages\Korean\MergeKorean.rc
2757 Languages\Norwegian\MergeNorwegian.rc
2758 Languages\Polish\MergePolish.rc
2759 Languages\Russian\MergeRussian.rc
2760 Languages\Slovak\MergeSlovak.rc
2761 Languages\Spanish\MergeSpanish.rc
2762 Languages\Swedish\MergeSwedish.rc
2763 Languages\Turkish\MergeTurkish.rc
2764 PATCH: [ 1212368 ] Display correct paths in context patches
2765 Src: DiffWrapper.cpp DiffWrapper.h
2766 diffutils\src: CONTEXT.C DIFF.H
2767 PATCH: [ 1390454 ] new commandline arguments (prediffer, ignorews...)
2768 Src: ConfigLog.cpp DirDoc.cpp DirDoc.h FileTransform.cpp
2769 MainFrm.cpp MainFrm.h Merge.cpp Merge.dsp Merge.h
2770 MergeEditView.cpp MergeEditView.h
2771 PluginManager.cpp PluginManager.h Plugins.cpp Plugins.h
2773 Src New files: MergeArgs.h MergeArgs.cpp
2774 Src/Common: CmdArgs.cpp CmdArgs.h OptionsMgr.cpp OptionsMgr.h
2777 PATCH: [ 1391732 ] Do not offer to unify codepages in UNICODE build
2778 Also introduces new error IDS_DIFFERENT_UNICODINGS and new
2779 global function IsUnicodeBuild.
2780 Src: ConfigLog.cpp MainFrm.cpp Merge.rc resource.h StdAfx.cpp StdAfx.h
2783 PATCH: [ 1390793 ] New global function GetOptionMgr
2784 Src: DirActions.cpp DirDoc.cpp DirView.cpp DirViewColHandler.cpp
2785 LocationView.cpp MainFrm.cpp MainFrm.h MergeDiffDetailView.cpp
2786 MergeDoc.cpp MergeEditView.cpp OpenDlg.cpp
2787 Src/Common: OptionsMgr.h
2790 PATCH: [ 1382130 ] New line-based RCLocalizationHelper
2794 PATCH: [ 1388704 ] Simplified Chinese language .rc file for RC1
2795 Src/Languages/ChineseSimplified: MergeChineseSimplified.rc
2796 Update language versions of resource.h
2797 Src/Languages/*: resource.h
2800 Update & synchronize translations: Danish Dutch French Hungarian Italian Japanese
2803 Danish: MergeDanish.rc
2804 Dutch: MergeDutch.rc
2805 French: MergeFrench.rc
2806 Hungarian: MergeHungarian.rc
2807 Italian: MergeItalian.rc
2808 Japanese: MergeJapanese.rc
2809 Remove needless cast
2810 Src/Common: unicoder.cpp
2811 Update & synchronize translations: Korean Norwegian Polish Russian
2814 Korean: MergeKorean.rc
2815 Norwegian: MergeNorwegian.rc
2816 Polish: MergePolish.rc
2817 Russian: MergeRussian.rc
2820 PATCH: [ 1388456 ] Convert rest of folder compare bitmaps to icons
2821 Icons from Tim (Thanks!)
2822 Src: CompareStatisticsDlg.cpp DirView.cpp Merge.dsp Merge.rc resource.h
2823 Src/res added files: binarydiff.ico equalbinary.ico equalfile.ico error.ico
2824 fileskip.ico folderup.ico folderup_disable.ico lfile.ico notequalfile.ico
2825 rfile.ico sigma.ico unknown.ico
2826 Src/res removed files: binary.bmp binarydiff.bmp error.bmp fileskip.bmp
2827 folderup.bmp folderup_disable.bmp lfile.bmp notequal.bmp rfile.bmp
2828 sigma.bmp unknown.bmp
2829 Src/Languages: *.rc resource.h
2831 2005-12-21 WinMerge experimental release 2.5.0.4 (cvs)
2834 BUG: [ 1385518 ] Batch file syntax highlighting weirdness
2836 Src/editlib: batch.cpp
2837 PATCH: [ 1387297 ] Swedish translation update for 2.5.0.3+
2838 Submitted by Hans Eriksson
2839 Src/Languages/Swedish: MergeSwedish.rc
2842 PATCH: [ 1386442 ] Local variable uses m_ prefix in CChildFrame
2846 PATCH: [ 1384646 ] Replace Question icons with warning icons in messageboxes
2847 Src: DirActions.cpp FileFiltersDlg.cpp MainFrm.cpp MergeDoc.cpp PatchDlg.cpp
2850 PATCH: [ 1383120 ] Fix background colors in WinMerge
2851 Src: SyntaxColors.cpp SyntaxColors.h
2852 Src/Common: OptionsMgr.cpp OptionsMgr.h
2853 PATCH: [ 1384181 ] Fix byte difference fencepost/infinite loop
2854 Src: CompareOptions.h ConfigLog.cpp DiffWrapper.cpp DiffWrapper.h
2855 Merge.dsp PatchDlg.cpp stringdiffs.cpp
2858 BUG: [ 1379277 ] typo fix for docs
2859 Docs/Developers: Plugins.html
2860 BUG: [ 1375661 ] Readme incomplete in WinMerge 2.5.0.3
2861 Docs/Users: ReadMe.txt
2862 PATCH: [ 1382966 ] Remove empty CMergeEditView::AddMod() and ResetMod()
2863 Src: MergeEditView.cpp MergeEditView.h
2866 PATCH: [ 1378771 ] Fix for BUG:[ 1376552 ] char offset not getting updated when...
2867 Src: ChildFrm.cpp MergeEditView.cpp
2870 PATCH: [ 1378795 ] The searched word is not highlighted correctly
2871 Src/editlib: ccrystaltextview.cpp
2874 PATCH: [ 1382955 ] Remove unused CompareStats.h include from DirFrame.cpp
2876 PATCH: [ 1376711 ] Change CFile::GetStatus to paths_DoesPathExist
2877 Src: files.cpp MainFrm.cpp MainFrm.h Merge.cpp MergeDoc.cpp OpenDlg.cpp
2879 Src/Common: coretools.cpp
2882 PATCH: [ 1381984 ] Folder compare progressdialog could be drawn off-screen
2883 Src: DirCompProgressDlg.cpp
2886 PATCH: [ 1380083 ] Fix EditBinaryFiles Plugin BuildTmp paths
2887 Plugins\src_VCPP\EditBinaryFiles: EditBinaryFiles.dsp
2890 PATCH: [ 1381975 ] Don't open Open-dialog outside screen
2891 Src: MainFrm.cpp OpenDlg.cpp
2892 Src removed file: multimon.h
2895 BUG: [ 1380019 ] Bulgarian translation has wrong language id
2896 Src/Languages/Bulgarian: MergeBulgarian.rc
2897 PATCH: [ 1382131 ] English rc file has numbers instead of symbols for language
2899 PATCH: [ 1379227 ] Fix ExpatLibs BuildTmp paths
2900 Src/ExpatLib: expat_static.dsp
2901 Src/ExpatMapLib: expat_maps_static.dsp
2902 PATCH: [ 1379228 ] Fix Merge7zInstaller BuildTmp paths
2903 Merge7zInstaller: Merge7zInstaller.dsp
2906 PATCH: [ 1381935 ] Simplify DirView icon loading
2910 BUG: [ 1382021 ] Merge7z432 missing?
2911 Merge7z new files: Merge7z431.dsp Merge7z432.dsp
2914 PATCH: [ 1188787 ] New Chinese translation rc file (from PATCH 1183476)
2915 Some more synchronizing from submitted patch
2916 Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
2917 PATCH: [ 1379226 ] Fix Display Plugins BuildTmp paths
2919 PATCH: [ 1188787 ] New Chinese translation rc file (from PATCH 1183476)
2920 Last updates from submitted patch
2921 Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
2922 BUG: [ 1381879 ] Unused variable in unicoder.cpp
2923 Src/common: unicoder.cpp
2926 Update & synchronize translations: ChineseTraditional Czech Danish Dutch
2928 ChineseTraditional: MergeChineseTraditional.rc
2929 Czech: MergeCzech.rc
2930 Danish: MergeDanish.rc
2931 Dutch: MergeDutch.rc
2932 Update & synchronize translations: French German Hungarian Italian Japanese
2934 French: MergeFrench.rc
2935 German: MergeGerman.rc
2936 Hungarian: MergeHungarian.rc
2937 Italian: MergeItalian.rc
2938 Japanese: MergeJapanese.rc
2941 PATCH: [ 1379894 ] Fix handling of unknown encoding
2943 Src/Common: unicoder.cpp
2944 Update & synchronize translations: Brazilian Bulgarian Catalan ChineseSimplified
2946 Brazilian: MergeBrazilian.rc
2947 Bulgarian: MergeBulgarian.rc
2948 Catalan: MergeCatalan.rc
2949 ChineseSimplified: MergeChineseSimplified.rc
2952 PATCH: [ 1378174 ] Share Src/res between translations
2954 Src/Languages/res: removed .bmp .cur and .ico files and WinMergeSplash.psd
2955 splash1.bmp and splash WinMergeSplash.psd not removed from Catalan
2958 PATCH: [ 1377545 ] Remove needless casts
2961 PATCH: [ 1372549 ] readme for Merge7z distributables
2965 PATCH: [ 1371994 ] Enable hi-color icons for folder compare
2966 Icons from Tim (Thanks!)
2967 Src: CompareStatisticsDlg.cpp DirView.cpp Merge.rc resource.h
2968 res new files: folder.ico folderskip.ico lfolder.ico rfolder.ico
2969 res deleted files: folder.bmp folderskip.bmp lfolder.bmp rfolder.bmp
2970 Src/Languages: *.rc resource.h
2971 Src/Languages/res: new and deleted files like in res above
2974 PATCH: [ 1371384 ] Move Expat maps into WinMerge src
2975 Plugins\src_VCPP\DisplayXMLFiles: DisplayXMLFiles.dsp
2976 Src\ExpatMapLib added
2977 Many files moved from DisplayXMLFiles to new ExpatMapLib
2978 PATCH: [ 1373020 ] Carry unicoding, codepage, & file path together
2979 & PATCH: [ 1377545 ] Remove needless casts
2980 Src: DiffWrapper.cpp DiffWrapper.h DirScan.cpp DirView.cpp
2981 MainFrm.cpp MainFrm.h Merge.dsp MergeDoc.cpp MergeDoc.h
2982 Src\Common: RegKey.cpp
2983 NEW Src\FileLocation.h
2986 PATCH: [ 1188787 ] New Chinese translation rc file (from PATCH 1183476)
2987 Remainder of dialogs
2988 Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
2989 BUG: [ 1376825 ] infinite loop bug in byte diffs
2990 Src: stringdiffs.cpp
2991 PATCH: [ 1188787 ] New Chinese translation rc file (from PATCH 1183476)
2992 A few string resources
2993 Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
2994 PATCH: [ 1249007 ] Short size column
2995 Src: DirViewColItems.cpp locality.cpp locality.h Merge.rc resource.h
2996 PATCH: [ 1377362 ] Fix coretools to MakeResDll compiles
2997 BUG: [ 1377361 ] MakeResDll broken b/c coretools broken
2998 Src/Common: coretools.cpp
3001 PATCH: [1374728 ] Fix filter dialog delete
3002 Src: FileFilterMgr.cpp
3005 PATCH: [ 1374782 ] fix for bug 1300957 Crash on save 'unique' file comparison
3006 Submitted by Oliver Mellet, some additional comment improvements by me.
3008 Takashi is now developer, Olivier Mellet submitted a patch
3009 Docs/Users: Contributors.txt
3012 PATCH: [ 1376457 ] Need clarification in platform test in ShellExtension
3013 ShellExtension: ShellExtension.cpp
3016 fix two-line-end-markers bug that was reported in:
3017 "PATCH: [ 1372716 ] patch for RFE:[ 922992 ] Word Wrap/split long lines"
3018 Src: stringdiffs.cpp
3021 PATCH: [ 1372716 ] patch for RFE:[ 922992 ] Word Wrap/split long lines
3022 Src: Merge.rc MergeDoc.cpp MergeEditView.cpp MergeEditView.h OptionsDef.h
3023 OptionsInit.cpp resource.h
3024 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h ccrystaltextview2.cpp
3025 crystalparser.cpp editcmd.h
3026 Src/Languages: *.rc resource.h
3029 PATCH [ 1374931 ] Bugfixes & upload binary for RCLocalizationHelper
3030 (RCLocalizationHelper plugin)
3033 PATCH [ 1372575 ] Fix link for DisplayXmlFiles plugin
3034 (DisplayXMLFiles plugin)
3035 TODO [ 1341058 ] ToDoDeleteThisValidateColumnOrdering()
3036 Src: DirView.cpp DirView.h DirViewColHandler.cpp
3038 2005-12-06 WinMerge experimental release 2.5.0.3 (cvs)
3041 PATCH: [ 1372589 ] Document tildas in config
3044 PATCH: [ 1373037 ] Fix filter dialog to correctly add new filters
3046 Src: FileFiltersDlg.cpp
3047 PATCH: [ 1370183 ] ShellExtension: better way to check for WinMerge executable
3048 ShellExtension: WinMergeShell.cpp
3049 Bump ShellExtension version to 1.7.0
3050 ShellExtension: ShellExtension.rc
3053 PATCH: [ 1372974 ] Make local function "GuessEncoding_from_bytes" static
3054 Src: codepage_detect.cpp
3055 PATCH: [ 1368762 ] Fix assignment in DirScan_GetItems
3056 Also add explanatory comment, for what variable does.
3060 CMarkdown::FileImage::GuessByteOrder(), GuessCodepageEncoding(): Fix UTF-8 signature detection
3061 CMarkdown::GetTagName(): Strip bogus trailing slash in name of empty tag
3062 Src: markdown.cpp codepage_detect.cpp
3065 PATCH: [ 1335128 ] Ignore uninstalled codepages
3066 Src: MergeDoc.cpp MergeDoc.h codepage.cpp codepage_detect.cpp
3067 Src/Common: unicoder.cpp
3070 PATCH: [ 1358408 ] Import and export for options
3071 Increase buffer size
3072 Src/Common: OptionsMgr.cpp
3075 PATCH: [ 1369660 ] Delete unused variables m_msgUpdateStatus
3077 Src: DirDoc.cpp DiffContext.cpp DiffContext.h DiffThread.cpp
3081 PATCH: [ 1369657 ] Delete unused variable DiffFuncStruct::msgStatusUpdate
3083 BUG: [ 1369856 ] Crashed when interface language is changed
3085 BUG: [ 1368755 ] Want comment on format line in 7ZCommon.cpp
3086 Cosmetic: adding explanatory comment to Merge7z::Proxy::operator->
3090 PATCH: [ 1369544 ] Catalan translation update
3091 Submitted by Jordi Vilar
3092 Docs/Users/Languages: ReadMe-Catalan.txt
3093 Src/Languages/Catalan: MergeCatalan.rc
3094 PATCH: [ 1265295 ] Swap file compare panes (use pointers for buffers)
3095 Forgot to update resource.h in language folders
3096 Src/Languages: resource.h
3099 Cosmetic: add comment to DiffThread giving value of msgID variable
3100 (to help debugging).
3104 BUG: [ 1368492 ] cvs ASSERT failing
3105 Fix reversion bug from Patch [ 1265295 ]
3108 PATCH: [ 1265295 ] Swap file compare panes (use pointers for buffers)
3109 Submitted by Takashi Sawanaka
3110 Src: ChildFrm.cpp DiffList.cpp DiffList.h DirDoc.cpp EditorFilepathBar.cpp
3111 EditorFilepathBar.h LocationView.cpp LocationView.h MainFrm.cpp Merge.rc
3112 MergeDiffDetailView.cpp MergeDiffDetailView.h MergeDoc.cpp MergeDoc.h
3113 MergeDocLineDiffs.cpp MergeEditView.cpp MergeEditView.h PathContext.cpp
3114 PathContext.h resource.h
3115 Src/Languages: *.rc resource.h
3118 PATCH: [ 1336598 ] Add extensions DisplayXMLFiles plugin
3119 Add several new extensions, bump version (1.0.2.0 -> 1.0.3.0)
3120 Plugins\src_VCPP\DisplayXMLFiles:
3121 DisplayXMLFiles.dsp DisplayXMLFiles.rc WinMergeScript.cpp
3126 PATCH: [ 1241935 ] Implement Line Diff coloring on byte diffs
3127 Src: MergeDoc.cpp MergeDoc.h MergeDocLineDiffs.cpp PropEditor.cpp
3129 2005-11-23 WinMerge experimental release 2.5.0.2 (cvs)
3132 PATCH: [ 1363114 ] Add '*.ctl;*.pag;*.dsr' to Visual Basic highlighter
3133 Src/editlib: ccrystaltextview.cpp
3136 PATCH: [ 1362882 ] Remove option for autoclosing compare statepane
3137 Src: Merge.rc OptionsDef.h OptionsInit.cpp PropGeneral.cpp PropGeneral.h resource.h
3138 Src/Languages: *.rc resource.h
3139 BUG: [ 1355884 ] 2.4.2 fails to open dvd files
3140 File/folder selection dialog couldn't open read-only folders
3144 PATCH: [ 1334277 ] Show asterisk in #diffs for QuickCompare results
3145 Src: DiffWrapper.cpp DiffWrapper.h DirViewColItems.cpp
3146 PATCH: [ 1334589 ] Encoding maps for Expat parser, for DisplayXmlFiles plugin
3147 Plugins/src_VCPP/DisplayXMLFiles
3148 BUG: [ 1277320 ] Plugins.txt not up-to-date
3149 Plugins/dll/IgnoreCommentsC
3152 Merge7z DllBuild 0017
3153 Merge7z: StdAfx.h Merge7zCommon.cpp Merge7zCommon.h revision.txt
3154 Merge7z new files: Merge7z430.dsp
3155 Merge7zInstaller: Files.rc2 Installer.cpp Merge7zInstaller.dsp
3158 PATCH: [ 1358408 ] Import and export for options
3159 Src: Merge.rc resource.h
3160 Src/Common: OptionsMgr.cpp OptionsMgr.h PreferencesDlg.cpp PreferencesDlg.h
3161 Src/Languages: *.rc resource.h
3164 PATCH: [ 1349645 ] Folder Compare Statistics dialog
3165 PATCH: [ 1347787 ] Use non-modal dialog for dir compare status
3166 Src: DirDoc.cpp DirDoc.h DirFrame.cpp DirFrame.h DirView.cpp DirView.h Merge.cpp Merge.dsp
3168 Src new files: CompareStatisticsDlg.cpp CompareStatisticsDlg.h DirCompProgressDlg.cpp
3169 DirCompProgressDlg.h
3170 Src deleted files: DirCompStateBar.cpp DirCompStateBar.h
3171 Src/res new file: sigma.bmp
3172 Src/Languages: *.rc resource.h
3175 PATCH: [ 1356783 ] Use OptionsMgr in SyntaxColors class
3176 Src: MainFrm.cpp SyntaxColors.cpp SyntaxColors.h
3179 PATCH: [ 1350638 ] Move options read/write code to options panels
3180 Src: MainFrm.cpp Merge.dsp PropArchive.cpp PropArchive.h PropCodepage.cpp PropCodepage.h
3181 PropColors.cpp PropColors.h PropCompare.cpp PropCompare.h PropEditor.cpp PropEditor.h
3182 PropGeneral.cpp PropGeneral.h PropRegistry.cpp PropRegistry.h PropVss.cpp PropVss.h
3183 Src new file: IOptionsPanel.h
3184 Src/Common: PreferencesDlg.cpp PreferencesDlg.h
3187 Merge Perry's fix for OpenDlg/SelectFile() to Merge.cpp/SelectFile() (PATCH #1348733)
3189 PATCH: [ 1350489 ] Use SelectFile() for external editor selection
3190 Src: PropRegistry.cpp
3193 PATCH: [ 1327413 ] Fix bug in CDirDoc::AllowUpwardDirectory()
3194 Change CDirView::AreItemsOpenable() to consider archive files as openable
3195 Src: DirActions.cpp DirDoc.cpp DirView.cpp
3198 PATCH: [ 1337905 ] Allow comparing binary files with binary unpacker
3200 PATCH: [ 1348733 ] Fix open dialog for cvs version 2.4
3204 PATCH: [ 1335072 ] Add text to Plugins.txt to cover DisplayXMLFiles
3205 Plugins/dlls: Plugins.txt
3207 2005-11-02 WinMerge experimental release 2.5.0.1 (cvs)
3210 BUG: [ 1341243 ] Current Find string is too fragile
3211 Was resetting find string after rescanning
3212 Src/editlib: ccrystaltextview.cpp
3213 PATCH: [ 1342550 ] Modernize file selection dialog
3214 PATCH: [ 1345110 ] Properly compare projectfile extension
3215 Src: Merge.cpp Merge.h OpenDlg.cpp
3216 Bump ShellExtension version to 1.6.2
3217 ShellExtension: ShellExtension.rc
3220 PATCH: [ 1345382 ] Translated Shell Extension to German
3221 ShellExtension/Languages: ShellExtensionGerman.rc
3224 RFE: [ 1324314 ] CTRL+W to close current diff
3227 PATCH: [ 1342871 ] Disable Copy Filenames for folders
3228 Src: DirView.cpp DirView.h
3229 PATCH: [ 1343059 ] Swedish translation update for 2.5.0.1 experimental
3230 Submitted by Hans Eriksson
3231 Src/Languages/Swedish: MergeSwedish.rc
3234 PATCH: [ 1341813 ] VSS project linking misdetects project files
3236 PATCH: [ 1310710 ] Fix bug #1309450
3238 Src: DiffContext.cpp DiffContext.h DiffFileInfo.cpp DiffFileInfo.h DirScan.cpp
3241 PATCH: [ 1341183 ] Fix VSS checkout canceling
3242 Src: DirActions.cpp MainFrm.cpp
3243 Open 2.4 manual (update link)
3247 PATCH: [ 1334444 ] Remove needless (& therefore confusing) cast
3248 Src: LocationView.cpp
3251 PATCH: [ 1334484 ] Skip location view paint if buffer not initialized
3252 Src: LocationView.cpp MergeDoc.cpp MergeDoc.h
3253 MergeEditView.cpp MergeEditView.h
3254 Cosmetic changes to GetFunctionsFromScript, to document
3255 arguments passed to GetTypeInfo.
3259 PATCH: [ 1333545 ] Small improvement to Open-dialog folder selection
3261 PATCH: [ 1333581 ] Increase quick compare limit and make it option
3262 Src: DiffContext.h DiffWrapper.cpp DirDoc.cpp OptionsDef.h OptionsInit.cpp
3265 PATCH: [ 1330179 ] Icon for 'Print'
3266 Src: MainFrm.cpp Merge.rc resource.h
3267 Src/res new file: print.bmp
3268 Src/Languages: *.rc resource.h
3269 Src/Languages/res new file: print.bmp
3272 PATCH: [ 1332365 ] Make some DirActions.cpp functions consts
3273 Src: DirActions.cpp DirView.h
3276 PATCH: [ 1329951 ] Readme.txt points to version 2.2 manual
3277 Docs/Users: ReadMe.txt
3278 Docs/Users/Languages: ReadMe-Catalan.txt ReadMe-Swedish.txt
3279 BUG: [ 1326621 ] Extention ".WinMerge" is omitted
3283 PATCH: [ 1330059 ] Translated 3 missing sentences to German
3284 Src/Languages/German: MergeGerman.rc
3287 PATCH: [ 1326813 ] Fix binary detection to allow archives
3291 PATCH: [ 1305541 ] Rational ClearCase support
3292 Submitted by Greg (rys1908)
3293 Src: CCPrompt.cpp CCprompt.h DirActions.cpp MainFrm.cpp MainFrm.h Merge.rc resource.h
3294 Src/Common: coretools.cpp
3295 Src/Languages: *.rc resource.h
3298 PATCH: [ 1323107 ] Patch for crash on save filenames with different cases
3299 From anonymous submitter
3301 PATCH: [ 1286629 ] print support
3302 Submitted by Markus Rollmann
3303 Src: MainFrm.cpp Merge.rc MergeEditView.cpp MergeEditView.h
3304 Src/Common: SplitterWndEx.cpp SplitterWndEx.h
3305 Src/editlib: ccrystaleditview.cpp
3307 Add Markus Rollmann to Contributors.txt
3308 Docs/Users/Contributors.txt
3311 PATCH: [ 1242008 ] Update status to binary if open fails because binary
3312 Follow on for 2nd case
3313 Src: DirView.cpp MergeDoc.cpp
3316 PATCH: [ 1302710 ] generating a report is slow
3317 Perry added comments explaining one code line
3318 Src: DirCmpReport.cpp
3321 PATCH: [ 1302710 ] generating a report is slow
3322 Submitted by Takashi Sawanaka
3323 Src: DirCmpReport.cpp
3324 PATCH: [ 1310214 ] Shell extension italian translation
3325 Submitted by Andrea Decorte
3326 ShellExtension/Languages: ShellExtensionItalian.rc
3329 PATCH: [ 1253949 ] cosmetic comment fix
3331 PATCH: [ 1253950 ] cosmetic--remove old code in InitInstance
3333 PATCH: [ 1253951 ] trivial cosmetic comment upgrade in arg parsing
3337 Merge7z DllBuild 0015
3338 Merge7z: Merge7zCommon.cpp Merge7zCommon.h revision.txt
3339 Merge7z new files: Merge7z427.dsp Merge7z428.dsp Merge7z429.dsp
3340 Merge7zInstaller update
3341 Merge7zInstaller: Files.rc2 Installer.cpp Installer.rc
3344 PATCH: [ 1309423 ] Small typo in MergeSwedish.rc
3345 Submitted by Hans Eriksson
3346 Src/Languages/Swedish: MergeSwedish.rc
3349 PATCH: [ 1229867 ] RFE [ 1205516 ], RFE [ 887948 ], and other issues
3350 Cosmetic, transcribing comment from patch discussion
3354 PATCH: [ 1302608 ] crash on generating a report
3355 Submitted by Takashi Sawanaka
3356 Src: DirCmpReport.cpp
3359 BUG: [ 1298687 ] The files marked as 'skipped' are compared
3360 Fix from Takashi Sawanaka, comment updates by me
3364 PATCH: [ 1301504 ] Danish ShellExtension translation
3365 Submitted by Christial List
3366 ShellExtension/Languages: ShellExtensionDanish.rc
3369 PATCH: [ 1297642 ] Japanese translation update
3370 Submitted by Takashi Sawanaka
3371 ShellExtension/Languages: ShellExtensionJapanese.rc
3372 Src/Languages/Japanese: MergeJapanese.rc
3375 PATCH: [ 1297406 ] updated hungarian translation
3376 Submitted by Márton Balázs
3377 Src/Languages/Hungarian: MergeHungarian.rc
3380 PATCH: [ 1295701 ] Scrolling for dir compare report filename
3383 PATCH: [ 1295758 ] Update URL for downloads page (archive options)
3384 Src: PropArchive.cpp
3387 PATCH: [ 1295767 ] German Translation for 'Highlight Line * Diff'
3388 Src/Languages/German: MergeGerman.rc
3391 PATCH: [ 1294514 ] Set file loading traces debug-only
3393 PATCH: [ 1295473 ] updated italian rc file for winmerge 2.3.6
3394 Submitted by Andrea Decorte
3395 Src/Languages/Italian: MergeItalian.rc
3398 PATCH: [ 1292120 ] More significant diff navigations fixes
3399 Src: DiffList.cpp DiffList.h MergeDoc.cpp MergeEditView.cpp
3400 BUG: [ 1290305 ] ShellExtensionU.dll info missing from config log
3404 PATCH: [ 1292279 ] Various Updates in German Translation
3405 Src/Languages/German: MergeGerman.rc
3408 PATCH: [ 1290477 ] Catalan translation update
3409 Submitted by Jordi Vilar
3410 Src/Languages/Catalan: MergeCatalan.rc
3413 PATCH: [ 1289037 ] Some (non)significant diff count fixes
3414 Src: DiffList.cpp DiffList.h MergeDoc.cpp MergeEditView.cpp
3417 PATCH: [ 1284150 ] Fix Shell Extension registering problem
3418 Also bump version to 1.6
3419 ShellExtension: ShellExtension.cpp ShellExtension.rc
3422 BUG: [ 1284304 ] StaticLink crashes after mouse over event
3423 Changed signature of CStaticLink::OnSetCursor to start with CWnd *
3424 Src\Common: StaticLink.cpp StaticLink.h
3427 PATCH: [ 1285404 ] Various Updates in German Translation
3428 Src/Languages/German: MergeGerman.rc
3431 PATCH: [ 1284890 ] Use Changes.txt instead of readme.txt for ChangeLog
3432 Added ChangeLogs folder to project, and put Changes.txt (this),
3433 readme.txt, and CHANGELO into new ChangeLogs folder.
3434 PATCH: [ 1283466 ] French translation
3435 New translation by Jean-F Jolin
3436 Src/Languages/French: MergeFrench.rc
3439 Previous change history is in file readme.txt