3 (This summarizes all changes to all files under Src, including Src\Languages.)
6 Fix compile with VC6 (doesn't have CString::Append() or CString::AppendChar())
7 Src: MainFrm.cpp PropBackups.cpp
10 PATCH: [ 1650831 ] Polish translation update for WinMerge 2.6.4
11 Submitted by dr_prozac
12 Src/Languages/Polish: MergePolish.rc
15 Add accelerator keys to new Backup options dialog
17 Src/Languages/*: Merge*.rc
20 PATCH: [ 1582537 ] CSS syntax highlighter
22 editlib: ccrystaltextview.cpp ccrystaltextview.h
23 editlib new file: css.cpp
26 PATCH: [ 1652696 ] Add more options for backup files
27 Src: FileActionScript.cpp MainFrm.cpp MainFrm.h Merge.dsp Merge.rc MergeDoc.cpp
28 OptionsDef.h OptionsInit.cpp PropGeneral.cpp PropGeneral.h resource.h
29 Src new files: PropBackups.cpp PropBackups.h
30 Src/Common: PreferencesDlg.cpp PreferencesDlg.h
31 Src/Languages/*: Merge*.rc
34 Remove unused enum definition
42 Remove unused parameter from CMainFrame::SyncFileToVCS()
43 Src: FileActionScript.cpp MainFrm.cpp MainFrm.h
45 2007-02-01 WinMerge experimental release 2.7.1.6 (SVN revision 4094)
48 PATCH: [ 1636314 ] Fix limiting to single file compare window (2)
51 PATCH: [ 1639493 ] Updated Bulgarian language files
52 Submitted by tigertron
53 Src/Languages/Bulgarian: MergeBulgarian.rc
54 Docs/Users/Languages: Readme-Bulgarian.txt
55 PATCH: [ 1650043 ] Convert CDiffWrapper to use CompareOptions
56 Src: CompareOptions.cpp CompareOptions.h DiffWrapper.cpp DiffWrapper.h
57 Remove commented out include line
61 PATCH: [ 1648182 ] Separate Compare options from DiffWrapper
62 Src: CompareOptions.h DiffWrapper.h DirDoc.cpp DirDoc.h Merge.dsp
63 Src new file: CompareOptions.cpp
64 PATCH: [ 1646638 ] Catalan translation update
65 Submitted by Jordi Vilar
66 Src/Languages/Catalan: MergeCatalan.rc
69 Merge7z DllBuild 0019 - Unassociate .exe filename extension from NSIS format
70 ArchiveSupport/Merge7z: Merge7zCommon.cpp Merge7zCommon.h revision.txt
71 Support 7-Zip versions 4.43 & 4.44
72 ArchiveSupport/Merge7z new files: Merge7z443.dsp Merge7z444.dsp
73 ArchiveSupport/Merge7zInstaller: Files.rc2
76 PATCH: [ 1640741 ] patch for BUG:[ 1635100 ] Inefficient word-wrap code
77 Src: MergeEditView.cpp MergeEditView.h
78 Src/edtlib: ccrystaltextview.cpp ccrystaltextview.h
81 PATCH: [ 1644668 ] Fix ANSI regexps(2)
82 Src: DiffWrapper.cpp FileFilterHelper.cpp FilterList.cpp
85 PATCH: [ 1644668 ] Fix ANSI regexps
86 Src: DiffWrapper.cpp FileFilterHelper.cpp FilterList.cpp FilterList.h
87 PATCH: [ 1644820 ] Implement post-compare linefilters for folder compare
88 Src: DiffContext.cpp DiffContext.h DiffThread.cpp DiffThread.h DirDoc.cpp
89 DirDoc.h FolderCmp.cpp FolderCmp.h
92 PATCH: [ 1644785 ] 24bit icons for "Window" menu
93 Based on icons by Alexander Skinner
94 Src/res: cascade.bmp change_pane.bmp close.bmp horizontally.bmp vertically.bmp
95 PATCH: [ 1644800 ] 24bit "Goto" icon
96 Based on icons by Alexander Skinner
100 PATCH: [ 1642809 ] Move compare code out from DiffFileData
101 Src: DiffFileData.cpp DiffFileData.h DiffWrapper.cpp DirScan.cpp
102 DirViewColItems.cpp Merge.dsp
103 Src new files: FolderCmp.cpp FolderCmp.h
106 BUG: [ 1637433 ] Forget selected filter after close
107 Src: Merge.cpp OptionsInit.cpp
110 PATCH: [ 1636314 ] Fix limiting to single file compare window
112 Move options function call out of if() (for easier debugging)
116 PATCH: [ 1620076 ] Add Bazaar and Mercurial to SourceControl.flt
117 Submitted by René Leonhardt
118 Filters: SourceControl.flt
119 Add René Leonhardt to Contributors.txt
120 Docs/Users: Contributors.txt
121 PATCH: [ 1634968 ] Swedish translation update for 2.7.1.5+
122 Submitted by Hans Eriksson
123 Src/Languages/Swedish: MergeSwedish.rc
126 Update manual URL point to 2.6 version manual in readme.txt
127 Docs/Users/ReadMe.txt
128 Docs/Users/Languages/ReadMe-*.txt
129 PATCH: [ 1633581 ] Restrict expanding env variables in open dialog
130 Src: OpenDlg.cpp OpenDlg.h paths.cpp paths.h
133 PATCH: [ 1633194 ] Add editor tab setting to configuration log
134 Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
136 2007-01-10 WinMerge experimental release 2.7.1.5 (SVN revision 4030)
139 PATCH: [ 1631796 ] Use PCRE for filemask filtering
140 Src: DiffWrapper.cpp DirDoc.h FileFilterHelper.cpp FileFilterHelper.h Merge.cpp
141 Merge.dsp Ucs2Utf8.cpp Ucs2Utf8.h
142 Src/Common removed files: Regexp.cpp RegExp.h
143 PATCH: [ 1631806 ] Fix Filterspath initialization
144 Src: MainFrm.cpp MainFrm.h Merge.cpp Merge.h OptionsInit.cpp
147 BUG: [ 1631613 ] WinMerge crashes when editing code files
148 Src/editlib: ccrystaleditview.cpp
151 BUG: [ 1630630 ] Unexpected selection of text after changing pane
152 Src: MergeEditView.cpp
155 PATCH: [ 1597814 ] 'Wrap Lines' + 'Next Diff' Bug (3)
156 Src: MergeEditView.cpp MergeEditView.h
159 PATCH: [ 1631215 ] Remove used files
161 Src/Common deleted: listvwex.cpp listvwex.h
164 PATCH: [ 1593810 ] Line-filtering post compare
165 Src: DiffWrapper.cpp DiffWrapper.h MainFrm.cpp MainFrm.h Merge.dsp MergeDoc.cpp
166 Src new files: FilterList.cpp FilterList.h
169 BUG: [ 1597939 ] Rename Edits Wrong Field in Folder Compare List
173 BUG: [ 1567749 ] "Unable to compare files" needs short result
174 Src: DirViewColItems.cpp Merge.rc resource.h
175 Src/Languages/*: Merge*.rc
178 TODO: [ 1489875 ] Mimimum height for location pane visible area indicator
179 Src: LocationView.cpp
180 TODO: [ 1485038 ] Rename DIFFITEM::IsSideLeft() and IsSideRight()
181 Src: CompareStats.cpp DiffContext.cpp DiffFileData.cpp DiffItem.cpp DiffItem.h
182 DirActions.cpp DirDoc.cpp DirScan.cpp DirView.cpp DirViewColHandler.cpp
184 PATCH: [ 1567773 ] Change "Only in xxxxxxxxxx" to "Right Only: xxxxxxxxxx"
185 Src: DirViewColItems.cpp Merge.rc resource.h
186 Src/Languages/*: Merge*.rc
187 ConvertFilter() function in FileOrFolderSelect can be a static function
188 Src: FileOrFolderSelect.cpp FileOrFolderSelect.h
191 PATCH: [ 1628203 ] Reduce options caching in MergeEditView
192 Src: MergeEditView.cpp MergeEditView.h
193 PATCH: [ 1628299 ] Use OptionsMgr for archive options
195 PATCH: [ 1628263 ] Add debug-menuitem for resetting options
196 Src: MainFrm.cpp MainFrm.h Merge.rc resource.h
197 Src/Languages/*: Merge*.rc
200 PATCH: [ 1625344 ] Move OptionsMgr from MainFrame to MergeApp
201 Src: FileActionScript.cpp MainFrm.cpp MainFrm.h Merge.cpp Merge.h
202 OptionsInit.cpp PropRegistry.cpp PropTextColors.cpp SourceControl.cpp
203 Src/Common: OptionsMgr.h
204 Use Empty() method for CString instead of assigning empty string into it
205 Src/Common: varprop.h
208 PATCH: [ 1625022 ] Constify OptionsManager parameters
209 Src/Common: OptionsMgr.cpp OptionsMgr.h
212 PATCH: [ 1623772 ] Constify PathContext parameter strings
213 Src: PathContext.cpp PathContext.h
215 2006-12-21 WinMerge experimental release 2.7.1.4 (SVN revision 3991)
218 BUG: [ 1603061 ] "Copy Left/Right To .." doesn't work correctly(2)
219 Src: FileActionScript.cpp DirActions.cpp
222 BUG: [ 1606583 ] VC6 build is broken
223 Backout of patch [ 1603769 ] Send MergeCmdLineInfo between instances
224 Src: MainFrm.cpp Merge.cpp MergeCmdLineInfo.cpp MergeCmdLineInfo.h
225 Bump ShellExtension version to 1.10
226 ShellExtension: ShellExtension.rc
227 BUG: [ 1619689 ] Filefilter: ASP.NET Devel
231 PATCH: [ 1618358 ] Fix warning about non-standard extension with enum
233 PATCH: [ 1618364 ] Make GPL URL const string
237 PATCH: [ 1617502 ] Cleanup use of enum in MovedLines
241 BUG: [ 1614558 ] Goto line doesn't work when word wrap is enabled
242 Src: MergeEditView.cpp
245 BUG: [ 1602219 ] Crappy save of project files
246 Src: MainFrm.cpp ProjectFilePathsDlg.cpp
249 PATCH: [ 1614442 ] Swedish translation update for WinMerge 2.6.2
250 Submitted by Hans Eriksson
251 Src/Languages/Swedish: MergeSwedish.rc
254 BUG: [ 1584068 ] location pane is inaccurate when word wrap is on (2)
255 Src: LocationView.cpp LocationView.h MergeEditView.cpp
258 Fix error in logical condition for checking if item is directory
260 PATCH: [ 1610998 ] Splash screen does not stop timer
262 PATCH: [ 1611060 ] Move constants from Merge.cpp to FileOrFolderSelect.cpp
263 Src: FileOrFolderSelect.cpp Merge.cpp
266 BUG: [ 1611542 ] "Wrap lines" does not work for diff pane
267 Src: MergeDiffDetailView.cpp MergeDiffDetailView.h
270 PATCH: [ 1447744 ] Match lines inside diff blocks (based on Perry's patch)
271 Src new files: MergeDocDiffSync.cpp
272 Src: DiffList.h Merge.dsp Merge.rc MergeDoc.cpp MergeDoc.h OptionsDef.h OptionsInit.cpp
273 PropCompare.cpp PropCompare.h resource.h
274 Src/Languages/*: Merge*.rc
277 BUG: [ 1584068 ] location pane is inaccurate when word wrap is on
278 Src: LocationView.cpp LocationView.h MergeEditView.cpp MergeEditView.h
281 BUG: [ 1604115 ] No copyright info in aboutbox for translations
285 BUG: [ 1610877 ] wrong shortcut (localizazion IT, italian)
286 Src/Languages/Italian: MergeItalian.rc
289 PATCH: [ 1610442 ] Make time getting faster for files
290 Src: DirScan.cpp FileInfo.cpp
291 PATCH: [ 1610477 ] Fix UniFile for weird filetimes
292 Src/Common: UniFile.cpp UniFile.h
295 Add missing include to fix ANSI build target
296 Src: FileOrFolderSelect.cpp
298 2006-12-05 WinMerge experimental release 2.7.1.3 (SVN revision 3919)
301 PATCH: [ 1608846 ] Create a class for moved blocks
302 Src: DiffWrapper.cpp DiffWrapper.h Merge.dsp MergeDoc.cpp MergeDoc.h
303 Src new files: MovedLines.cpp MovedLines.h
304 PATCH: [ 1557295 ] Exclude Source Control files and directories filter
305 Submitted by Paul Welter
306 Filters new file: SourceControl.flt
307 Add Peter Welter and Ivan Masár to contributors
308 Docs/Users: Contributors.txt
311 PATCH: [ 1607193 ] INI Syntax Improvements
313 PATCH: [ 1608541 ] Use INI highlighter for VB6 project files
314 Src/editlib: ccrystaltextview.cpp
317 PATCH: [ 1607823 ] Remove manifest loading from lang dlls
318 Src/Languages/*: Merge*.rc
321 PATCH: [ 1597814 ] 'Wrap Lines' + 'Next Diff' Bug (2)
322 Src: MergeEditView.cpp
325 PATCH: [ 1556688 ] Fix maketstring to check for zero-term by MultiByteToWideCha
326 Src: Common/unicoder.cpp
327 PATCH: [ 1606496 ] Slovak translation (update)
328 Submitted by Ivan Masár
329 Src/Languages/Slovak: MergeSlovak.rc
332 Remove commented out code
336 BUG: [ 1589324 ] WinMegee crashes on copy
337 Src: FileFilterMgr.cpp
340 Fix filefilter regexp uppercasing for trunk
341 Src: FileFilterMgr.cpp
344 BUG: [ 1603077 ] Doesn't filter the file vc60.idb using "Merge_VC_loose.flt"
345 Filters: Merge_VC_loose.flt
348 BUG: [ 1603061 ] "Copy Left/Right To .." doesn't work correctly
352 PATCH: [ 1606496 ] Slovak translation
353 Submitted by Ivan Masár
354 ShellExtension/Languages: ShellExtensionSlovak.rc
355 Src/Languages/Slovak: MergeSlovak.rc
358 PATCH: [ 1597814 ] 'Wrap Lines' + 'Next Diff' Bug
359 Src: MergeEditView.cpp
362 PATCH: [ 1605682 ] Add Syntax Highlight option to config log
363 Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
364 PATCH: [ 1556685 ] Avoid infinite loop in character loop in crystal c++ parser
366 Src/editlib: asp.cpp basic.cpp batch.cpp cplusplus.cpp csharp.cpp dcl.cpp fortran.cpp
367 html.cpp innosetup.cpp is.cpp java.cpp lisp.cpp nsis.cpp. pascal.cpp perl.cpp php.cpp
368 python.cpp rexx.cpp rsrc.cpp ruby.cpp sgml.cpp sh.cpp siod.cpp sql.cpp tcl.cpp tex.cpp
372 BUG: [ 1603230 ] DirView icons isn't shown correctly on NT4.0
373 Src/res: equalfile.ico fileskip.ico lfile.ico notequalfile.ico rfile.ico
376 PATCH: [ 1604078 ] Hide skipped items by default
380 PATCH: [ 1603769 ] Send MergeCmdLineInfo between instances
381 Src: MainFrm.cpp Merge.cpp MergeCmdLineInfo.cpp MergeCmdLineInfo.h
384 BUG: [ 1602214 ] Incorrect work with associated files in WinMerge 2.7.1.2
386 PATCH: [ 1603196 ] Allow Open-dialog kind of folder selection for project files
387 Src: FileOrFolderSelect.cpp FileOrFolderSelect.h OpenDlg.cpp OpenDlg.h
390 BUG: [ 1603562 ] Location pane's bar outlines
391 Src: LocationView.cpp
394 Perry is not active developer
395 Docs/Users: Contributors.txt
398 PATCH: [ 1602365 ] Move SelectFile and SelectFolder routines to separate file
399 Src: DirActions.cpp DirCmpReportDlg.cpp FileFiltersDlg.cpp MainFrm.cpp Merge.cpp
400 Merge.dsp Merge.h MergeDoc.cpp OpenDlg.cpp PatchDlg.cpp ProjectFilePathsDlg.cpp
401 PropRegistry.cpp PropVss.cpp
402 Src/Common: PreferencesDlg.cpp
403 Src new files: FileOrFolderSelect.cpp FileOrFolderSelect.h
406 Fix bunch of doxygen warnings (wrong parameter names etc)
407 Src: CmdLineParser.h DiffWrapper.cpp DirDoc.cpp FilepathEdit.cpp files.cpp
408 paths.cpp PropEditor.cpp WMGotoDlg.h
410 2006-11-23 WinMerge experimental release 2.7.1.2 (SVN revision 3844)
413 PATCH: [ 1512881 ] Fix memleak from charsets.c
414 Src: charsets.cp charsets.h Merge.cpp
415 PATCH: [ 1596285 ] Unresolved external symbol __abs64 with VC7.1
416 Submitted by Gal, minor edit by Kimmo
417 Src: StdAfx.cpp StdAfx.h
418 BUG: [ 1584068 ] location pane is inaccurate when word wrap is on
420 Src: LocationView.cpp
423 PATCH: [ 1600714 ] Allow canceling when started from commandline
424 Src: Merge.cpp Merge.h
427 PATCH: [ 1600000 ] Fix project file Has*() functions
428 Src: ProjectFile.cpp ProjectFile.h
431 BUG: [ 1599631 ] WinMerge 2.7.1.1 ignores left dir in project file
435 PATCH: [ 1590831 ] Handle minimize argument (Bug 1570351)
436 Src: MergeDiffDetailView.cpp
437 Src/Common: SplitterWndEx.cpp
440 PATCH: [ 1598194 ] New command line parser
441 Src: MainFrm.cpp Merge.cpp Merge.dsp Merge.h
442 Src added files: ClearCaseCmdLineParser.cpp ClearCaseCmdLineParser.h
443 CmdLineParser.h MergeCmdLineInfo.cpp MergeCmdLineInfo.h
444 WinMergeCmdLineParser.cpp WinMergeCmdLineParser.h
445 Src removed files: CmdArgs.cpp CmdArgs.h MergeArgs.cpp
448 PATCH: Moved white-space trimming to FileFilterHelper class
449 Src: FileFilterHelper.cpp
451 2006-11-16 WinMerge experimental release 2.7.1.1 (SVN revision 3810)
454 PATCH: [ 1596692 ] Change the way modified docs are saved to fix several issues
455 Src: MainFrm.cpp MergeDiffDetailView.cpp MergeDoc.cpp MergeDoc.h
458 BUG: [ 1596285 ] Unresolved external symbol __abs64 with VC7.1
459 Src: StdAfx.cpp StdAfx.h
462 BUG: [ 1594188 ] /x option does not work
466 PATCH: [ 1586689 ] True color bookmark icon
467 Src/editlib: ccrystaltextview.cpp
468 Src/res: mg_icons.bmp
471 PATCH: [ 1590737 ] BCMenu update to v3.036
472 Src: BCMenu.cpp BCMenu.h
475 PATCH: [ 1591532 ] Remove unused XmlDoc class
477 Src removed files: XmlDoc.cpp XmlDoc.h
480 Add PCRE 6.7 (with windows build files from ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Contrib/)
481 New folder: /Externals/pcre
482 PATCH: [ 1591605 ] Add PCRE regexps and convert file filtering to PCRE
483 Src: FileFilterMgr.cpp FileFilterMgr.h Merge.dsp Plugins.cpp
484 Src new files: Ucs2Utf8.cpp Ucs2Utf8.h
487 PATCH: [ 1586705 ] DirView icons (Tim made [not]equalfile.ico)
488 Src/res: equalfile.ico fileskip.ico lfile.ico notequalfile.ico rfile.ico
491 PATCH: [ 1590892 ] Handle unicode paths for project files
495 PATCH: [ 1589427 ] Add back read-only handling for project files
497 PATCH: [ 1589438 ] Add read-only info to ProjectFile dialog
499 PATCH: [ 1589563 ] Fix crash with weird filetimes (and cleanup the code)
500 Src: DiffFileInfo.cpp DiffFileInfo.h DirScan.cpp DirViewColHandler.cpp
501 DirViewColItems.cpp FileInfo.cpp FileInfo.h
504 PATCH: [ 1589601 ] Add "ReDim" keyword to Visual Basic highlighter
505 Src\editlib: basic.cpp
508 Add Expat version 2.0.0 to /Externals/expat (revision: 3749)
509 New folder: /Externals/Expat
510 Add SCEW version 0.4.0 to /Externals/scew (revision: 3750)
511 New folder: /Externals/scew
512 PATCH: [ 1587574 ] Convert project files code to use expat+SCEW
513 Src: Merge.dsp ProjectFile.cpp ProjectFile.h
514 Remove folder: Src/ExpatLib/*
515 PATCH: [ 1588212 ] Add manifest file to resource file
517 Src/Languages/*: Merge*.rc
518 Move files from Installer/InnoSetup: WinMerge.exe.manifest WinMergeU.exe.manifest
522 PATCH: [ 1586869 ] Fix File Select -dialog modality (commit the file I missed in previous commit)
523 Src/Common: PreferencesDlg.cpp
526 PATCH: [ 1586869 ] Fix File Select -dialog modality
527 Src: DirCmpReportDlg.cpp FileFiltersDlg.cpp MainFrm.cpp Merge.cpp Merge.h
528 MergeDoc.cpp PatchDlg.cpp ProjectFilePathsDlg.cpp PropRegistry.cpp PropVss.cpp
529 PATCH: [ 1586892 ] Remove unused unknown.ico and code loading it
530 Src: DirView.cpp Merge.rc resource.h
531 Src/Languages/*: Merge*.rc
532 Remove file: Src/Res: unknown.ico
535 BUG: [ 1418805 ] Menu colors incorrect with non-standard color scheme
539 PATCH: [ 1584004 ] Delete "Toolbar.bmp"
540 Src/res deleted file: Toolbar.bmp
543 Fix compile warnings (some of them 64-bit), remove unused variables and code, fix types
545 Remove unused function, fix inproper pointer usage
546 Src: FileFilterHelper.cpp
547 Fix casting a pointer type to DWORD (not 64-bit compatible)
548 Src: DirView.cpp DirView.h
551 PATCH: [ 1578419 ] Fix creating WinMerge folder to MyFolders always
552 Src: MainFrm.cpp MainFrm.h
553 Trivial type fixes, coding style fixes and converting comments to doxygen
554 Src: StdAfx.cpp StdAfx.h
555 Fix misuse of reference parameters (compiler warning)
559 PATCH: [ 1574696 ] Fix problem in saving filefilter to project file
560 Src: ProjectFilePathsDlg.cpp
563 BUG: [ 1573240 ] Crash in subversion trunk
564 Src: MainFrm.cpp MainFrm.h OptionsInit.cpp
567 BUG: [ 1570259 ] Bookmarks GUI get reset after save
568 Src/editlib: ccrystaltextview.cpp
571 BUG: [ 1570173 ] Crash when merging all differences
575 PATCH: [ 1555344 ] Separate active/inactive developers in Contributors.txt
576 Docs/Users: Contributors.txt
579 PATCH: [ 1572359 ] Various Updates in German Translation for WinMerge 2.6
580 Src/Languages/German: MergeGerman.rc
583 PATCH: [ 1570241 ] Various Updates in German Translation for WinMerge 2.6
584 Src/Languages/German: MergeGerman.rc
587 BUG: [ 1566783 ] Crash on Save Project when no file is selected
591 PATCH: [ 1567874 ] Change manual URL to point to 2.6 manual
595 BUG: [ 1564572 ] Leak memory on undoing
596 Src: GhostTextBuffer.h
597 Src/editlib: ccrystaltextbuffer.h
600 PATCH: [ 1565917 ] Register.bat to register ShellExt for 64-bit Windows
601 ShellExtension: Register.bat
602 BUG: [ 1563187 ] Can't close a file compare with -e switch
606 PATCH: [ 1565359 ] Various Updates in German Translation for WinMerge 2.6
607 Src/Languages/German: MergeGerman.rc
610 PATCH: [ 1564857 ] FindAnyFile function doesn't compile with VC6
611 Src/Common: coretools.cpp
614 PATCH: [ 1563171 ] Catalan translation update (Open-dialog)
615 Submitted by Jordi Vilar
616 Src/Languages/Catalan: MergeCatalan.rc
619 BUG: [ 1564283 ] Parameter -x causes files to be closed after merging
623 PATCH: [ 1564280 ] Stack corruption in LanguageSelect
624 Src/Common: LanguageSelect.cpp
627 Couple of type fixes to CMoveConstraint
628 Src/Common: CMoveConstraint.cpp CMoveConstraint.h
629 Fix check for pointer/value by using bit-shift instead of a cast + add trivial typecasts
630 Src: GhostTextBuffer.cpp
631 Src/editlib: ccrystaltextbuffer.cpp
634 PATCH: [ 1563157 ] Fix coretools.cpp for 64-bit
635 Src/Common: coretools.cpp coretools.h
636 Fix type in ccrystaltextbuffer.h
637 Src/editlib: ccrystaltextbuffer.h
638 PATCH: [ 1563171 ] Catalan translation update
639 Submitted by Jordi Vilar
640 Src/Languages/Catalan: MergeCatalan.rc
641 PATCH: [ 1563386 ] Spanish translation update
642 Submitted by Jesus M. Delgado 'Mack'
643 Src/Languages/Spanish: MergeSpanish.rc
644 Quiet warnings from DiffList.cpp
646 Some SPECIAL_ITEM_POS cleanups
647 Src: DirActions.cpp DirDoc.cpp DirView.cpp DirView.h
648 Fix check for pointer/value by using bit-shift instead of a cast
649 Src: GhostTextBuffer.h
650 Src/editlib: ccrystaltextbuffer.h
652 2006-09-21 WinMerge experimental release 2.5.7.1 (SVN revision 3600)
655 PATCH: [ 1558213 ] Tweak text positions in splash screen
657 Bump ShellExtension version to 1.9.0 (first 64-bit Windows version)
658 ShellExtension: ShellExtension.rc
659 Fix 64-bit typecast warning
660 Src: GhostTextBuffer.h
661 Fix 64-bit pointer truncation in SetWindowLongPtr call (the last I hope)
663 Minor tweaks to 64-bit ShellExtension project file
664 ShellExtension: ShellExtensionX64.vcproj
667 PATCH: [ 1561788 ] Fix 64-bit CFile constructor usage
668 Src/Common: UniFile.cpp
669 PATCH: [ 1561796 ] Get/SetWindowLong not supported in 64-bit Windows
670 Src: 7zCommon.cpp ChildFrm.cpp
671 Src/Common: CSubclass.cpp sizecbar.cpp
672 BUG: [ 1561781 ] 64-bit compile errors from 7zCommon.cpp
674 PATCH: [ 1561650 ] Separate FilterCommentsManager code from DiffWrapper
675 Src: DiffWrapper.cpp DiffWrapper.h Merge.dsp
676 Src new files: FilterCommentsManager.cpp FilterCommentsManager.h
677 Fix 64-bit compile warning by casting last SendMessage() param to LPARAM
679 Fix hex number used instead of INVALID_HANDLE_VALUE
680 Src/Common: sinstance.cpp
681 Fix 64-bit pointer truncation in SetWindowLongPtr call
685 PATCH: [ 1561001 ] Fix FileActionScript type in running actions
686 Src: FileActionScript.cpp
687 PATCH: [ 1561008 ] Warning fix for FileActionScript
689 PATCH: [ 1561080 ] Cleanup for loglevel definition
690 Src: DirDoc.cpp DirScan.cpp MainFrm.cpp Plugins.cpp StdAfx.cpp
691 Src/Common: LogFile.cpp LogFile.h
694 Cleanup 64-bit ShellExtension projectfile, add a debug target
695 ShellExtension: ShellExtensionX64.vcproj
698 PATCH: [ 1559619 ] 64-bit shellextension project file
699 ShellExtension new files: ShellExtensionX64.def ShellExtensionX64.vcproj
700 Remove unused variable
701 Src/editlib: memcombo.cpp
702 Remove unused variable
704 Fix typecasting warnings
705 Src: locality.cpp locality.h MergeDoc.cpp
706 Remove unused variable
707 Src: FileActionScript.cpp
708 Remove unused variable
709 Src: FileFiltersDlg.cpp
712 BUG: [ 1558839 ] ShellExtension does not compile as 64-bit
713 ShellExtension: WinMergeShell.cpp WinMergeShell.h
714 PATCH: [ 1558893 ] Fix incompatible prototype in MessageBoxDialog
715 Src/Common: MessageBoxDialog.cpp MessageBoxDialog.h
716 PATCH: [ 1558913 ] Fix OnTimer prototypes (64-bit compatibility)
717 Src: ChildFrm.cpp ChildFrm.h DircompProgressDlg.cpp DirCompProgressDlg.h DirView.cpp
718 Dirview.h MainFrm.cpp MainFrm.h MergeEditview.cpp MergeEditView.h OpenDlg.cpp
719 Opendlg.h Splash.cpp Splash.h
720 Src/Common: MessageBoxDialog.cpp MessageBoxDialog.h
721 Src/editlib: ccrystaltextview2.cpp ccrystaltextview.h
724 BUG: [ 1547247 ] WinMerge ANSI target does not compile with VS2005
726 Src: Common/SuperComboBox.cpp
727 PATCH: [ 1558152 ] Italian translation updated
728 Submitted by Andrea Decorte
729 Src/Languages/Italian: MergeItalian.rc
732 PATCH: [ 1555764 ] prevent from shaking in view when pressing F5 down
733 Src: GhostTextView.cpp MergeDiffDetailView.cpp
736 PATCH: [ 1556851 ] An Swedish translation update
737 Submitted by Hans Eriksson
738 Src/Languages/Swedish: MergeSwedish.rc
740 2006-09-11 WinMerge beta release 2.5.6 (revision 3552)
743 Japanese translation - update
744 Src/Languages/Japanese: MergeJapanese.rc
747 PATCH: [ 1555764 ] prevent from shaking in view when pressing F5 down
748 Src: GhostTextView.cpp GhostTextView.h MergeDiffDetailView.cpp MergeDiffDetailView.h
751 BUG: [ 1555664 ] fail to copy all to right when enabling moved block detect
755 Czech translation update from Jan Hryz
756 Src/Languages/Czech/MergeCzech.rc
757 PATCH: [ 1553714 ] Add new commandine switches to help dialog
758 Src: Merge.rc MergeArgs.cpp resource.h
759 Src/Languages/*: Merge*.rc
760 PATCH: [ 1552228 ] Don't use 'export' as variable name
764 RFE: [ 1533506 ] Need commandline switch for single-instance
768 PATCH: [ 1552901 ] Update VC loose filefilter
769 Filters: Merge_VC_loose.flt
770 PATCH: [ 1552917 ] Fix GUI for autocompletion option
772 Src/Languages/*: Merge*.rc
775 PATCH: [ 1552095 ] Fix last compare method not visible in GUI list
777 Src/Languages/*: Merge*.rc
780 PATCH: [ 1551332 ] defer loading plugin
781 Src: MainFrm.cpp Merge.rc MergeDoc.cpp MergeEditView.cpp MergeEditView.h
782 Src/Languages/*: Merge*.rc
785 BUG: [ 1550427 ] WinMerge 2.5.5.7 don't save "Include subfoders by default"
786 Src: PropRegistry.cpp
789 Japanese translation - update
790 Src/Languages/Japanese: MergeJapanese.rc
793 PATCH: [ 1544777 ] Compare by size
794 Forgot to commit Options-dialog changes last time so option for this wasn't visible
796 BUG: [ 1547262 ] Suspicious bit shift warning
798 Src/Common: UniFile.cpp
801 PATCH: [ 1547190 ] Fix VS2005 compile
805 BUG: [ 1546938 ] New toolbar icons only works for 'disabled' icons
806 Src/Languages/*/Merge*.rc
809 Fix compiling WinMerge after moving folders around (Merge7z moved under ArchiveSupport)
812 ***** Switch to Subversion *****
814 2006-08-24 WinMerge experimental release 2.5.5.7 (cvs)
817 PATCH: [ 1545411 ] Add some missing options to configlog
818 Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
819 PATCH: [ 1545165 ] WinMarge Bulgarian Translation
820 Submitted by tigertron
821 Src/Languages/Bulgarian: MergeBulgarian.rc
822 Docs/Users/Languages: Readme-Bulgarian.txt
823 Docs/Users/Contributors.txt
824 InnoSetup: WinMerge.iss
825 ShellExtension: ShellExtension.rc
826 ShellExtension/Languages: ShellExtensionBulgarian.rc
827 PATCH: [ 1545890 ] Swedish translation for update for WinMerge 2.5.5.7+
828 Submitted by Hans Eriksson
829 Src/Languages/Swedish: MergeSwedish.rc
830 BUG: [ 1545082 ] Crash when comparing .rc files
831 Fix submitted by Takashi
832 Src/editlib: ccrystaltextview.cpp
835 PATCH: [ 1544905 ] Use stat() to check if file is read-only
836 Src: files.cpp files.h
837 PATCH: [ 1544777 ] Compare by size
838 Src: DiffWrapper.h DirScan.cpp Merge.rc resource.h
839 Src/Languages/*: Merge*.rc
842 PATCH: [ 1541427 ] Using as an external diff tool (RFE 1454623)
843 Src: MainFrm.cpp MainFrm.h MergeArgs.cpp MergeDoc.cpp
846 PATCH: [ 1544784 ] Use as ClearCase external merge tool
850 BUG: [ 1543783 ] Misbehave margin draw
851 Src/editlib: ccrystaltextview.cpp
854 PATCH: [ 1544147 ] Add Install-feature for file filters
855 Src: FileFiltersDlg.cpp FileFiltersDlg.h Merge.rc resource.h
856 Src/Languages/*: Merge*.rc
857 BUG: [ 1534429 ] Message IDS_SUGGEST_IGNOREEOL incorrect
861 PATCH: [ 1424673 ] Widen labels on OpenDialog
864 Src/Languages/*: Merge*.rc
867 PATCH: [ 1542201 ] Change default user filter folder to WinMerge/Filters
869 PATCH: [ 1542829 ] Rename Format-item in File-menu to Convert
871 Src/Languages/*: Merge*.rc
874 PATCH: [ 1540090 ] Change horizontal scroll synch from relative to absolute
875 Src/Common: SplitterWndEx.cpp
878 PATCH: [ 1541158 ] New high-color toolbar icons
879 Src: BCMenu.cpp MainFrm.cpp MainFrm.h Merge.rc resource.h
880 Src/res: ToolbarDisabled.bmp ToolbarEnabled.bmp
883 PATCH: [ 1539568 ] draw icon at modified line (it was changed to line revision marks)
884 Src: GhostTextBuffer.cpp GhostTextBuffer.h MergeDoc.cpp MergeDoc.h
885 Src/editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h ccrystaltextview.cpp
888 PATCH: [ 1456356 ] Scrollbars sometimes not initially active
892 PATCH: [ 1540129 ] Fix indentation of diffutils io.c
893 Src/diffutils/src: IO.C
894 PATCH: [ 1540054 ] Remove Copy All -items from folder compare menu
896 Src/Languages/*: Merge*.rc
897 PATCH: [ 1535558 ] Add GUI for shell extension folder include
898 Src: Merge.rc PropRegistry.cpp PropRegistry.h resource.h
899 Src/Languages/*: Merge*.rc
902 BUG: [ 1538340 ] Undo enabled for folder compare.
903 Src: DirView.h DirView.cpp
906 Japanese translation - update
907 Src/Languages/Japanese: MergeJapanese.rc
910 PATCH: [ 1539204 ] Remove '#' from '#differences' column
912 Src/Languages/*: Merge*.rc
915 PATCH: [ 1538264 ] Split DiffFileData class to own files
916 Src: DiffWrapper.cpp DiffWrapper.h DirScan.cpp DirViewColItems.cpp Merge.dsp
917 Src new files: DiffFileData.cpp DiffFileData.h
918 PATCH: [ 1537261 ] Swedish 2.5.5.6+ translation update
919 Submitted by Hans Eriksson
920 Src/Languages/Swedish: MergeSwedish.rc
923 Fix doxygen comment for ImportOptions()
924 Src/Common: OptionsMgr.cpp
927 PATCH: Code cleanup. Removed commented out code.
928 Src/Common: SuperComboBox.cpp
930 BUG: [ 1531965 ] Crash undoing empty (?) event
931 Src/editlib: ccrystaleditview.cpp
934 Czech translation - update
935 Src/Languages/Czech/MergeCzech.rc
938 PATCH: [ 1310951 ] Option to copy DirCmpReport to clipboard
939 Src: DirCmpReport.cpp DirCmpReport.h DirCmpReportDlg.cpp DirCmpReportDlg.h
941 Src/Languages/*: Merge*.rc
944 Czech translation - update
945 Src/Languages/Czech/MergeCzech.rc
947 2006-08-08 WinMerge experimental release 2.5.5.6 (cvs)
950 BUG: [ 1535835 ] Import settings from the file
951 Src/Common: PreferencesDlg.cpp PreferencesDlg.h
952 PATCH: [ 1536240 ] Fix diff count numbers for real
953 Src: DiffWrapper.cpp DirScan.cpp
954 Src/diffutils/src: analyze.c UTIL.c
957 PATCH: [ 1514487 ] Merge7z DllBuild 0018
958 Merge7z: Merge7z311.cpp Merge7z409.cpp Merge7zCommon.cpp Merge7zCommon.h
959 revision.txt Merge7z*.dsp
960 Merge7z new files: Merge7z433.dsp Merge7z434.dsp Merge7z435.dsp Merge7z436.dsp
961 Merge7z437.dsp Merge7z438.dsp Merge7z439.dsp Merge7z440.dsp Merge7z442.dsp
962 Merge7zInstaller: Installer.cpp Installer.rc Files.rc2
963 Change recommended version of 7-Zip to 4.42
967 PATCH: [ 1535175 ] Shell ext: Add flag for subfolder inclusion
968 ShellExtension: WinMergeShell.cpp WinMergeShell.h
969 Bump ShellExtension version to 1.8.0
970 ShellExtension: ShellExtension.rc
973 BUG: [ 1533292 ] crash when specifying nonexistent project file.
977 PATCH: [ 1534770 ] Add "don't wrap end of file" option for Find
978 Src: Merge.rc resource.h
979 Src/editlib: ccrystaleditview.cpp ccrystaltextview.cpp ccrystaltextview.h
980 ceditreplacedlg.cpp cfindtextdlg.cpp cfindtextdlg.h
981 Src/Languages/*: Merge*.rc
982 BUG: [ 1534461 ] WinMerge 2.5.5.5 ingoring subfolders option in project files
983 Src: MainFrm.cpp Merge.cpp
986 Czech translation - update
987 Src/Languages/Czech/MergeCzech.rc
989 2006-08-03 WinMerge experimental release 2.5.5.5 (cvs)
992 PATCH: [ 1533457 ] Add Refresh Selected -item to Folder compare main menu
993 Src: DirActions.cpp DirView.cpp DirView.h Merge.rc
994 Src/Languages/*: Merge*.rc
997 PATCH: [ 1532743 ] Improve difference count columns in folder compare
998 Src: DiffItem.h DiffItemList.cpp DirScan.cpp DirVierwColItems.cpp
1000 Src/Languages/*: Merge*.rc
1001 PATCH: [ 1529864 ] Stop using Application Data folders as filefilter folders
1002 Src: FileFilterHelper.cpp FileFilterHelper.h
1005 PATCH: [ 1531845 ] Fix memory leak after find
1006 Src/editlib: ccrystaltextview.cpp
1007 PATCH: [ 1531957 ] Fix imagelist memory leak in editor
1008 Src/editlib: ccrystaltextview.cpp
1009 PATCH: [ 1430331 ] New Debug menu
1010 Submitted by Perry, modified by me
1011 Src: MainFrm.cpp MainFrm.h Merge.rc resource.h
1012 Src/Languages/*: Merge*.rc
1013 PATCH: [ 1531319 ] Tidy Folder compare progress dialog
1015 Src/Languages/*: Merge*.rc
1018 PATCH: [ 1531293 ] Fix wrong cursor position after find
1019 Src: ccrystaltextview.cpp ccrystaltextview.h cfindtextdlg.cpp
1020 PATCH: [ 1406051 ] code cleanup for ScriptFileActions
1022 Src: DirActions.cpp FileActionScript.cpp FileActionScript.h
1023 PATCH: [ 1530459 ] Add some doxygen comments for ViewableWhitespace
1024 Src: ViewableWhitespace.cpp ViewableWhitespace.h
1027 BUG: [ 1528322 ] Crash when using F6 / Bugg for file differences
1028 Src: MergeEditView.cpp
1031 PATCH: [ 1530352 ] Start flashing WinMerge window when folder compare is ready
1032 Src: DirView.cpp MainFrm.cpp MainFrm.h
1033 PATCH: [ 1529995 ] Swedish translation update for 2.5.5.4+
1034 Submitted by Hans Eriksson
1035 Src/Languages/Swedish: MergeSwedish.rc
1036 PATCH: [ 1530655 ] Catalan translation update
1037 Submitted by Jordi Vilar
1038 Src/Languages/Catalan: MergeCatalan.rc
1041 PATCH: [ 1529915 ] Refresh menu on DirView does not work correctly
1042 Src: DirActions.cpp DirScan.cpp
1045 PATCH: [ 1529599 ] Cleanup DiffWrapper
1046 Src: DiffWrapper.cpp DiffWrapper.h MergeDoc.cpp PatchTool.cpp
1047 PATCH: [ 1529965 ] Add error messages for managing file filters
1048 Src: FileFiltersDlg.cpp FileFiltersDlg.h Merge.rc resource.h
1049 Src/Languages/*: Merge*.rc
1052 PATCH: [ 1527843 ] prevent dialog from flickering
1053 Src: DirCompProgressDlg.cpp DirView.cpp
1054 Src/Common: CMoveConstraint.cpp
1057 PATCH: [ 1528841 ] Cleanup ByteComparator
1058 Src: ByteComparator.cpp ByteComparator.h FileTextStats.h
1059 PATCH: [ 1528987 ] Use 64-bit variable as file position in Bytecompare
1060 Src: ByteComparator.cpp ByteComparator.h DiffWrapper.cpp FileTextStats.h
1061 PATCH: [ 1529053 ] Success message for loading/saving project file
1062 Src: Merge.rc ProjectFilePathsDlg.cpp resource.h
1063 Src/Languages/*: Merge*.rc
1066 PATCH: [ 1528444 ] Cleanup for AppSerialize
1067 Src: AppSerialize.cpp AppSerialize.h
1070 PATCH: [ 1527771 ] Remove Apply syntax highlight to other side option
1071 Src: Merge.rc MergeDoc.cpp OptionsDef.h OptionsInit.cpp PropEditor.cpp
1072 PropEditor.h resource.h
1073 Src/Languages/*: Merge*.rc
1076 PATCH: [ 1527947 ] Various Updates in German Translation for WinMerge 2.5
1077 Src/Languages/German: MergeGerman.rc
1080 PATCH: [ 1526918 ] Detect which side file is binary file
1081 Src: DiffItem.h DiffWrapper.cpp DiffWrapper.h
1082 Src/diffutils/src: DIFF.H IO.c analyze.c
1084 2006-07-20 WinMerge experimental release 2.5.5.4 (cvs)
1087 PATCH: [ 1525013 ] Add description for ASP.NET filter
1089 PATCH: [ 1525417 ] Move MovedBlock code to own file
1090 Src: DiffWrapper.cpp Merge.dsp
1091 Src new file: MovedBlocks.cpp
1092 PATCH: [ 1525531 ] Allow comparing project files from Open-dialog
1094 Config log files are .txt files (not .log)
1096 BUG: [ 1495212 ] Wrong cursor position after selecting wordwrapped line
1098 Src/editlib: ccrystaltextview.cpp
1101 Czech translation - update
1102 Src/Languages/Czech/MergeCzech.rc
1105 BUG: [ 1198248 ] version copyright symbol needs review
1106 Src/Languages/*: MergeChineseSimplified.rc MergeChineseTraditional.rc MergeJapanese.rc
1110 BUG: [ 1525451 ] ASSERT in CCrystalTextView::DrawSingleLine()
1111 Src/editlib: ccrystaltextview.cpp
1112 BUG: [ 1525466 ] ASSERT in CCrystalTextView::AssertValidTextPos()
1113 Src/editlib: ccrystaltextview2.cpp
1116 BUG: [ 1524832 ] Bogus include's
1117 Src: DirColsDlg.cpp PropEditor.cpp
1118 PATCH: [ 1522037 ] Add read-only option for paths in Project file
1119 Src: MainFrm.cpp Merge.cpp Merge.rc OpenDlg.cpp OpenDlg.h ProjectFile.cpp
1120 ProjectFile.h ProjectFilePathsDlg.cpp ProjectFilePathsDlg.h resource.h
1121 Src/Languages/*: Merge*.rc
1122 PATCH: [ 1525025 ] Copy/paste error in MainFrm.cpp
1124 PATCH: [ 1525198 ] Version info misses copyright (c) char
1128 Fix and improve comment for folder compare columns table
1130 BUG: [ 1524251 ] File filter does not work on 2.5.5.3
1131 Original fix from Takashi, modified by Kimmo
1132 Src: FileFilterMgr.cpp
1135 PATCH: [ 1517057 ] Option to Ignore Multiline Comments (bugfix for single-line comments)
1136 Submitted by David Maisonave
1137 Src: DiffWrapper.cpp
1140 Strip SuperComboBox strings before saving
1141 Src/Common: SuperComboBox.cpp
1143 2006-07-14 WinMerge experimental release 2.5.5.3 (cvs)
1146 BUG: [ 1521555 ] Location Pane - can't see current location because of color
1147 Use 3d-color instead of scrollbar color in location pane
1148 Src: LocationView.cpp
1149 PATCH: [ 1521696 ] Improve Text color option dialog
1150 Src: Merge.rc PropTextColors.cpp PropTextColors.h
1151 Src/Languages/*: Merge*.rc
1154 PATCH: [ 1521352 ] Cleanup char constants for CRegExep
1155 Src/Common: RegExp.cpp
1156 PATCH: [ 1521392 ] Fix reading last line in linefilter file
1157 Src: FileFilterMgr.cpp
1158 BUG: [ 1498511 ] Conflict accelerator key in IDR_DIRVIEWMENU
1160 Src/Languages/*: Merge*.rc
1161 PATCH: [ 1517057 ] Option to Ignore Multiline Comments (bugfix + rename to filtering)
1162 Submitted by David Maisonave
1163 Src: DiffWrapper.cpp DiffWrapper.h DirDoc.cpp MainFrm.cpp Merge.rc MergeDoc.cpp
1164 OptionsDef.h OptionsInit.cpp PropCompare.cpp Propcompare.h resource.h
1165 Src/Languages/*: Merge*.rc
1166 PATCH: [ 1517057 ] Option to Ignore Multiline Comments (bugfix)
1167 Submitted by David Maisonave
1168 Src: DiffWrapper.cpp
1171 PATCH: [ 1517057 ] Option to Ignore Multiline Comments
1172 Submitted by David Maisonave
1173 Src: DiffWrapper.cpp DiffWrapper.h DirDoc.cpp MainFrm.cpp Merge.rc MergeDoc.cpp
1174 OptionsDef.h OptionsInit.cpp PatchTool.cpp PropCompare.cpp Propcompare.h
1176 Src/Languages/*: Merge*.rc
1177 Add Ed_K and David Maisonave to Contributors
1178 Docs/Users: Contributors.txt
1179 Document UniMemFile::ReadString() function parameters and return values
1180 Src/Common: UniFile.cpp
1183 Quiet warning about deprecated function for VS2003 and later
1187 PATCH: [ 1517362 ] Ensure diff is visible in location view
1188 Src: LocationView.cpp
1189 Fix codinstyle in LocationView.cpp (messed up by patch #1517362)
1190 Src: LocationView.cpp
1191 Make VS2005 build less noisy by defining _CRT_SECURE_NO_DEPRECATE for it
1195 PATCH: [ 1516626 ] Enable double-click in column customization dialog
1196 Src: DirColsDlg.cpp DirColsDlg.h
1197 PATCH: [ 1514435 ] Optimize versioninfo reading
1198 Src: AboutDlg.cpp ConfigLog.cpp Splash.cpp
1199 Src/Common: version.cpp version.h
1202 BUG: [ 1303166 ] crash or freeze on closing all window
1205 2006-07-03 WinMerge experimental release 2.5.5.2 (cvs)
1208 PATCH: [ 1515380 ] Page Up/Down Anomaly
1210 Src/editlib: ccrystaltextview2.cpp
1211 PATCH: [ 1515966 ] Use View-IDs in MergeDoc.cpp
1212 Src: MergeDoc.cpp MergeDoc.h
1213 PATCH: [ 1516016 ] Fix poor handling of invalid tab size in Options-dialog
1214 Src: Merge.rc PropEditor.cpp PropEditor.h resource.h
1215 Src/Languages/*: Merge*.rc
1216 Fix comment in DiffList.cpp
1220 PATCH: [ 1515669 ] Add selected difference marker for locationview
1221 Src: LocationView.cpp LocationView.h
1224 PATCH: [ 1514459 ] Cleanup for LocationView code (use view ID)
1225 Src: LocationView.cpp LocationView.h StdAfx.h
1226 PATCH: [ 1514580 ] Tweak location view bar look
1227 Src: LocationView.cpp
1230 PATCH: [ 1514645 ] Various Updates in German Translation for WinMerge 2.5
1231 Src/Languages/German: MergeGerman.rc
1234 PATCH: [ 1513618 ] Fix Merge.rc translation id
1238 PATCH: [ 1512708 ] Fix compile with VS2005
1239 Also additional cleanup for CCrystalTextView::GetMarginWidth()
1240 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
1241 PATCH: [ 1512726 ] Fix combining filesize from two values
1242 Src: DiffFileInfo.cpp DirScan.cpp FileInfo.cpp FileInfo.h
1243 PATCH: [ 1512775 ] Fix encoding columns showing -1
1244 Src: FileTextEncoding.cpp FileTextEncoding.h
1247 PATCH: [ 1510596 ] Updated Readme-Swedish.txt
1248 Submitted by Hans Eriksson
1249 Docs/Users/Languages: ReadMe-Swedish.txt
1250 PATCH: [ 1510600 ] Updated MergeSwedish.rc file for 2.5.5.1+
1251 Submitted by Hans Eriksson
1252 Src/Languages/Swedish: MergeSwedish.rc
1253 BUG: [ 1483242 ] Needless resource file 'MergeSwedish_LastTranslation.rc'?
1254 Remove unneeded file
1255 Removed: Src/Languages/Swedish: MergeSwedish_LastTranslation.rc
1256 BUG: [ 1489034 ] Src/Common/LanguageSelect.rc unused?
1257 Remove unneeded file
1258 Removed: Src/Common/LanguageSelect.rc
1259 Remove unused files (language.h & language.c)
1260 Removed: Src: language.c language.h
1262 2006-06-21 WinMerge experimental release 2.5.5.1 (cvs)
1265 PATCH: [ 1509505 ] Manual: new compare method and options export/import
1266 Docs/Users/Manual: Configuration.xml
1267 Bump manual revision to 1.2.4
1268 Docs/Users/Manual: WinMerge_help.xml
1269 Bump ShellExtension version to 1.7.2
1270 ShellExtension: ShellExtension.rc
1273 BUG: [ 1505763 ] Crash after closing file compare window
1274 Src: MergeEditView.cpp
1275 PATCH: [ 1508865 ] Improve error handling for loading file filters
1276 Src: FileFilterHelper.cpp FileFilterMgr.cpp FileFilterMgr.h FileFiltersDlg.cpp
1278 PATCH: [ 1508898 ] Show binary as one of EOL types
1279 Src: DirViewColItems.cpp Merge.rc resource.h
1280 Src/Languages/*: Merge*.rc
1281 PATCH: [ 1506184 ] Polish translation update for WM 2.5.4.0
1282 Submitted by dr_prozac
1283 Src/Languages/Polish: MergePolish.rc
1284 PATCH:[ 1509495 ] Polish translation for ShellExtension
1285 Submitted by dr_prozac
1286 ShellExtension/Languages: ShellExtensionPolish.rc
1289 RFE: [ 1499245 ] Ruby Syntax Highlighting
1291 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h ruby.cpp
1294 BUG: [ 1494776 ] Can't rename files if '|' seperator exists
1295 Src: DirView.h DirView.cpp DirActions.cpp
1298 BUG: [ 1486434 ] Copy Pathnames for right-only dir copies parent dir only
1302 PATCH: [ 1483544 ] New compare method: by date and size
1303 Src: DiffWrapper.h DirScan.cpp Merge.rc PropCompare.cpp resource.h
1304 Src/Languages/*: Merge*.rc
1307 BUG: [ 1496066 ] WinMerge crashed with those files
1308 Src: GhostTextView.cpp GhostTextView.h
1311 BUG: [ 1494610 ] Wrong selection in ccrystalview2.cpp
1312 Src/editlib: ccrystaltextview2.cpp
1313 PATCH: [ 1497817 ] Cleanup CCrystalTextView::GetLineBySubLine
1314 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
1317 PATCH: [ 1497154 ] Fix memory leak in wordwrap code
1318 Src/editlib: ccrystaltextview.cpp
1319 PATCH: [ 1497068 ] Initialize cursorpositions in GhostTextView
1320 Src: GhostTextView.h
1321 PATCH: [ 1497147 ] Cleanup CCrystalTextView::ClientToText
1322 Src/editlib: ccrystaltextview.cpp
1325 BUG: [ 1494610 ] Wrong selection in ccrystalview2.cpp
1327 Src/editlib: ccrystaltextview2.cpp
1330 PATCH: [ 1495017 ] Translate 'Textcolors' options to German
1331 Src/Languages/German: MergeGerman.rc
1334 PATCH: [ 1494627 ] Skip processing empty paths in Open dialog
1336 Doxygen comments and trivial cleanups for paths.cpp & paths.h
1337 Src: paths.cpp paths.h
1340 PATCH: [ 1493742 ] Limit vertical scrolling to last line of files
1341 Src/editlib: ccrystaltextview.cpp
1342 PATCH: [ 1493868 ] Add bookmark by double-clicking selection frame
1343 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h ccrystaltextview2.cpp
1344 PATCH: [ 1492458 ] Swedish translation update for 2.5.4.0
1345 Submitted by Hans Eriksson
1346 Src/Languages/Swedish: MergeSwedish.rc
1347 Add some const keywords and fix comments, remove unused function.
1348 Src: DiffList.cpp DiffList.h
1349 BUG: [ 1488797 ] ASSERT in CMergeEditView::OnPrevdiff
1351 Src: MergeEditView.cpp
1354 PATCH: [ 1493713 ] Translate 'Bookmarks' feature to German
1355 Src/Languages/German: MergeGerman.rc
1358 PATCH: [ 1491436 ] Spanish Readme.txt
1359 Submitted by Jesus M. Delgado 'Mack'
1360 Docs/Users/Languages new file: ReadMe-Spanish.txt
1361 InnoSetup: WinMerge.iss
1364 PATCH: [ 1491993 ] Ability to rename files (RFE 1380228)
1365 Src: DirActions.cpp DirView.cpp DirView.h Merge.rc resource.h
1368 PATCH: [ 1491212 ] Czech Translation
1369 Submitted by: Jan Hryz
1370 Src/Languages/Czech/MergeCzec.rc
1371 PATCH: [ 1492025 ] Catalan translation update
1372 Submitted by Jordi Vilar
1373 Src/Languages/Catalan: MergeCatalan.rc
1374 PATCH: [ 1491424 ] Spanish translation for v2.5.3.7
1375 Submitted by Jesus M. Delgado 'Mack'
1376 Languages/Spanish: MergeSpanish.rc
1378 2006-05-18 WinMerge beta release 2.5.4
1381 PATCH: [ 1490540 ] Manual: add picture and explanation about our version tree
1382 Docs/Users/Manual: Introduction.xml
1383 Docs/Users/Manual/build: build_html.bat build_htmlhelp.bat
1384 Docs/Users/Manual/Art new files: WinMerge_versions.gif WinMerge_versions.odg
1387 PATCH: [ 1489824 ] Better default folder for user filters
1389 BUG: [ 1445975 ] BuildDll.bat exit is not good
1390 Src/Languages: BuildDll.bat
1391 PATCH: [ 1488387 ] Russian translation update for 2.4.6
1392 Submitted by Dmitriy Aleshkowskiy
1393 Src/Languages/Russian: MergeRussian.rc
1396 PATCH: [ 1489133 ] Manual: document new filter location(s)
1397 Docs/Users/Manual: Filters.xml
1398 PATCH: [ 1489091 ] Enable Help/Index
1400 PATCH: [ 1489098 ] Doesn't open Help TOC correctly
1402 BUG: [ 1487856 ] Long delay if many language dlls
1404 Src/Common: LanguageSelect.cpp LanguageSelect.h
1405 BUG: [ 1487854 ] ASSERT in CCrystalTextView::OnPrint
1406 Fix suggested by Mallato
1407 Src/editlib: ccrystaltextview.cpp
1408 Graphic Design: Alexander Skinner
1409 Docs/Users: Contributors.txt
1410 BUG: [ 1478057 ] Memory leak when cancelling print preview
1411 Fix suggested by Mallato
1412 Src/editlib: ccrystaltextview.cpp
1415 PATCH: [ 1488637 ] PHP/ASP Syntax Highlighting Fix (Bug 1441643)
1416 Src/editlib: asp.cpp php.cpp
1419 PATCH: [ 1485861 ] Czech translation - update
1420 Submitted by: Jan Hryz
1421 Src/Languages/Czech/MergeCzec.rc
1422 PATCH: [ 1483553 ] Swedish MergeSwedish.rc 1.304 2.5.3.7 update
1423 Submitted by Hans Eriksson
1424 Src/Languages/Swedish: MergeSwedish.rc
1425 PATCH: [ 1484004 ] Manual: new Open-dialog screenshot and small fixes
1426 Docs/Users/Manual: Quick_start.xml
1427 Docs/Users/Manual/screenshots: OpenDlg1.gif
1428 PATCH: [ 1484013 ] Manual: small changes to Introduction chapter
1429 Docs/Users/Manual: Introduction.xml
1430 PATCH: [ 1484092 ] Manual: preliminary whats new list for 2.5
1431 Docs/Users/Manual: Whatsnew_2_1.xml
1432 PATCH: [ 1484101 ] Manual: Add index
1433 Docs/Users/Manual: WinMerge_help.xml
1434 PATCH: [ 1484142 ] Manual: update some options descriptions
1435 Docs/Users/Manual: Configuration.xml
1438 PATCH: [ 1483344 ] Fix creating private file filters
1439 Src: FileFiltersDlg.cpp
1440 PATCH: [ 1483486 ] Add commenting for CLogFile
1441 Src/Common: LogFile.cpp LogFile.h
1444 PATCH: [ 1483107 ] Remove dublicated code from folder compare progress dlg
1445 Src: DirCompProgressDlg.cpp DirCompProgressDlg.h
1446 PATCH: [ 1483088 ] Add GUI for user to select filter folder
1447 Src: FileFilterHelper.cpp FileFilterHelper.h FileFiltersDlg.cpp MainFrm.cpp Merge.rc
1448 OptionsDef.h OptionsInit.cpp paths.cpp paths.h PropRegistry.cpp PropRegistry.h
1450 Src/Languages/*: Merge*.rc
1453 BUG: [ 1481053 ] Options: Text Colors should use 3D-Look too
1455 Src/Languages/*: Merge*.rc
1456 PATCH: [ 1482352 ] Icons for 'Bookmarks' feature
1457 Src: MainFrm.cpp Merge.rc resource.h
1458 Src/res new files: clear_bookmarks.bmp next_bookmark.bmp prev_bookmark.bmp
1460 Src/Languages/*: Merge*.rc
1463 BUG: [ 1363364 ] DisplayBinaryFiles extension list wrong
1464 Also bump version of plugin to 1.0.3.0
1465 Plugins/src_VCPP/DisplayBinaryFiles: ChangeLog.txt DisplayBinaryFiles.rc WinMergeScript.cpp
1466 Plugins/dlls: DisplayBinaryFiles.dll
1469 PATCH: [ 1482411 ] Add line before 'Open Project' in main menu
1471 Src/Languages/*: Merge*.rc
1474 PATCH: [ 1482688 ] sgml.cpp contains "lt" twice
1475 Src/editlib: sgml.cpp
1476 PATCH: [ 1482694 ] xml.cpp contains "lt" twice
1477 Src/editlib: xml.cpp
1478 PATCH: [ 1482765 ] Fix closing folder compare progress dialog
1479 Src: DirCompProgressDlg.cpp DirCompProgressDlg.h DirView.cpp
1481 2006-05-04 WinMerge experimental release 2.5.3.7 (cvs)
1484 PATCH: [ 1481213 ] Fix foldercompare short-size suffixes and localize them
1485 Src: DirViewColItems.cpp Merge.rc resource.h
1486 Src/Languages/*: Merge*.rc
1487 PATCH: [ 1481391 ] Make LocationView update from MergeView more safe
1488 Src: LocationView.cpp MergeEditView.cpp MergeEditView.h
1489 BUG: [ 1456356 ] Scrollbars sometimes not initially active
1490 Another possible fix..
1491 Src/editlib: ccrystaltextview.cpp
1494 PATCH: [ 1480652 ] Small fix for XML syntax highlight
1495 Src/editlib: xml.cpp
1498 PATCH: [ 1479007 ] WinMerge Icon Set Revision 3
1499 Submitted by Alexander Skinner
1501 BUG: [ 1474782 ] Crash when comparing SQL with with binary data
1502 Fix suggested by anonymous submitter
1503 Src/editlib: asp.cpp basic.cpp batch.cpp cplusplus.cpp csharp.cpp dcl.cpp
1504 fortran.cpp html.cpp ini.cpp innosetup.cpp is.cpp java.cpp lisp.cpp nsis.cpp
1505 pascal.cpp perl.cpp php.cpp python.cpp rexx.cpp rsrc.cpp sgml.cpp sh.cpp
1506 siod.cpp sql.cpp tcl.cpp tex.cpp xml.cpp
1507 PATCH: [ 1471835 ] Fix setting filename in folder-compare report dialog
1508 Fix bug in the original patch
1509 Src: DirCmpReportDlg.cpp
1512 PATCH: [ 1475649 ] Enable selection margin and line numbers
1513 Src/res new file: mg_icons.bmp
1516 PATCH: [ 1475649 ] Enable selection margin and line numbers
1517 Src: GhostTextView.cpp GhostTextView.h Merge.rc MergeEditView.cpp
1518 MergeEditView.h OptionsDef.h OptionsInit.cpp resource.h
1519 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h editcmd.h
1520 Src/Languages/*: Merge*.rc
1523 PATCH: [ 1477957 ] Fix 'Help' button position in German translation
1524 Src/Languages/German: MergeGerman.rc
1527 PATCH: [ 1476279 ] Cleanup CDiffContext::UpdateInfoFromDiskHalf() and its usage
1528 Src: Diffcontext.cpp DiffContext.h DirScan.cpp DirViewColItems.cpp
1531 PATCH: [ 1475776 ] Optimize dirview UI updates
1532 Src: DirActions.cpp DirDoc.cpp DirDoc.h
1533 PATCH: [ 1472622 ] Czech translation - update (more dialog fixes)
1534 Submitted by: Jan Hryz
1535 Src/Languages/*: Merge*.rc
1538 PATCH: [ 1474884 ] Fix XmlDoc not releasing file handles
1539 Src: XmlDoc.cpp XmlDoc.h
1540 PATCH: [ 1475092 ] Add DocumentsLoaded() to MergeDiffDetailView
1541 Src: MergeDiffDetailView.cpp MergeDiffDetailView.h MergeDoc.cpp
1542 Gal Hammer is now a developer
1543 Docs/Users: Contributors.txt
1546 PATCH: [ 1473902 ] Add dialog for editing and saving project files
1547 Src: DirDoc.cpp DirDoc.h MainFrm.cpp MainFrm.h Merge.dsp Merge.rc MergeDoc.cpp
1548 MergeDoc.h resource.h
1549 Src new files: ProjectFilePathsDlg.cpp ProjectFilePathsDlg.h
1550 Src/Languages/*: Merge*.rc
1551 PATCH: [ 1472622 ] Czech translation - update
1552 Submitted by: Jan Hryz
1553 Src/Languages/Czech/MergeCzec.rc
1554 PATCH: [ 1472622 ] Czech translation - update (apply dialog fixes)
1555 Submitted by: Jan Hryz
1556 Src/Languages/*: Merge*.rc
1559 PATCH: [ 1473635 ] Move some results update code to DirDoc
1560 Src: DirActions.cpp DirDoc.cpp DirDoc.h
1561 PATCH: [ 1468691 ] Center folder compare status dialog to mainframe
1562 Adding line I missed previous time applying the patch (2006-04-12)
1566 TODO: [ 1469363 ] Need image for aborted status in folder compare
1568 Src: DirView.cpp Merge.rc resource.h
1569 Src/res new file: aborted.ico
1570 Src/Languages/*: Merge*.rc
1571 PATCH: [ 1400653 ] Write project files using objects
1573 Src: Merge.dsp ProjectFile.cpp ProjectFile.h
1574 Src new files: XmlDoc.cpp XmlDoc.h
1577 PATCH: [ 1471835 ] Fix setting filename in folder-compare report dialog
1578 Src: DirCmpReportDlg.cpp DirCmpReportDlg.h
1581 PATCH: [ 1445996 ] Fix wrong PgDown scrolling after mousescroll(2)
1582 Src/editlib: ccrystaltextview2.cpp
1584 2006-04-12 WinMerge experimental release 2.5.3.6 (cvs)
1587 PATCH: [ 1468691 ] Center folder compare status dialog to mainframe
1589 PaTCH: [ 1468783 ] Fix disabled scrollbars after loading files
1590 Src: MergeDoc.cpp MergeEditView.cpp MergeEditView.h
1593 PATCH: [ 1467872 ] Fix diff navigation for first-line of diff
1594 Src: MergeEditView.cpp
1595 PATCH: [ 1443719 ] xml output reports
1596 Submitted by Perry, modified by me
1597 Src: DirCmpReport.cpp DirCmpReport.h DirCmpReportDlg.cpp DirCmpReportDlg.h
1598 DirView.cpp DirView.h Merge.dsp Merge.rc resource.h
1599 Src new file: DirReportTypes.h
1602 PATCH: [ 1467305 ] Beep when long compare is ready
1603 Src: DirView.cpp DirView.h
1606 BUG: [ 1461375 ] Forgot old patch #981526 for sgml.cpp, sh.cpp and tcl.cpp?
1607 Src\editlib: sgml.cpp sh.cpp tcl.cpp
1610 BUG: [ 1383719 ] ShellExtension resources opening in IDE fails
1612 ShellExtension/Languages/*.rc
1613 BUG: [ 1465893 ] Compile error with VC6 (SuperComboBox.cpp)
1615 Src/Common: SuperComboBox.cpp
1618 BUG: [ 1463137 ] MergeArgs.h is empty file?
1621 Src removed file: MergeArgs.h
1624 PATCH: [ 1461896 ] Syntax highlighting of HTML for ASP not complete
1625 Src\editlib: asp.cpp
1628 PATCH: [ 1460749 ] Print relative paths to patch files
1629 Src: DiffWrapper.cpp DiffWrapper.h MainFrm.cpp MergeDoc.cpp PatchDlg.h
1630 PatchTool.cpp PatchTool.h
1631 BUG: [ 1461328 ] Commandline handling overwrites flags?
1634 BUG: [ 1460236 ] Splash localization is broken
1635 Src: Merge.rc resource.h Splash.cpp
1636 Src/Languages/*: Merge*.rc
1637 PATCH: [ 1445426 ] Clear PrivateBuild flag in SetResourceVersions.wsf
1639 Src: SetResourceVersions.wsf
1642 BUG: [ 1458714 ] [Replace All] doesn't work
1643 Src/editlib: ceditreplacedlg.cpp
1646 PATCH: [ 1459284 ] Update of MergeSwedish.rc for WinMerge 2.5.3.5+
1647 Submitted by Hans Eriksson
1648 Src/Languages/Swedish: MergeSwedish.rc
1649 PATCH: [ 1458852 ] Fix UI for multiple file patches
1650 Src: PatchDlg.cpp PatchDlg.h
1651 PATCH: [ 1441718 ] Auto Complete on files or folders selection
1652 Submitted by Gal Hammer
1653 Src/Common: SuperComboBox.cpp SupercompoBox.h
1654 Src: Merge.rc OpenDlg.cpp OptionsDef.h OptionsInit.cpp PropGeneral.cpp
1655 PropGeneral.h resource.h
1656 Src/Languages/*: Merge*.rc
1659 PATCH: [ 1458066 ] Use / as path delimiter in patch files
1660 Src: DiffWrapper.cpp
1661 PATCH: [ 1406944 ] Compute text statistics in QuickCompare
1662 Src new file: FileTextStats.h
1665 PATCH: [ 1457203 ] Create patch from multiple files in folder compare
1666 Src: DirView.cpp DirView.h MainFrm.cpp
1669 PATCH: [ 1457306 ] Revamped Visual Basic syntax highlighter
1670 Src\editlib: basic.cpp
1673 BUG: [ 1455656 ] GPL text still contains 'How to Apply These Terms...'
1676 2006-03-22 WinMerge experimental release 2.5.3.5 (cvs)
1679 PATCH: [ 1455706 ] Catalan translation update
1680 Submitted by Jordi Vilar
1681 Src/Languages/Catalan: MergeCatalan.rc
1682 PATCH: [ 1406944 ] Compute text statistics in QuickCompare
1683 Src: ByteComparator.cpp ByteComparator.h DiffFileInfo.cpp DiffFileInfo.h DiffWrapper.cpp
1684 Diffwrapper.h DirScan.cpp DirViewColItems.cpp Merge.dsp Merge.rc resource.h
1685 Src/diffutils/src: DIFF.H IO.C
1686 Src/Languages/*: Merge*.rc
1689 PATCH: [ 1455663 ] Add new keywords to Visual Basic highlighter
1690 Src\editlib: basic.cpp
1693 PATCH: [ 1448599 ] WinMerge Program Icon Set
1694 Submitted by Alexander Skinner
1696 PATCH: [ 1452288 ] Add ASP.NET filefilter
1697 By By Jon Galloway and Josh Blair
1698 Filters new file: ASPNET.flt
1699 PATCH: [ 1454720 ] Fix resizable dialogs missing captionbar close button
1701 Src/Languages/*: Merge*.rc
1702 PATCH: [ 1455430 ] New Splash Screen Revision 2
1703 Submitted by Alexander Skinner
1705 Remove obsolete splashscreen image (for old splashscreen)
1706 Src/res removed file: WinMergesplash.psd
1709 PATCH: [ 1449892 ] Add compare method to configlog
1710 Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
1711 PATCH: [ 1453252 ] Fix closing filecompare after error
1712 Src: MainFrm.cpp MergeDoc.cpp
1715 PATCH: [ 1449571 ] Add '*.pm' and '*.plx' to Perl highlighter
1716 Src/editlib: ccrystaleditview.cpp
1719 BUG: [ 1449947 ] Looks like diffutils bug for mac-style
1720 BUG: [ 1449949 ] crash comparing two simple test mac files
1721 Fix looping which missed mac case
1725 PATCH: [ 1449868 ] Fix difference counts
1726 Src: DiffWrapper.cpp
1729 PATCH: [ 1449038 ] Add Help-button to Open-dialog
1730 Src: FileFiltersDlg.cpp FileFiltersDlg.h Merge.rc OpenDlg.cpp OpenDlg.h
1731 PropLineFilter.cpp PropLineFilter.h
1732 Src/Common: PreferencesDlg.cpp
1733 Src/Languages/*: Merge*.rc
1736 PATCH: [ 1447927 ] Add Help Search to menu, open correct manual location
1737 Src: DirView.cpp DirView.h MainFrm.cpp MainFrm.h Merge.rc MergeEditView.cpp
1738 MergeEditView.h resource.h
1739 Src/Languages/*: Merge*.rc
1742 PATCH: [ 1447506 ] Don't include splash bitmap to lang files
1743 Src/Languages/*: Merge*.rc
1744 Remove Catalan localized splash screen
1745 Src/Languages/Catalan/res removed files: splash1.bmp WinMergeSplash.psd
1746 BUG: [ 1447851 ] Not enough space for version info in new splash screen
1748 PaTCH: [ 1445377 ] WinMerge Logos (72 DPI)
1749 Submitted by Alexander Skinner
1750 Add new folder Docs/Logos
1751 New Docs/Logos files: readme.txt WinMerge_logo_24bit.png
1752 WinMerge_logo_shadow_24bit.png WinMerge_logo_shadow_trans.tif
1753 WinMerge_logo_trans.gif
1754 Change Splashscreen text to according to Dean's wish
1756 Add Alexander Skinner to contributors list
1757 Docs/Users: Contributors.txt
1758 PATCH: [ 1447348 ] Build language files to Build directory
1759 Src/Languages: BuildDll.bat
1760 PATCH: [ 1447806 ] Use JPEG splashscreen
1761 Src: Merge.dsp Merge.rc resource.h Splash.cpp Splash.h
1762 Src/Common new files: Picture.cpp Picture.h
1763 Src/res new file: splash.jpg
1764 Src/res deleted file: splash1.bmp
1765 Src/Languages/*: Merge*.rc
1768 BUG: [ 1441389 ] Comparing root directory - mysterious
1769 Src: DiffWrapper.cpp
1772 PATCH: [ 1447539 ] Add explanatory comment to CCrystalTextBuffer::MoveLine
1773 Src/editlib: ccrystaltextbuffer.cpp
1774 PATCH: [ 1447547 ] Add more comments to CMergeDoc::PrimeTextBuffers
1778 Remove unneeded splash image (Splash2.bmp) as noted in Patch item #1441392
1779 Src/res removed file: Splash2.bmp
1782 PATCH: [ 1445434 ] SyntaxColors scrambling reg values
1783 Src: SyntaxColors.cpp
1785 2006-03-10 WinMerge experimental release 2.5.3.4 (cvs)
1788 PATCH: [ 1445996 ] Fix wrong PgDown scrolling after mousescroll
1789 Src/editlib: ccrystaltextview2.cpp
1790 BUG: [ 1446648 ] cvs trunk doesn't compile
1794 PATCH: [ 1441392 ] New Splash Screen
1795 Submitted by Alexander Skinner
1797 Src/res: splash1.bmp
1800 Update MakeResDll readme with current information (MSVC.Net 2003 works
1801 now), and better explanation of how to pick a specific version.
1802 MakeResDll: readme.txt
1803 PATCH: [ 1443391 ] Update MakeResDll for VS.NET 2005
1804 MakeResDll: MakeResDll.cpp MakeResDll.dsp MakeResDll.rc
1805 StdAfx.cpp StdAfx.h readme.txt resource.h
1806 New MakeResDll: Merge.ico VsVersionDlg.cpp VsVersionDlg.h
1807 Bump MakeResDll version from 1.0.6.0 to 1.0.7.0.
1808 MakeResDll: MakeResDll.rc
1809 PATCH: [ 1442844 ] Make GetFileExt easier to understand
1810 Src: MergeDoc.cpp MergeDoc.h
1811 Add two minor comments to PropRegistry.
1814 2006-03-06 WinMerge experimental release 2.5.3.3 (cvs)
1817 BUG: [ 1444211 ] bug in current SelectFile
1819 PATCH: [ 1443841 ] Add header comment to Src/Changes.txt
1823 BUG: [ 1442866 ] German RC format error
1824 Src/Languages/German: MergeGerman.rc
1825 BUG: [ 1442865 ] languages lack generate patch & report bitmaps
1826 Src/Languages/*: Merge*.rc
1829 PATCH: [ 1435361 ] Fix and cleanup project file code
1830 Src: DiffContext.cpp DiffContext.h DirDoc.cpp MainFrm.cpp
1831 Merge.cpp Merge.h Merge.rc MergeArgs.cpp ProjectFile.cpp
1833 Src/Languages/*: Merge*.rc
1836 PATCH: [ 1396506 ] customizable text colors
1837 Fix compilation (MSVC.NET 2003 correctly gave error that MSVC6 ignored)
1838 Src: PreferencesDlg.cpp
1839 PATCH: [ 1442125 ] Improvements for MakeResDll parsing
1840 MakeResDll: MakeResDll.cpp MakeResDll.rc resource.h
1841 Src\Common: RegKey.cpp RegKey.h
1842 PATCH: [ 1442134 ] MakeResDll: check that RC file exists
1843 MakeResDll: MakeResDll.cpp MakeResDll.rc resource.h
1844 PATCH: [ 1442238 ] Fix MakeResDll to work with VS.NET 2003
1845 MakeResDll: MakeResDll.cpp MakeResDll.rc
1846 PATCH: [ 1442791 ] Update MakeResDll project
1847 Add Changes.txt to project.
1848 Change version copyright from "2003" to "2003-2006"
1849 MakeResDll: MakeResDll.dsp MakeResDll.rc
1851 2006-03-04 Perry (MSVC6)
1852 Current selftests status: Failure count: 0 (of 756)
1855 PATCH: [ 1396506 ] customizable text colors
1856 Src: MainFrm.cpp MainFrm.h Merge.dsp Merge.rc MergeDoc.cpp
1857 OptionsDef.h OptionsInit.cpp PropArchive.cpp PropArchive.h
1858 PropCodepage.cpp PropCodepage.h PropColors.cpp PropColors.h
1859 PropCompare.cpp PropCompare.h PropEditor.h PropGeneral.h
1860 PropRegistry.h PropSyntaxColors.cpp PropSyntaxColors.h
1861 PropVss.h SyntaxColors.cpp SyntaxColors.h resource.h
1862 Src\Common: PreferencesDlg.cpp PreferencesDlg.h
1863 Src/Languages/*: Merge*.rc
1864 PATCH: [ 1439335 ] Reset cwd in Merge.cpp SelectFile
1865 Src: Merge.cpp OpenDlg.cpp
1866 PATCH: [ 1442082 ] Fix MakeDirs to not error if directory exists
1867 Src\Common: coretools.cpp
1868 PATCH: [ 1396506 ] customizable text colors
1870 Src: new PropTextColors.cpp PropTextColors.h
1873 PATCH: [ 1442699 ] New Changes.txt file for MakeResDll
1874 Add Changes.txt change log (this file).
1875 MakeResDll: new Changes.txt
1876 PATCH: [ 1424636 ] New BuildOneLanguage.vbs & fix MakeResDll exit
1877 MakeResDll: MakeResDll.cpp StdAfx.h
1878 Src\Languages: BuildDll.bat BuildOneLanguage.vbs
1881 PATCH: [ 1441387 ] Improve File Encoding dialog
1883 Src/Languages/*: Merge*.rc
1884 PATCH: [ 1442107 ] Move About-dialog code to separate files from Merge.cpp
1885 Src: Merge.cpp Merge.dsp
1886 Src new files: AboutDlg.cpp AboutDlg.h
1889 PATCH: [ 1437770 ] Icons for 'Generate Patch' and 'Generate Report'
1890 Src: MainFrm.cpp Merge.rc resource.h
1891 Src/res new files: patch.bmp report.bmp
1894 PATCH: [ 1441124 ] Improve filter test dialog
1896 Src/Languages/*: Merge*.rc
1899 PATCH: [ 1424535 ] Czech Translation, Submitted by Jan Hryz
1900 Improve unpacker selection dialog and new filter location selection dialog
1902 Src/Languages/*: Merge*.rc
1905 PATCH: [ 1438233 ] New icons for 'notequalfile', 'lfile' and 'rfile'
1906 Src/res: lfile.ico notequalfile.ico rfile.ico
1909 PATCH: [ 1436855 ] Typo in lang files (change pactch to patch)
1910 Src/Languages/*: Merge*.rc
1911 BUG: [ 1440774 ] Test button for file filters enabled for no filter
1912 Fix submitted by Gal Hammer
1913 Src: FileFiltersDlg.cpp
1914 PATCH: [ 1395847 ] Integration with Rational ClearCase
1915 Submitted by Gal Hammer
1916 Src: MainFrm.cpp MainFrm.h Merge.h MergeArgs.cpp MergeDoc.cpp MergeDoc.h
1917 Src/Common: coretools.cpp coretools.h
1920 BUG: [ 1439360 ] Native languages sometimes suppressed in Unicode Build
1921 Add note to CLanguageSelect::GetNativeLanguageNameString
1922 explaining why codepage check is done even for Unicode build.
1923 Src/Common: LanguageSelect.cpp
1926 BUG: [ 1439350 ] Russian language name in LanguageSelect?
1927 Src/Common: LanguageSelect.cpp
1930 PATCH: [ 1435470 ] Remove CTextFile
1932 Deleted Src\Common: textfile.cpp textfile.h
1933 PATCH: [ 1439229 ] Fix CMergeDoc::SanityCheckD not to dereference illegal lines
1934 BUG: [ 1438390 ] Crash when editting the attached files
1936 PATCH: [ 1434007 ] Move source control code out of MainFrm.cpp
1937 Src: MainFrm.cpp MainFrm.h Merge.dsp
1938 New Src: SourceControl.cpp
1941 PATCH: [ 1437758 ] Improve diff selection when selected diff not visible
1942 Src: MergeEditView.cpp MergeEditView.h
1943 PATCH: [ 1431607 ] Fix worddiff highlight error
1945 Src: stringdiffs.cpp
1948 PATCH: [ 1437677 ] Various Updates in German Translation for WinMerge 2.5
1949 Src/Languages/German: MergeGerman.rc
1952 PATCH: [ 1435431 ] Fix GenerateReport lines
1954 Src: DirCmpReport.cpp
1955 PATCH: [ 1395721 ] VS.NET 2003 warning of SEH bug
1957 PATCH: [ 1428686 ] Catalan translation update
1959 Src/Languages/Catalan: MergeCatalan.rc
1960 PATCH: [ 1430321 ] Swedish translation update and feedback on WinMerge 2.5.3.2
1962 Src\Languages\Swedish: MergeSwedish.rc
1963 PATCH: [ 1434270 ] Fix difference counts
1965 Src: DiffWrapper.cpp
1968 PATCH: [ 1435384 ] Add context menu for diff pane
1969 Src: Merge.rc MergeDiffDetailView.cpp MergeDiffDetailView.h resource.h
1970 Src/Languages/*: Merge*.rc
1971 PATCH: [ 1433125 ] Trap errors from filesystem during actions
1972 Src: FileActionScript.cpp
1975 PATCH: [ 1405603 ] New Test dialog for file filters
1976 (Forgot to do all the language resources)
1977 and misc RC file fixes (eg, many fixes in editor proppage)
1978 New: Src/Languages: WinMerge_Resource_Discrepencies.txt
1981 PATCH: [ 1405603 ] New Test dialog for file filters
1982 Src: FileFilterMgr.cpp FileFilterMgr.h FileFiltersDlg.cpp
1983 FileFiltersDlg.h Merge.dsp Merge.rc resource.h
1984 Src new: TestFilterDlg.cpp TestFilterDlg.h
1985 PATCH: [ 1433312 ] Add cvs tags to source files
1986 Src: ByteComparator.cpp SharedFilterDlg.cpp StdAfx.cpp
1987 TestFilterDlg.cpp TestFilterDlg.h ViewableWhitespace.cpp
1988 Src/Common: SortHeaderCtrl.cpp SortHeaderCtrl.h UniFile.cpp
1989 UniFile.h textfile.cpp textfile.h unicoder.cpp unicoder.h
1990 varprop.cpp varprop.h version.cpp version.h
1993 PATCH: [ 1178743 ] Disable lang menu if no additional langs installed
1994 Src: Merge.cpp Merge.h
1995 Src/Common: LanguageSelect.cpp LanguageSelect.h
1998 PATCH: [ 1433931 ] Add comment before isBin checks in DirView
2000 PATCH: [ 1424153 ] Remove VTS_PUI1 from lwdisp.h
2001 BUG: [ 1395475 ] VTS_UI1 & VTSPUI1 macro redefinition warnings (VS.NET)
2002 Src\Common: lwdisp.h
2003 PATCH: [ 1433927 ] Fix external editor default and messages
2004 BUG: [ 1433774 ] default editor is blank
2005 Src: MainFrm.cpp Merge.cpp Merge.rc OptionsInit.cpp resource.h
2006 Src/Languages/*: Merge*.rc
2007 PATCH: [ 1433353 ] Fix menu resources
2008 Src: MainFrm.cpp Merge.cpp Merge.rc resource.h
2009 Src/Languages/*: Merge*.rc
2011 2006-02-19 Christian
2012 PATCH: [ 1429125 ] Return number of diffs instead of true/false
2016 BUG: [ 1395483 ] Signed/unsigned mismatch warning from LocationView.cpp
2017 Src: LocationView.cpp
2020 BUG: [ 1395475 ] VTS_UI1 & VTSPUI1 macro redefinition warnings (VS.NET)
2021 Fixed VTS_PUI1 (which previous patch for this bug missed).
2022 Src\Common: lwdisp.h
2025 PATCH: [ 1424535 ] Czech Translation, Submitted by Jan Hryz
2026 Improve folder compare columns dialog (idea for new arrows from Catalan translation)
2028 Src/Languages/*: Merge*.rc
2031 PATCH: [ 1431771 ] Alter CheckTranslations.vbs to YesNoCancel
2032 Src/Languages: CheckTranslations.vbs
2033 PATCH: [ 1419582 ] Polish translation update for latest v2.5
2034 Contributed by dr_prozac
2035 Src/Languages/Polish: MergePolish.rc
2036 PATCH: [ 1431846 ] Update Czech Translation
2037 Contributed by Jan Hryz
2038 Src/Languages/Czech: MergeCzech.rc
2039 ShellExtension/Languages/ShellExtensionCzech.rc
2040 A few control adjustments matching Czech to English (many left)
2041 Src/Languages/Czech: MergeCzech.rc
2044 PATCH: [ 1431636 ] IgnoreEOL broken in cvs trunk
2045 Src: PropCompare.cpp
2048 PATCH: [ 1431768 ] Write paths to patch files as given
2049 Src: DiffWrapper.cpp
2052 PATCH: [ 1431205 ] Fix ViewWhitespace \r\n bug
2053 BUG: [ 1431012 ] View line differences adds additional EOL char
2054 Src/editlib: ccrystaltextview.cpp
2055 PATCH: [ 1431197 ] Fix off-by-one highlight error
2056 Src: stringdiffs.cpp
2057 Fix button movement on LanguageSelect (broken by PATCH#1423461).
2058 Also add cvs id comment at top, and doxygen file label.
2059 Src\Common: LanguageSelect.cpp
2062 BUG: [ 1197976 ] GeneratePatch file browse not intialized correctly
2063 Fix submitted by Perry
2067 PATCH: [ 1431131 ] Fix VS.NET 2003 compilation
2068 Src\Common: coretools.cpp scbarg.cpp scbarg.h sizecbar.cpp sizecbar.h
2069 Shrink Swedish dialog IDD_PROPPAGE_LARGE to same size as English
2070 (all controls already were the same size anyway)
2071 Src\Languages\Swedish: MergeSwedish.rc
2074 PATCH: [ 1212124 ] File encoding GUI
2075 Src: DiffContext.cpp DiffFileInfo.cpp DiffFileInfo.h DiffItem.cpp
2076 DiffItem.h DiffThread.cpp DiffWrapper.cpp DirActions.cpp
2077 DirScan.cpp DirView.cpp DirView.h DirViewColItems.cpp FileLocation.h
2078 MainFrm.cpp Merge.dsp Merge.rc MergeDoc.cpp MergeDoc.h OpenDlg.cpp
2079 codepage_detect.cpp codepage_detect.h resource.h
2080 NEW Src: FileTextEncoding.cpp FileTextEncoding.h IntToIntMap.h
2081 LoadSaveCodepageDlg.cpp LoadSaveCodepageDlg.h MergeDocEncoding.cpp
2082 dlgutil.cpp dlgutil.h
2085 Adjust whitespace to match English translation
2086 Also update Russian options/editor controls to match English
2087 Src\Languages\Russian: MergeRussian.rc
2088 Src\Languages\Slovak: MergeSlovak.rc
2089 Src\Languages\Swedish: MergeSwedish.rc
2090 Src\Languages\Turkish: MergeTurkish.rc
2091 PATCH: [ 1424681 ] Widen labels on unpacker dialog
2093 Src\Languages: Merge*.rc
2096 PATCH: [ 1429517 ] Fix coretools.cpp compilation (for MakeResDll)
2097 Src/Common: coretools.cpp
2098 PATCH: [ 1427838 ] code cleanup bottom of merge.cpp
2100 Synchronizing Turkish translation to English where feasible.
2101 Src/Languages/Turkish: MergeTurkish.rc
2102 Update Swedish Options/Editor to current English layout
2103 Src/Languages/Swedish: MergeSwedish.rc
2106 PATCH: [ 1428800 ] Fix ListCopy/AllLeft
2107 BUG: [ 1428791 ] All Left gave me a bunch of msgboxes
2108 Src: MergeDoc.cpp MergeDoc.h
2109 PATCH: [ 1428726 ] Fix for compilation under VS2005
2110 Src: BCMenu.cpp DiffWrapper.cpp DirCmpReport.cpp
2111 DirColsDlg.cpp DirViewColHandler.cpp GhostTextBuffer.cpp
2112 MergeArgs.cpp MergeDiffDetailView.cpp MergeDoc.cpp
2114 Src\Common: LanguageSelect.cpp SuperComboBox.cpp UniFile.cpp
2115 coretools.cpp multiformatText.cpp scbarg.cpp scbarg.h
2116 sizecbar.cpp sizecbar.h
2117 Src\editlib: asp.cpp basic.cpp batch.cpp ccrystaltextview.cpp
2118 cplusplus.cpp crystaltextblock.cpp csharp.cpp dcl.cpp
2119 fortran.cpp html.cpp ini.cpp innosetup.cpp is.cpp java.cpp
2120 lisp.cpp nsis.cpp pascal.cpp perl.cpp php.cpp python.cpp
2121 rexx.cpp rsrc.cpp sgml.cpp sh.cpp siod.cpp sql.cpp
2122 tcl.cpp tex.cpp xml.cpp
2123 PATCH: [ 1427563 ] Give descriptive name to CMergeDoc::SaveHelper
2124 Src: MainFrm.cpp MergeDiffDetailView.cpp MergeDoc.cpp
2125 MergeDoc.h MergeEditView.cpp
2126 PATCH: [ 1426593 ] Remove empty CMergeDoc::SetDiffViewMode()
2128 Src: MergeDoc.cpp MergeDoc.h
2130 2006-02-09 WinMerge experimental release 2.5.3.2 (cvs)
2133 PATCH: [ 1427851 ] Small cleanup for FileFilterMgr::AddFilter()
2134 Src: FileFilterMgr.cpp
2135 Add Jan Hryz as Czech translator and contributor
2136 Docs/Users: Contributors.txt
2139 PATCH: [ 1427845 ] Double-click fails to open, no message
2141 BUG: [ 1427956 ] Differences count in Folder Compare wrong?
2142 Make sure to set diff count to 0 just before counting them
2143 Src: DiffWrapper.cpp
2146 PATCH: [ 1426499 ] Move Save Projectfile to File menu
2147 Src: DirDoc.cpp DirDoc.h MainFrm.cpp MainFrm.h Merge.rc MergeDoc.cpp
2148 MergeDoc.h OpenDlg.cpp OpenDlg.h resource.h
2149 Src/Languages/*: Merge*.rc
2152 PATCH: [ 1424884 ] Fix UniStdioFile encoding of TCHAR
2153 BUG: [ 1402379 ] A character display and save error with encoding of unicode
2154 Src\Common: UniFile.cpp unicoder.cpp unicoder.h
2157 Current selftests status: Failure count: 0 (of 756)
2160 PATCH: [ 1426552 ] Add selftests between platform versions
2161 Src: Changes.txt ConfigLog.cpp DiffWrapper.cpp DiffWrapper.h
2162 DirDoc.cpp MainFrm.cpp MergeArgs.cpp MergeDoc.cpp
2163 MergeDocLineDiffs.cpp OptionsDef.h OptionsInit.cpp PatchTool.cpp
2164 PropCompare.cpp PropCompare.h
2165 Src\editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h
2168 Current selftests status: Failure count: 0 (of 588)
2171 PATCH: [ 1424867 ] Fix common prefix code for \r\n
2172 Src\diffutils\src: IO.C
2173 PATCH: [ 1426793 ] Fix diffutils that counts lines in suffix
2174 Src\diffutils\src: IO.C
2177 Current selftests status: Failure count: 0 (of 588)
2180 PATCH: [ 1424535 ] Czech Translation, Submitted by Jan Hryz
2181 Fix dir compare report dialog layout
2183 Src/Languages/*: Merge*.rc
2186 Synchronizing Slovak translation to English where feasible.
2187 Src/Languages/Slovak: MergeSlovak.rc
2188 Synchronizing Swedish translation to English where feasible.
2189 Src/Languages/Swedish: MergeSwedish.rc
2190 PATCH: [ 1392413 ] Track lossy encodings & warn user
2191 Src: FileFilterMgr.cpp Merge.rc MergeDoc.cpp files.h resource.h
2192 Src/Common: UniFile.cpp UniFile.h unicoder.cpp
2193 PATCH: [ 1392413 ] Track lossy encodings & warn user
2194 Src/Languages/*: Merge*.rc
2197 PATCH: [ 1414201 ] Cleanup Merge Line Flags
2198 Src: LocationView.cpp Merge.dsp MergeDiffDetailView.cpp MergeDoc.cpp
2199 MergeEditView.cpp MergeEditView.h
2200 NEW Src: MergeLineFlags.h
2203 PATCH: [ 1424264 ] Use 'Item' instead of file in View-menu
2205 Src/Language: */Merge*.rc
2208 Fix Italian Edit/Options/Editor line selection controls.
2209 Src/Languages/Italian/MergeItalian.rc
2210 PATCH: [ 1414904 ] updated italian translation for winmerge 2.5.3.1
2211 Submitted by A. Decorte
2212 New updates for selecting current diffs and wrap lines.
2213 Src/Languages/Italian/MergeItalian.rc
2216 BUG: [ 1422257 ] Wrong text in tooltip
2217 (Dutch translation had wrong shortcut keys in tooltip)
2218 Src/Languages/Dutch/MergeDutch.rc
2219 PATCH: [ 1424535 ] Czech Translation
2220 Submitted by Jan Hryz
2221 Src/Languages/Czech/MergeCzech.rc
2224 PATCH: [ 1424142 ] Wrap two lwdisp macros in ifndef
2225 Src/Common: lwdisp.h
2226 Undo PATCH: [ 1424142 ] Wrap two lwdisp macros in ifndef
2227 Src/Common: lwdisp.h
2228 BUG: [ 1383052 ] warning C4005: 'COMPILE_MULTIMON_STUBS' : macro redefinition
2229 (Wrap multimon def with ifndef
2231 PATCH: [ 1423461 ] Rearrange language select dialog
2232 Revise patch applied earlier: put Ok on left and Cancel on right.
2233 (Also fix French dialog which was left out before.)
2235 Src/Languages: */Merge*.rc
2236 PATCH: [ 1421199 ] Fix plugin menu for when location or diff detail view active
2237 Src: ChildFrm.cpp ChildFrm.h MainFrm.cpp MainFrm.h MergeDoc.cpp MergeDoc.h
2238 PATCH: [ 1414904 ] updated italian translation for winmerge 2.5.3.1
2239 Submitted by A. Decorte
2240 Src/Languages/Italian: MergeItalian.rc
2241 PATCH: [ 1423907 ] Fix diffutils hashing of \r
2242 Src/diffutils: IO.C UTIL.C
2243 Current selftests status: Failure count: 0 (of 480)
2244 Created branch "R_diffutils_branch"
2247 PATCH: [ 1409651 ] fix diffutils handling trailing whitespace
2248 Src/diffutils/src: IO.C UTIL.C
2249 Current selftests status: Failure count: 24 (of 480)
2250 Failing -b t002 (u & m platforms, all 4 builds)
2251 Failing -bi t002 (u & m platforms, all 4 builds)
2252 Failing -b bug1406950 (u & m platforms, all 4 builds)
2255 PATCH: [ 1423060 ] Modify perl selftest to test all 4 builds
2257 Current selftests status: Failure count: 36 (of 480)
2258 Failing -b t002 (all 3 platforms, all 4 builds)
2259 Failing -bi t002 (all 3 platforms, all 4 builds)
2260 Failing -b bug1406950 (all 3 platforms, all 4 builds)
2261 PATCH: [ 1421694 ] Widen comments label in Rational ClearCase dialog
2263 Src/Languages: */Merge*.rc
2264 PATCH: [ 1423461 ] Rearrange language select dialog
2265 Src: MainFrm.cpp MainFrm.h Merge.rc OpenDlg.cpp OpenDlg.h
2266 Src/Common: LanguageSelect.cpp LanguageSelect.h
2267 Src/Languages: */Merge*.rc
2270 PATCH: [ 1422052 ] Correction of Swedish for 2.5.3.1+
2271 Contributed by Hans Eriksson
2272 Src/Languages/Swedish: Merge Swedish
2275 PATCH: [ 1412386 ] Adding readme files
2276 New WinMerge/readme.txt
2277 (Various other directories affected -- readme.txt & Changes.txt files)
2280 PATCH: [ 1419329 ] Select Line Difference
2281 Src: Merge.rc MergeDiffDetailView.cpp MergeDiffDetailView.h MergeEditView.cpp
2282 MergeEditView.h resource.h
2283 Src/Language: */Merge*.rc
2286 BUG: [ 1419317 ] link error on 8-bit cvs trunk
2287 Add HtmlHelp.lib to link lines MergeRelease, MergeDebug, MergeUnicodeRelease.
2289 PATCH: [ 1419582 ] Polish translation update for latest v2.5
2290 Contributed by dr_prozac
2291 Src/Languages/Polish: MergePolish.rc
2292 PATCH: [ 1421018 ] Fix handle leak in GetOpenFileName
2293 BUG: [ 1418765 ] 2.4.4.0U maintain opened a handle on folders
2294 Adds new method paths_GetWindowsDirectory & resets current
2295 directory to WINDIR after GetOpenFileName call
2296 Src: MainFrm.cpp OpenDlg.cpp paths.cpp paths.h
2297 Cosmetic: synchronizing whitespace to English version
2298 Src/Languages/*: MergeTurkish.rc MergeSwedish.rc MergeSpanish.rc
2299 Cosmetic: synchronizing whitespace to English version
2300 Src/Languages/*: MergePolish.rc
2301 Updating Polish dialog control layout to English (except where
2302 would hinder appearance)
2303 Src/Languages/*: MergePolish.rc
2306 PATCH: [ 1419171 ] Various Updates in German Translation for WinMerge 2.5
2307 Src/Languages/German: MergeGerman.rc
2310 PATCH: [ 1415895 ] Split cmdline help string into chunks
2311 Src: Merge.cpp Merge.h Merge.rc MergeArgs.cpp resource.h
2312 Src/Languages: */*.rc
2315 PATCH: [ 1414904 ] updated italian translation for winmerge 2.5.3.1
2316 Submitted by A. Decorte
2317 InnoSetup\Languages: Italian.isl
2318 PATCH: [ 1415165 ] Updated Swedish translation for 2.5.3.1+
2319 Submitted by Hans Eriksson
2320 Src\Languages\Swedish: MergeSwedish.rc
2321 PATCH: [ 1414195 ] Delete two old TODO notes
2323 PATCH: [ 1414196 ] Delete useless CChildFrame::OnNotify method
2324 Src: ChildFrm.cpp ChildFrm.h
2325 PATCH: [ 1414199 ] Fix outdated comment on DirView.cpp :: NumToStr
2329 PATCH: [ 1413230 ] Use HtmlHelp API to open help
2330 Src: MainFrm.cpp Merge.dsp
2333 BUG: [ 1412237 ] InitOption return value wrong if RegCreateKey fails
2334 Fix unused wrong return value of InitOption & improve one comment
2335 Src/Common: OptionsMgr.cpp
2336 BUG: [ 1414868 ] Bug in byte_compare (early finish)
2337 (Also added some comments.)
2338 Src: DiffWrapper.cpp
2340 2006-01-24 WinMerge experimental release 2.5.3.1 (cvs)
2343 PATCH: [ 1406840 ] Use HTMLHelp locally
2345 PATCH: [ 1411727 ] Merge inactive diff when cursor is inside it
2346 Src: MergeDoc.cpp MergeDoc.h MergeEditView.cpp MergeEditView.h
2349 Add repro files to selftests from
2350 BUG [ 1406950 ] QuickCompare vs diffutils, disagree on trailing whitespace
2351 Current selftests status: Failure count: 9 (of 108)
2352 Failing -b t002 (all 3 platforms)
2353 Failing -bi t002 (all 3 platforms)
2354 Failing -b bug1406950 (all 3 platforms)
2355 PATCH: [ 1406950 ] QuickCompare vs diffutils, disagree on trailing whitespace
2356 Src: ByteComparator.cpp
2357 (selftests results unimproved, because selftest uses diffutils core, not QuickCompare)
2360 PATCH: [ 1405540 ] Cleanup filters dialog
2361 Src: FileFiltersDlg.cpp FileFiltersDlg.h
2364 PATCH: [ 1411102 ] Add '*.dsl' and '*.jsp' to syntax highlighter
2365 Src/editlib: ccrystaleditview.cpp
2368 PATCH: [ 1411406 ] self-tests and new arguments and new diff2winmerge.exe
2369 Src: Changes.txt MainFrm.cpp MainFrm.h Merge.cpp Merge.h MergeArgs.cpp
2370 Src/Common: OptionsMgr.cpp OptionsMgr.h
2371 New directory WinMerge/diff2winmerge, for diff2winmerge utility
2372 New directory WinMerge/selftests added
2373 Current selftests status: Failure count: 6 (of 108)
2374 Failing -b t002 (all 3 platforms)
2375 Failing -bi t002 (all 3 platforms)
2378 PATCH: [ 1411150 ] Add GetActiveMergeView for MergeDoc
2379 Src: MergeDoc.cpp MergeDoc.h
2382 PATCH: [ 1407740 ] Polish translation update (for version 2.4.4.0)
2383 Submitted by dr_prozac
2384 (Perry merging many of these to cvs trunk)
2385 Src/Language/Polish: MergePolish.rc
2388 BUG: [ 1408587 ] Unused DoScroll() function in Merge*View
2389 Remove DoScroll() from CMergeEditView and CMergeDiffDetailView
2390 Src: MergeDiffDetailView.cpp MergeDiffDetailView.h MergeEditView.cpp
2394 PATCH: [ 1406207 ] Fix error message for unique folders
2395 Src: DirView.cpp Merge.rc resource.h
2396 Src/Language: */Merge*.rc
2399 PATCH: [ 1401711 ] A hybrid of word diff and char diff
2400 Submitted by Takashi Sawanaka
2401 Src: MergeDocLineDiffs.cpp PropEditor.cpp
2402 stringdiffs.cpp stringdiffs.h
2405 PATCH: [ 1406203 ] Open unique files to external editor
2406 Src: DirView.cpp Merge.rc resource.h
2407 Src/Language: */Merge*.rc
2410 PATCH: [ 1333600 ] Get rid of global MainFrame pointer (part1)
2411 Src: DirActions.cpp DirDoc.cpp DirView.cpp FileActionScript.cpp
2412 MainFrm.cpp MainFrm.h Merge.cpp MergeDoc.cpp MergeEditView.cpp
2413 OpenDlg.cpp PropRegistry.cpp
2414 Src\Common: PreferencesDlg.cpp
2417 PATCH: [ 1403457 ] Support Unicode file filter files
2418 Src: FileFilterMgr.cpp
2421 PATCH: [ 1372044 ] Add FileActionScript for folder compare actions
2422 Src: DirActions.cpp DirView.h Merge.dsp
2423 Src new files: FileActionScript.cpp FileActionScript.h
2424 PATCH: [ 1385672 ] Replace some 'file's with 'item's
2426 Src/Language: */Merge*.rc
2427 PATCH: [ 1405340 ] Add XP shadow to folderskip.ico
2429 Src/res: folderskip.ico
2432 TODO: [ 1395638 ] CChildFrame::PreCreateWindow() does nothing
2433 Src: ChildFrm.cpp ChildFrm.h MainFrm.cpp
2436 PATCH: [ 1403454 ] Add comment to UniStdioFile.h
2438 Src/Common: UniFile.h
2439 PATCH: [ 1403893 ] Fix whitespace error in ByteCompare
2440 BUG: [ 1400779 ] Whitespace bug in ByteComparator
2441 Src: ByteComparator.cpp
2444 PATCH: [ 1039677 ] Alter text of Reset button label
2446 Src/Language: */Merge*.rc
2449 PATCH: [ 1399263 ] Captioned panes (new style)
2450 Src: ChildFrm.cpp DiffViewBar.h LocationBar.h Merge.dsp Merge.rc resource.h
2451 Src/Common new files: scbarcf.cpp scbarcf.h
2452 Src/Language: */Merge*.rc
2453 PATCH: [ 1399738 ] Filename bars to use caption colors
2454 Src: ChildFrm.cpp FilePathEdit.cpp FilePathEdit.h
2457 PATCH: [ 1403412 ] German: Option 'Line Difference Coloring' looks broken
2458 Src/Languages/German: MergeGerman.rc
2460 2006-01-11 WinMerge beta release 2.5.2
2463 PATCH: [ 1402774 ] Use dark red color for 'binarydiff.ico'
2465 Src/res: binarydiff.ico
2466 PATCH: [ 1400845 ] Allow Shift+Ctrl+F3 to search selected text backwards
2467 With addition from Takashi for Shift+F3 backwards search
2469 Src/editlib: ccrystaltextview.cpp
2470 Src/Language: */Merge*.rc
2471 BUG: [ 1400829 ] Crash trying to open location pane context menu
2472 Src: LocationView.cpp
2475 PATCH: [ 1401420 ] New 'MergeDir' icon
2476 Src/res: MergeDir.ico
2479 PATCH: [ 1400830 ] Fix drop to only do LoadProjectFile when 1 file dropped
2480 BUG: [ 1400797 ] Dropping two project files doesn't work to compare them
2481 (Also fixes extension test to be case-sensitive)
2485 BUG: [ 1396222 ] CDirView::MoveSelection() is confused
2486 (Rename MoveSelection to MoveFocus & add more commenting)
2487 Src: DirActions.cpp DirView.cpp DirView.h
2490 PATCH: [ 1398064 ] Catalan translation update
2492 Src/Languages/Catalan: MergeCatalan.rc
2493 PATCH: [ 1398959 ] Implement GuessEncoding in QuickCompare
2494 Src: codepage_detect.cpp DiffWrapper.cpp DiffWrapper.h
2496 2006-01-05 WinMerge experimental release 2.5.0.5 (cvs)
2499 PATCH: [ 1393635 ] Save pane sizes and positions when they change
2500 Src: ChildFrm.cpp ChildFrm.h DiffViewBar.cpp DiffViewBar.h LocationBar.cpp
2501 LocationBar.h LocationView.cpp LocationView.h MergeDiffDetailView.cpp
2502 MergeDiffDetailView.h StdAfx.h
2503 PATCH: [ 1396413 ] Update Open dialog controls when its activated
2504 Src: OpenDlg.cpp OpenDlg.h
2507 Cosmetic; normalizing blank lines to agree with English Merge.rc
2509 Brazilian\MergeBrazilian.rc
2510 ChineseSimplified\MergeChineseSimplified.rc
2511 Korean\MergeKorean.rc
2512 Norwegian\MergeNorwegian.rc
2515 PATCH: [ 1394877 ] Find selected text with Ctrl+F3
2517 Src/editlib: ccrystaltextview.cpp
2518 Src/Language: */Merge*.rc
2519 PATCH: [ 1395584 ] Update CSizingControlBar to latest version
2520 Src: DiffViewBar.cpp DiffViewBar.h LocationBar.cpp LocationBar.h Merge.dsp StdAfx.h
2521 Src/Common: sizecbar.cpp sizecbar.h
2522 Src/Common new files: scbarg.cpp scbarg.h
2523 Src/Common deleted files: sizecbarg.cpp sizecbarg.h
2524 PATCH: [ 1383262 ] Fix bitmap leak in ShellExtension
2525 Also bump version number to 1.7.1
2527 ShellExtension: ShellExtension.rc WinMergeShell.cpp WinMergeShell.h
2530 PATCH: [ 1390104 ] fix for BUG: [ 1384069 ] Wrapped lines have incorrect column
2531 Src: MergeEditView.cpp
2532 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
2535 BUG: [ 1390849 ] cvs trunk MergeChineseSimplified doesn't compile
2536 Src/Languages: ChineseSimplified: MergeChineseSimplified.rc
2537 PATCH: [ 1212161 ] Fix handling of \r\n in ByteComparator
2538 Src: ByteComparator.cpp
2541 PATCH: [ 1383802 ] Cleanup line difference options in Editor-options
2542 Src: Merge.rc PropEditor.cpp PropEditor.h resource.h
2543 PATCH: [ 1383802 ] Cleanup line difference options in Editor-options
2545 Src/Language: */Merge*.rc
2546 PATCH: [ 1391550 ] vbs script to check & optionally merge WinMerge resources
2547 Src: new CheckTranslations.vbs
2550 PATCH: [ 1395474 ] Define WINVER for compiling with VS.net
2552 PATCH: [ 1395018 ] Small cleanup for CMergeDoc::PrimeTextBuffers()
2553 Src: DiffList.cpp DiffList.h MergeDoc.cpp
2556 PATCH: [ 1395487 ] Unused local variable in UniStdioFile::DoOpen()
2557 (Delete unused variable)
2558 Src/Common: UniFile.cpp
2559 BUG: [ 1395497 ] Unused local variables in CMergeDoc::GetWordDiffArray()
2560 (Delete unused variables)
2561 Src: MergeDocLineDiffs.cpp
2562 BUG: [ 1395494 ] stringdiffs.cpp / LastChar() returning uninitialized value?
2563 Src: stringdiffs.cpp
2566 Remove unused variable from VSSHelper.cpp/VSSHelper::ReLinkVCProj()
2570 PATCH: [ 1392647 ] Prefix members with m_ in storage_for_plugins
2571 Src/Common: multiformatText.cpp multiformatText.h
2572 PATCH: [ 1394717 ] Fix resource.h include for translations
2573 Src/Languages: */Merge*.rc
2574 Src/Languages deleted: UpdateAll_resource_h.bat
2575 Src/Languages deleted: */resource.h (localized versions of resource.h)
2576 BUG: [ 1395107 ] MergeKorean.rc not compile in cvs trunk
2577 (resource.h => ..\..\resource.h fix missed Korean somehow)
2578 Src/Languages/Korean: MergeKorean.rc
2579 PATCH: [ 1394073 ] Fix ByteComparator: m_bol0
2580 (Change in ByteComparator.h is cosmetic typo fix in comment)
2581 (Fixes some bad tabbing as well)
2582 Src: ByteComparator.cpp ByteComparator.h
2585 PATCH: [ 1394759 ] Allows quotes in Rational ClearCase checkout comment
2586 Submitted by Gal Hammer
2588 Add Gal Hammer to contributors list
2589 Docs/Users: Contributors.txt
2592 BUG: [ 1394857 ] cvs trunk does not compile, ANSI, FindEncodingIdFromNameOrAl
2593 Src: codepage_detect.cpp
2596 PATCH: [ 1392347 ] Fix status after synching unique binary files
2598 PATCH: [ 1394464 ] Find again code doesn't recognize dos/mac EOLs
2599 Src/editlib: ccrystaltextview.cpp
2600 BUG: [ 1394851 ] cvs trunk does not compile (DirScan.cpp, sRule)
2604 PATCH: [ 1394247 ] Fix GuessEncoding recognition of codepages
2605 BUG: [ 1394234 ] GuessEncodings fails to recognize CP-437
2606 Src: codepage_detect.cpp
2607 PATCH: [ 1393979 ] Delete unused DiffWrapper fnc cleanup_script
2608 Src: DiffWrapper.cpp
2611 PATCH: [ 1391732 ] Do not offer to unify codepages in UNICODE build
2612 Also introduces new error IDS_DIFFERENT_UNICODINGS and new
2613 global function IsUnicodeBuild.
2615 Doing language synchronizations for this patch.
2617 Languages\Brazilian\MergeBrazilian.rc
2618 Languages\Bulgarian\MergeBulgarian.rc
2619 Languages\Catalan\MergeCatalan.rc
2620 Languages\ChineseSimplified\MergeChineseSimplified.rc
2621 Languages\ChineseTraditional\MergeChineseTraditional.rc
2622 Languages\Czech\MergeCzech.rc
2623 Languages\Danish\MergeDanish.rc
2624 Languages\Dutch\MergeDutch.rc
2625 Languages\German\MergeGerman.rc
2626 Languages\Hungarian\MergeHungarian.rc
2627 Languages\Italian\MergeItalian.rc
2628 Languages\Japanese\MergeJapanese.rc
2629 Languages\Korean\MergeKorean.rc
2630 Languages\Norwegian\MergeNorwegian.rc
2631 Languages\Polish\MergePolish.rc
2632 Languages\Russian\MergeRussian.rc
2633 Languages\Slovak\MergeSlovak.rc
2634 Languages\Spanish\MergeSpanish.rc
2635 Languages\Swedish\MergeSwedish.rc
2636 Languages\Turkish\MergeTurkish.rc
2637 PATCH: [ 1212368 ] Display correct paths in context patches
2639 Revising patched code, removing unneeded dispname added when patch applied
2640 Src: DiffWrapper.cpp
2641 diffutils\src: CONTEXT.C DIFF.H
2642 PATCH: [ 1393239 ] Split functions out of RunFileDiff
2643 Src: DiffWrapper.cpp DiffWrapper.h
2644 PATCH: [ 1392229 ] Fix Column item handling
2645 Src: DirView.h DirViewColHandler.cpp DirViewColItems.cpp
2649 PATCH: [ 1390774 ] Rename CRegOptions to CRegOptionsMgr
2650 Docs\Developers: Options.html
2651 Src\Common: OptionsMgr.cpp OptionsMgr.h
2652 Src: FileTransform.cpp MainFrm.cpp MainFrm.h SyntaxColors.cpp
2653 SyntaxColors.h codepage.h
2654 PATCH: [ 1392650 ] Fix locals of CDiffWrapper::RunFileDiff
2655 Src: DiffWrapper.cpp DiffWrapper.h MergeDoc.cpp PatchTool.cpp
2656 PATCH: [ 1392729 ] Cleanup variables in RunFileDiff
2657 Src: DiffWrapper.cpp
2658 BUG: [ 1369646 ] Confusing half-commented lines in DiffFileData::prepAndCompa
2659 Src: DiffWrapper.cpp
2660 BUG: [ 1392740 ] Clutter in debug output
2662 PATCH: [ 1391766 ] Sync language resources to English
2664 Languages\Brazilian\MergeBrazilian.rc
2665 Languages\Bulgarian\MergeBulgarian.rc
2666 Languages\Catalan\MergeCatalan.rc
2667 Languages\ChineseSimplified\MergeChineseSimplified.rc
2668 Languages\ChineseTraditional\MergeChineseTraditional.rc
2669 Languages\Czech\MergeCzech.rc
2670 Languages\Danish\MergeDanish.rc
2671 Languages\Dutch\MergeDutch.rc
2672 Languages\German\MergeGerman.rc
2673 Languages\Hungarian\MergeHungarian.rc
2674 Languages\Italian\MergeItalian.rc
2675 Languages\Japanese\MergeJapanese.rc
2676 Languages\Korean\MergeKorean.rc
2677 Languages\Norwegian\MergeNorwegian.rc
2678 Languages\Polish\MergePolish.rc
2679 Languages\Russian\MergeRussian.rc
2680 Languages\Slovak\MergeSlovak.rc
2681 Languages\Spanish\MergeSpanish.rc
2682 Languages\Swedish\MergeSwedish.rc
2683 Languages\Turkish\MergeTurkish.rc
2684 PATCH: [ 1212368 ] Display correct paths in context patches
2685 Src: DiffWrapper.cpp DiffWrapper.h
2686 diffutils\src: CONTEXT.C DIFF.H
2687 PATCH: [ 1390454 ] new commandline arguments (prediffer, ignorews...)
2688 Src: ConfigLog.cpp DirDoc.cpp DirDoc.h FileTransform.cpp
2689 MainFrm.cpp MainFrm.h Merge.cpp Merge.dsp Merge.h
2690 MergeEditView.cpp MergeEditView.h
2691 PluginManager.cpp PluginManager.h Plugins.cpp Plugins.h
2693 Src New files: MergeArgs.h MergeArgs.cpp
2694 Src/Common: CmdArgs.cpp CmdArgs.h OptionsMgr.cpp OptionsMgr.h
2697 PATCH: [ 1391732 ] Do not offer to unify codepages in UNICODE build
2698 Also introduces new error IDS_DIFFERENT_UNICODINGS and new
2699 global function IsUnicodeBuild.
2700 Src: ConfigLog.cpp MainFrm.cpp Merge.rc resource.h StdAfx.cpp StdAfx.h
2703 PATCH: [ 1390793 ] New global function GetOptionMgr
2704 Src: DirActions.cpp DirDoc.cpp DirView.cpp DirViewColHandler.cpp
2705 LocationView.cpp MainFrm.cpp MainFrm.h MergeDiffDetailView.cpp
2706 MergeDoc.cpp MergeEditView.cpp OpenDlg.cpp
2707 Src/Common: OptionsMgr.h
2710 PATCH: [ 1382130 ] New line-based RCLocalizationHelper
2714 PATCH: [ 1388704 ] Simplified Chinese language .rc file for RC1
2715 Src/Languages/ChineseSimplified: MergeChineseSimplified.rc
2716 Update language versions of resource.h
2717 Src/Languages/*: resource.h
2720 Update & synchronize translations: Danish Dutch French Hungarian Italian Japanese
2723 Danish: MergeDanish.rc
2724 Dutch: MergeDutch.rc
2725 French: MergeFrench.rc
2726 Hungarian: MergeHungarian.rc
2727 Italian: MergeItalian.rc
2728 Japanese: MergeJapanese.rc
2729 Remove needless cast
2730 Src/Common: unicoder.cpp
2731 Update & synchronize translations: Korean Norwegian Polish Russian
2734 Korean: MergeKorean.rc
2735 Norwegian: MergeNorwegian.rc
2736 Polish: MergePolish.rc
2737 Russian: MergeRussian.rc
2740 PATCH: [ 1388456 ] Convert rest of folder compare bitmaps to icons
2741 Icons from Tim (Thanks!)
2742 Src: CompareStatisticsDlg.cpp DirView.cpp Merge.dsp Merge.rc resource.h
2743 Src/res added files: binarydiff.ico equalbinary.ico equalfile.ico error.ico
2744 fileskip.ico folderup.ico folderup_disable.ico lfile.ico notequalfile.ico
2745 rfile.ico sigma.ico unknown.ico
2746 Src/res removed files: binary.bmp binarydiff.bmp error.bmp fileskip.bmp
2747 folderup.bmp folderup_disable.bmp lfile.bmp notequal.bmp rfile.bmp
2748 sigma.bmp unknown.bmp
2749 Src/Languages: *.rc resource.h
2751 2005-12-21 WinMerge experimental release 2.5.0.4 (cvs)
2754 BUG: [ 1385518 ] Batch file syntax highlighting weirdness
2756 Src/editlib: batch.cpp
2757 PATCH: [ 1387297 ] Swedish translation update for 2.5.0.3+
2758 Submitted by Hans Eriksson
2759 Src/Languages/Swedish: MergeSwedish.rc
2762 PATCH: [ 1386442 ] Local variable uses m_ prefix in CChildFrame
2766 PATCH: [ 1384646 ] Replace Question icons with warning icons in messageboxes
2767 Src: DirActions.cpp FileFiltersDlg.cpp MainFrm.cpp MergeDoc.cpp PatchDlg.cpp
2770 PATCH: [ 1383120 ] Fix background colors in WinMerge
2771 Src: SyntaxColors.cpp SyntaxColors.h
2772 Src/Common: OptionsMgr.cpp OptionsMgr.h
2773 PATCH: [ 1384181 ] Fix byte difference fencepost/infinite loop
2774 Src: CompareOptions.h ConfigLog.cpp DiffWrapper.cpp DiffWrapper.h
2775 Merge.dsp PatchDlg.cpp stringdiffs.cpp
2778 BUG: [ 1379277 ] typo fix for docs
2779 Docs/Developers: Plugins.html
2780 BUG: [ 1375661 ] Readme incomplete in WinMerge 2.5.0.3
2781 Docs/Users: ReadMe.txt
2782 PATCH: [ 1382966 ] Remove empty CMergeEditView::AddMod() and ResetMod()
2783 Src: MergeEditView.cpp MergeEditView.h
2786 PATCH: [ 1378771 ] Fix for BUG:[ 1376552 ] char offset not getting updated when...
2787 Src: ChildFrm.cpp MergeEditView.cpp
2790 PATCH: [ 1378795 ] The searched word is not highlighted correctly
2791 Src/editlib: ccrystaltextview.cpp
2794 PATCH: [ 1382955 ] Remove unused CompareStats.h include from DirFrame.cpp
2796 PATCH: [ 1376711 ] Change CFile::GetStatus to paths_DoesPathExist
2797 Src: files.cpp MainFrm.cpp MainFrm.h Merge.cpp MergeDoc.cpp OpenDlg.cpp
2799 Src/Common: coretools.cpp
2802 PATCH: [ 1381984 ] Folder compare progressdialog could be drawn off-screen
2803 Src: DirCompProgressDlg.cpp
2806 PATCH: [ 1380083 ] Fix EditBinaryFiles Plugin BuildTmp paths
2807 Plugins\src_VCPP\EditBinaryFiles: EditBinaryFiles.dsp
2810 PATCH: [ 1381975 ] Don't open Open-dialog outside screen
2811 Src: MainFrm.cpp OpenDlg.cpp
2812 Src removed file: multimon.h
2815 BUG: [ 1380019 ] Bulgarian translation has wrong language id
2816 Src/Languages/Bulgarian: MergeBulgarian.rc
2817 PATCH: [ 1382131 ] English rc file has numbers instead of symbols for language
2819 PATCH: [ 1379227 ] Fix ExpatLibs BuildTmp paths
2820 Src/ExpatLib: expat_static.dsp
2821 Src/ExpatMapLib: expat_maps_static.dsp
2822 PATCH: [ 1379228 ] Fix Merge7zInstaller BuildTmp paths
2823 Merge7zInstaller: Merge7zInstaller.dsp
2826 PATCH: [ 1381935 ] Simplify DirView icon loading
2830 BUG: [ 1382021 ] Merge7z432 missing?
2831 Merge7z new files: Merge7z431.dsp Merge7z432.dsp
2834 PATCH: [ 1188787 ] New Chinese translation rc file (from PATCH 1183476)
2835 Some more synchronizing from submitted patch
2836 Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
2837 PATCH: [ 1379226 ] Fix Display Plugins BuildTmp paths
2839 PATCH: [ 1188787 ] New Chinese translation rc file (from PATCH 1183476)
2840 Last updates from submitted patch
2841 Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
2842 BUG: [ 1381879 ] Unused variable in unicoder.cpp
2843 Src/common: unicoder.cpp
2846 Update & synchronize translations: ChineseTraditional Czech Danish Dutch
2848 ChineseTraditional: MergeChineseTraditional.rc
2849 Czech: MergeCzech.rc
2850 Danish: MergeDanish.rc
2851 Dutch: MergeDutch.rc
2852 Update & synchronize translations: French German Hungarian Italian Japanese
2854 French: MergeFrench.rc
2855 German: MergeGerman.rc
2856 Hungarian: MergeHungarian.rc
2857 Italian: MergeItalian.rc
2858 Japanese: MergeJapanese.rc
2861 PATCH: [ 1379894 ] Fix handling of unknown encoding
2863 Src/Common: unicoder.cpp
2864 Update & synchronize translations: Brazilian Bulgarian Catalan ChineseSimplified
2866 Brazilian: MergeBrazilian.rc
2867 Bulgarian: MergeBulgarian.rc
2868 Catalan: MergeCatalan.rc
2869 ChineseSimplified: MergeChineseSimplified.rc
2872 PATCH: [ 1378174 ] Share Src/res between translations
2874 Src/Languages/res: removed .bmp .cur and .ico files and WinMergeSplash.psd
2875 splash1.bmp and splash WinMergeSplash.psd not removed from Catalan
2878 PATCH: [ 1377545 ] Remove needless casts
2881 PATCH: [ 1372549 ] readme for Merge7z distributables
2885 PATCH: [ 1371994 ] Enable hi-color icons for folder compare
2886 Icons from Tim (Thanks!)
2887 Src: CompareStatisticsDlg.cpp DirView.cpp Merge.rc resource.h
2888 res new files: folder.ico folderskip.ico lfolder.ico rfolder.ico
2889 res deleted files: folder.bmp folderskip.bmp lfolder.bmp rfolder.bmp
2890 Src/Languages: *.rc resource.h
2891 Src/Languages/res: new and deleted files like in res above
2894 PATCH: [ 1371384 ] Move Expat maps into WinMerge src
2895 Plugins\src_VCPP\DisplayXMLFiles: DisplayXMLFiles.dsp
2896 Src\ExpatMapLib added
2897 Many files moved from DisplayXMLFiles to new ExpatMapLib
2898 PATCH: [ 1373020 ] Carry unicoding, codepage, & file path together
2899 & PATCH: [ 1377545 ] Remove needless casts
2900 Src: DiffWrapper.cpp DiffWrapper.h DirScan.cpp DirView.cpp
2901 MainFrm.cpp MainFrm.h Merge.dsp MergeDoc.cpp MergeDoc.h
2902 Src\Common: RegKey.cpp
2903 NEW Src\FileLocation.h
2906 PATCH: [ 1188787 ] New Chinese translation rc file (from PATCH 1183476)
2907 Remainder of dialogs
2908 Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
2909 BUG: [ 1376825 ] infinite loop bug in byte diffs
2910 Src: stringdiffs.cpp
2911 PATCH: [ 1188787 ] New Chinese translation rc file (from PATCH 1183476)
2912 A few string resources
2913 Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
2914 PATCH: [ 1249007 ] Short size column
2915 Src: DirViewColItems.cpp locality.cpp locality.h Merge.rc resource.h
2916 PATCH: [ 1377362 ] Fix coretools to MakeResDll compiles
2917 BUG: [ 1377361 ] MakeResDll broken b/c coretools broken
2918 Src/Common: coretools.cpp
2921 PATCH: [1374728 ] Fix filter dialog delete
2922 Src: FileFilterMgr.cpp
2925 PATCH: [ 1374782 ] fix for bug 1300957 Crash on save 'unique' file comparison
2926 Submitted by Oliver Mellet, some additional comment improvements by me.
2928 Takashi is now developer, Olivier Mellet submitted a patch
2929 Docs/Users: Contributors.txt
2932 PATCH: [ 1376457 ] Need clarification in platform test in ShellExtension
2933 ShellExtension: ShellExtension.cpp
2936 fix two-line-end-markers bug that was reported in:
2937 "PATCH: [ 1372716 ] patch for RFE:[ 922992 ] Word Wrap/split long lines"
2938 Src: stringdiffs.cpp
2941 PATCH: [ 1372716 ] patch for RFE:[ 922992 ] Word Wrap/split long lines
2942 Src: Merge.rc MergeDoc.cpp MergeEditView.cpp MergeEditView.h OptionsDef.h
2943 OptionsInit.cpp resource.h
2944 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h ccrystaltextview2.cpp
2945 crystalparser.cpp editcmd.h
2946 Src/Languages: *.rc resource.h
2949 PATCH [ 1374931 ] Bugfixes & upload binary for RCLocalizationHelper
2950 (RCLocalizationHelper plugin)
2953 PATCH [ 1372575 ] Fix link for DisplayXmlFiles plugin
2954 (DisplayXMLFiles plugin)
2955 TODO [ 1341058 ] ToDoDeleteThisValidateColumnOrdering()
2956 Src: DirView.cpp DirView.h DirViewColHandler.cpp
2958 2005-12-06 WinMerge experimental release 2.5.0.3 (cvs)
2961 PATCH: [ 1372589 ] Document tildas in config
2964 PATCH: [ 1373037 ] Fix filter dialog to correctly add new filters
2966 Src: FileFiltersDlg.cpp
2967 PATCH: [ 1370183 ] ShellExtension: better way to check for WinMerge executable
2968 ShellExtension: WinMergeShell.cpp
2969 Bump ShellExtension version to 1.7.0
2970 ShellExtension: ShellExtension.rc
2973 PATCH: [ 1372974 ] Make local function "GuessEncoding_from_bytes" static
2974 Src: codepage_detect.cpp
2975 PATCH: [ 1368762 ] Fix assignment in DirScan_GetItems
2976 Also add explanatory comment, for what variable does.
2980 CMarkdown::FileImage::GuessByteOrder(), GuessCodepageEncoding(): Fix UTF-8 signature detection
2981 CMarkdown::GetTagName(): Strip bogus trailing slash in name of empty tag
2982 Src: markdown.cpp codepage_detect.cpp
2985 PATCH: [ 1335128 ] Ignore uninstalled codepages
2986 Src: MergeDoc.cpp MergeDoc.h codepage.cpp codepage_detect.cpp
2987 Src/Common: unicoder.cpp
2990 PATCH: [ 1358408 ] Import and export for options
2991 Increase buffer size
2992 Src/Common: OptionsMgr.cpp
2995 PATCH: [ 1369660 ] Delete unused variables m_msgUpdateStatus
2997 Src: DirDoc.cpp DiffContext.cpp DiffContext.h DiffThread.cpp
3001 PATCH: [ 1369657 ] Delete unused variable DiffFuncStruct::msgStatusUpdate
3003 BUG: [ 1369856 ] Crashed when interface language is changed
3005 BUG: [ 1368755 ] Want comment on format line in 7ZCommon.cpp
3006 Cosmetic: adding explanatory comment to Merge7z::Proxy::operator->
3010 PATCH: [ 1369544 ] Catalan translation update
3011 Submitted by Jordi Vilar
3012 Docs/Users/Languages: ReadMe-Catalan.txt
3013 Src/Languages/Catalan: MergeCatalan.rc
3014 PATCH: [ 1265295 ] Swap file compare panes (use pointers for buffers)
3015 Forgot to update resource.h in language folders
3016 Src/Languages: resource.h
3019 Cosmetic: add comment to DiffThread giving value of msgID variable
3020 (to help debugging).
3024 BUG: [ 1368492 ] cvs ASSERT failing
3025 Fix reversion bug from Patch [ 1265295 ]
3028 PATCH: [ 1265295 ] Swap file compare panes (use pointers for buffers)
3029 Submitted by Takashi Sawanaka
3030 Src: ChildFrm.cpp DiffList.cpp DiffList.h DirDoc.cpp EditorFilepathBar.cpp
3031 EditorFilepathBar.h LocationView.cpp LocationView.h MainFrm.cpp Merge.rc
3032 MergeDiffDetailView.cpp MergeDiffDetailView.h MergeDoc.cpp MergeDoc.h
3033 MergeDocLineDiffs.cpp MergeEditView.cpp MergeEditView.h PathContext.cpp
3034 PathContext.h resource.h
3035 Src/Languages: *.rc resource.h
3038 PATCH: [ 1336598 ] Add extensions DisplayXMLFiles plugin
3039 Add several new extensions, bump version (1.0.2.0 -> 1.0.3.0)
3040 Plugins\src_VCPP\DisplayXMLFiles:
3041 DisplayXMLFiles.dsp DisplayXMLFiles.rc WinMergeScript.cpp
3046 PATCH: [ 1241935 ] Implement Line Diff coloring on byte diffs
3047 Src: MergeDoc.cpp MergeDoc.h MergeDocLineDiffs.cpp PropEditor.cpp
3049 2005-11-23 WinMerge experimental release 2.5.0.2 (cvs)
3052 PATCH: [ 1363114 ] Add '*.ctl;*.pag;*.dsr' to Visual Basic highlighter
3053 Src/editlib: ccrystaltextview.cpp
3056 PATCH: [ 1362882 ] Remove option for autoclosing compare statepane
3057 Src: Merge.rc OptionsDef.h OptionsInit.cpp PropGeneral.cpp PropGeneral.h resource.h
3058 Src/Languages: *.rc resource.h
3059 BUG: [ 1355884 ] 2.4.2 fails to open dvd files
3060 File/folder selection dialog couldn't open read-only folders
3064 PATCH: [ 1334277 ] Show asterisk in #diffs for QuickCompare results
3065 Src: DiffWrapper.cpp DiffWrapper.h DirViewColItems.cpp
3066 PATCH: [ 1334589 ] Encoding maps for Expat parser, for DisplayXmlFiles plugin
3067 Plugins/src_VCPP/DisplayXMLFiles
3068 BUG: [ 1277320 ] Plugins.txt not up-to-date
3069 Plugins/dll/IgnoreCommentsC
3072 Merge7z DllBuild 0017
3073 Merge7z: StdAfx.h Merge7zCommon.cpp Merge7zCommon.h revision.txt
3074 Merge7z new files: Merge7z430.dsp
3075 Merge7zInstaller: Files.rc2 Installer.cpp Merge7zInstaller.dsp
3078 PATCH: [ 1358408 ] Import and export for options
3079 Src: Merge.rc resource.h
3080 Src/Common: OptionsMgr.cpp OptionsMgr.h PreferencesDlg.cpp PreferencesDlg.h
3081 Src/Languages: *.rc resource.h
3084 PATCH: [ 1349645 ] Folder Compare Statistics dialog
3085 PATCH: [ 1347787 ] Use non-modal dialog for dir compare status
3086 Src: DirDoc.cpp DirDoc.h DirFrame.cpp DirFrame.h DirView.cpp DirView.h Merge.cpp Merge.dsp
3088 Src new files: CompareStatisticsDlg.cpp CompareStatisticsDlg.h DirCompProgressDlg.cpp
3089 DirCompProgressDlg.h
3090 Src deleted files: DirCompStateBar.cpp DirCompStateBar.h
3091 Src/res new file: sigma.bmp
3092 Src/Languages: *.rc resource.h
3095 PATCH: [ 1356783 ] Use OptionsMgr in SyntaxColors class
3096 Src: MainFrm.cpp SyntaxColors.cpp SyntaxColors.h
3099 PATCH: [ 1350638 ] Move options read/write code to options panels
3100 Src: MainFrm.cpp Merge.dsp PropArchive.cpp PropArchive.h PropCodepage.cpp PropCodepage.h
3101 PropColors.cpp PropColors.h PropCompare.cpp PropCompare.h PropEditor.cpp PropEditor.h
3102 PropGeneral.cpp PropGeneral.h PropRegistry.cpp PropRegistry.h PropVss.cpp PropVss.h
3103 Src new file: IOptionsPanel.h
3104 Src/Common: PreferencesDlg.cpp PreferencesDlg.h
3107 Merge Perry's fix for OpenDlg/SelectFile() to Merge.cpp/SelectFile() (PATCH #1348733)
3109 PATCH: [ 1350489 ] Use SelectFile() for external editor selection
3110 Src: PropRegistry.cpp
3113 PATCH: [ 1327413 ] Fix bug in CDirDoc::AllowUpwardDirectory()
3114 Change CDirView::AreItemsOpenable() to consider archive files as openable
3115 Src: DirActions.cpp DirDoc.cpp DirView.cpp
3118 PATCH: [ 1337905 ] Allow comparing binary files with binary unpacker
3120 PATCH: [ 1348733 ] Fix open dialog for cvs version 2.4
3124 PATCH: [ 1335072 ] Add text to Plugins.txt to cover DisplayXMLFiles
3125 Plugins/dlls: Plugins.txt
3127 2005-11-02 WinMerge experimental release 2.5.0.1 (cvs)
3130 BUG: [ 1341243 ] Current Find string is too fragile
3131 Was resetting find string after rescanning
3132 Src/editlib: ccrystaltextview.cpp
3133 PATCH: [ 1342550 ] Modernize file selection dialog
3134 PATCH: [ 1345110 ] Properly compare projectfile extension
3135 Src: Merge.cpp Merge.h OpenDlg.cpp
3136 Bump ShellExtension version to 1.6.2
3137 ShellExtension: ShellExtension.rc
3140 PATCH: [ 1345382 ] Translated Shell Extension to German
3141 ShellExtension/Languages: ShellExtensionGerman.rc
3144 RFE: [ 1324314 ] CTRL+W to close current diff
3147 PATCH: [ 1342871 ] Disable Copy Filenames for folders
3148 Src: DirView.cpp DirView.h
3149 PATCH: [ 1343059 ] Swedish translation update for 2.5.0.1 experimental
3150 Submitted by Hans Eriksson
3151 Src/Languages/Swedish: MergeSwedish.rc
3154 PATCH: [ 1341813 ] VSS project linking misdetects project files
3156 PATCH: [ 1310710 ] Fix bug #1309450
3158 Src: DiffContext.cpp DiffContext.h DiffFileInfo.cpp DiffFileInfo.h DirScan.cpp
3161 PATCH: [ 1341183 ] Fix VSS checkout canceling
3162 Src: DirActions.cpp MainFrm.cpp
3163 Open 2.4 manual (update link)
3167 PATCH: [ 1334444 ] Remove needless (& therefore confusing) cast
3168 Src: LocationView.cpp
3171 PATCH: [ 1334484 ] Skip location view paint if buffer not initialized
3172 Src: LocationView.cpp MergeDoc.cpp MergeDoc.h
3173 MergeEditView.cpp MergeEditView.h
3174 Cosmetic changes to GetFunctionsFromScript, to document
3175 arguments passed to GetTypeInfo.
3179 PATCH: [ 1333545 ] Small improvement to Open-dialog folder selection
3181 PATCH: [ 1333581 ] Increase quick compare limit and make it option
3182 Src: DiffContext.h DiffWrapper.cpp DirDoc.cpp OptionsDef.h OptionsInit.cpp
3185 PATCH: [ 1330179 ] Icon for 'Print'
3186 Src: MainFrm.cpp Merge.rc resource.h
3187 Src/res new file: print.bmp
3188 Src/Languages: *.rc resource.h
3189 Src/Languages/res new file: print.bmp
3192 PATCH: [ 1332365 ] Make some DirActions.cpp functions consts
3193 Src: DirActions.cpp DirView.h
3196 PATCH: [ 1329951 ] Readme.txt points to version 2.2 manual
3197 Docs/Users: ReadMe.txt
3198 Docs/Users/Languages: ReadMe-Catalan.txt ReadMe-Swedish.txt
3199 BUG: [ 1326621 ] Extention ".WinMerge" is omitted
3203 PATCH: [ 1330059 ] Translated 3 missing sentences to German
3204 Src/Languages/German: MergeGerman.rc
3207 PATCH: [ 1326813 ] Fix binary detection to allow archives
3211 PATCH: [ 1305541 ] Rational ClearCase support
3212 Submitted by Greg (rys1908)
3213 Src: CCPrompt.cpp CCprompt.h DirActions.cpp MainFrm.cpp MainFrm.h Merge.rc resource.h
3214 Src/Common: coretools.cpp
3215 Src/Languages: *.rc resource.h
3218 PATCH: [ 1323107 ] Patch for crash on save filenames with different cases
3219 From anonymous submitter
3221 PATCH: [ 1286629 ] print support
3222 Submitted by Markus Rollmann
3223 Src: MainFrm.cpp Merge.rc MergeEditView.cpp MergeEditView.h
3224 Src/Common: SplitterWndEx.cpp SplitterWndEx.h
3225 Src/editlib: ccrystaleditview.cpp
3227 Add Markus Rollmann to Contributors.txt
3228 Docs/Users/Contributors.txt
3231 PATCH: [ 1242008 ] Update status to binary if open fails because binary
3232 Follow on for 2nd case
3233 Src: DirView.cpp MergeDoc.cpp
3236 PATCH: [ 1302710 ] generating a report is slow
3237 Perry added comments explaining one code line
3238 Src: DirCmpReport.cpp
3241 PATCH: [ 1302710 ] generating a report is slow
3242 Submitted by Takashi Sawanaka
3243 Src: DirCmpReport.cpp
3244 PATCH: [ 1310214 ] Shell extension italian translation
3245 Submitted by Andrea Decorte
3246 ShellExtension/Languages: ShellExtensionItalian.rc
3249 PATCH: [ 1253949 ] cosmetic comment fix
3251 PATCH: [ 1253950 ] cosmetic--remove old code in InitInstance
3253 PATCH: [ 1253951 ] trivial cosmetic comment upgrade in arg parsing
3257 Merge7z DllBuild 0015
3258 Merge7z: Merge7zCommon.cpp Merge7zCommon.h revision.txt
3259 Merge7z new files: Merge7z427.dsp Merge7z428.dsp Merge7z429.dsp
3260 Merge7zInstaller update
3261 Merge7zInstaller: Files.rc2 Installer.cpp Installer.rc
3264 PATCH: [ 1309423 ] Small typo in MergeSwedish.rc
3265 Submitted by Hans Eriksson
3266 Src/Languages/Swedish: MergeSwedish.rc
3269 PATCH: [ 1229867 ] RFE [ 1205516 ], RFE [ 887948 ], and other issues
3270 Cosmetic, transcribing comment from patch discussion
3274 PATCH: [ 1302608 ] crash on generating a report
3275 Submitted by Takashi Sawanaka
3276 Src: DirCmpReport.cpp
3279 BUG: [ 1298687 ] The files marked as 'skipped' are compared
3280 Fix from Takashi Sawanaka, comment updates by me
3284 PATCH: [ 1301504 ] Danish ShellExtension translation
3285 Submitted by Christial List
3286 ShellExtension/Languages: ShellExtensionDanish.rc
3289 PATCH: [ 1297642 ] Japanese translation update
3290 Submitted by Takashi Sawanaka
3291 ShellExtension/Languages: ShellExtensionJapanese.rc
3292 Src/Languages/Japanese: MergeJapanese.rc
3295 PATCH: [ 1297406 ] updated hungarian translation
3296 Submitted by Márton Balázs
3297 Src/Languages/Hungarian: MergeHungarian.rc
3300 PATCH: [ 1295701 ] Scrolling for dir compare report filename
3303 PATCH: [ 1295758 ] Update URL for downloads page (archive options)
3304 Src: PropArchive.cpp
3307 PATCH: [ 1295767 ] German Translation for 'Highlight Line * Diff'
3308 Src/Languages/German: MergeGerman.rc
3311 PATCH: [ 1294514 ] Set file loading traces debug-only
3313 PATCH: [ 1295473 ] updated italian rc file for winmerge 2.3.6
3314 Submitted by Andrea Decorte
3315 Src/Languages/Italian: MergeItalian.rc
3318 PATCH: [ 1292120 ] More significant diff navigations fixes
3319 Src: DiffList.cpp DiffList.h MergeDoc.cpp MergeEditView.cpp
3320 BUG: [ 1290305 ] ShellExtensionU.dll info missing from config log
3324 PATCH: [ 1292279 ] Various Updates in German Translation
3325 Src/Languages/German: MergeGerman.rc
3328 PATCH: [ 1290477 ] Catalan translation update
3329 Submitted by Jordi Vilar
3330 Src/Languages/Catalan: MergeCatalan.rc
3333 PATCH: [ 1289037 ] Some (non)significant diff count fixes
3334 Src: DiffList.cpp DiffList.h MergeDoc.cpp MergeEditView.cpp
3337 PATCH: [ 1284150 ] Fix Shell Extension registering problem
3338 Also bump version to 1.6
3339 ShellExtension: ShellExtension.cpp ShellExtension.rc
3342 BUG: [ 1284304 ] StaticLink crashes after mouse over event
3343 Changed signature of CStaticLink::OnSetCursor to start with CWnd *
3344 Src\Common: StaticLink.cpp StaticLink.h
3347 PATCH: [ 1285404 ] Various Updates in German Translation
3348 Src/Languages/German: MergeGerman.rc
3351 PATCH: [ 1284890 ] Use Changes.txt instead of readme.txt for ChangeLog
3352 Added ChangeLogs folder to project, and put Changes.txt (this),
3353 readme.txt, and CHANGELO into new ChangeLogs folder.
3354 PATCH: [ 1283466 ] French translation
3355 New translation by Jean-F Jolin
3356 Src/Languages/French: MergeFrench.rc
3359 Previous change history is in file readme.txt