3 (This summarizes all changes to all files under Src, including Src\Languages.)
6 BUG: [ 1599631 ] WinMerge 2.7.1.1 ignores left dir in project file
10 PATCH: [ 1590831 ] Handle minimize argument (Bug 1570351)
11 Src: MergeDiffDetailView.cpp
12 Src/Common: SplitterWndEx.cpp
15 PATCH: [ 1598194 ] New command line parser
16 Src: MainFrm.cpp Merge.cpp Merge.dsp Merge.h
17 Src added files: ClearCaseCmdLineParser.cpp ClearCaseCmdLineParser.h
18 CmdLineParser.h MergeCmdLineInfo.cpp MergeCmdLineInfo.h
19 WinMergeCmdLineParser.cpp WinMergeCmdLineParser.h
20 Src removed files: CmdArgs.cpp CmdArgs.h MergeArgs.cpp
23 PATCH: Moved white-space trimming to FileFilterHelper class
24 Src: FileFilterHelper.cpp
26 2006-11-16 WinMerge experimental release 2.7.1.1 (SVN revision 3810)
29 PATCH: [ 1596692 ] Change the way modified docs are saved to fix several issues
30 Src: MainFrm.cpp MergeDiffDetailView.cpp MergeDoc.cpp MergeDoc.h
33 BUG: [ 1596285 ] Unresolved external symbol __abs64 with VC7.1
34 Src: StdAfx.cpp StdAfx.h
37 BUG: [ 1594188 ] /x option does not work
41 PATCH: [ 1586689 ] True color bookmark icon
42 Src/editlib: ccrystaltextview.cpp
46 PATCH: [ 1590737 ] BCMenu update to v3.036
47 Src: BCMenu.cpp BCMenu.h
50 PATCH: [ 1591532 ] Remove unused XmlDoc class
52 Src removed files: XmlDoc.cpp XmlDoc.h
55 Add PCRE 6.7 (with windows build files from ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Contrib/)
56 New folder: /Externals/pcre
57 PATCH: [ 1591605 ] Add PCRE regexps and convert file filtering to PCRE
58 Src: FileFilterMgr.cpp FileFilterMgr.h Merge.dsp Plugins.cpp
59 Src new files: Ucs2Utf8.cpp Ucs2Utf8.h
62 PATCH: [ 1586705 ] DirView icons (Tim made [not]equalfile.ico)
63 Src/res: equalfile.ico fileskip.ico lfile.ico notequalfile.ico rfile.ico
66 PATCH: [ 1590892 ] Handle unicode paths for project files
70 PATCH: [ 1589427 ] Add back read-only handling for project files
72 PATCH: [ 1589438 ] Add read-only info to ProjectFile dialog
74 PATCH: [ 1589563 ] Fix crash with weird filetimes (and cleanup the code)
75 Src: DiffFileInfo.cpp DiffFileInfo.h DirScan.cpp DirViewColHandler.cpp
76 DirViewColItems.cpp FileInfo.cpp FileInfo.h
79 PATCH: [ 1589601 ] Add "ReDim" keyword to Visual Basic highlighter
80 Src\editlib: basic.cpp
83 Add Expat version 2.0.0 to /Externals/expat (revision: 3749)
84 New folder: /Externals/Expat
85 Add SCEW version 0.4.0 to /Externals/scew (revision: 3750)
86 New folder: /Externals/scew
87 PATCH: [ 1587574 ] Convert project files code to use expat+SCEW
88 Src: Merge.dsp ProjectFile.cpp ProjectFile.h
89 Remove folder: Src/ExpatLib/*
90 PATCH: [ 1588212 ] Add manifest file to resource file
92 Src/Languages/*: Merge*.rc
93 Move files from Installer/InnoSetup: WinMerge.exe.manifest WinMergeU.exe.manifest
97 PATCH: [ 1586869 ] Fix File Select -dialog modality (commit the file I missed in previous commit)
98 Src/Common: PreferencesDlg.cpp
101 PATCH: [ 1586869 ] Fix File Select -dialog modality
102 Src: DirCmpReportDlg.cpp FileFiltersDlg.cpp MainFrm.cpp Merge.cpp Merge.h
103 MergeDoc.cpp PatchDlg.cpp ProjectFilePathsDlg.cpp PropRegistry.cpp PropVss.cpp
104 PATCH: [ 1586892 ] Remove unused unknown.ico and code loading it
105 Src: DirView.cpp Merge.rc resource.h
106 Src/Languages/*: Merge*.rc
107 Remove file: Src/Res: unknown.ico
110 BUG: [ 1418805 ] Menu colors incorrect with non-standard color scheme
114 PATCH: [ 1584004 ] Delete "Toolbar.bmp"
115 Src/res deleted file: Toolbar.bmp
118 Fix compile warnings (some of them 64-bit), remove unused variables and code, fix types
120 Remove unused function, fix inproper pointer usage
121 Src: FileFilterHelper.cpp
122 Fix casting a pointer type to DWORD (not 64-bit compatible)
123 Src: DirView.cpp DirView.h
126 PATCH: [ 1578419 ] Fix creating WinMerge folder to MyFolders always
127 Src: MainFrm.cpp MainFrm.h
128 Trivial type fixes, coding style fixes and converting comments to doxygen
129 Src: StdAfx.cpp StdAfx.h
130 Fix misuse of reference parameters (compiler warning)
134 PATCH: [ 1574696 ] Fix problem in saving filefilter to project file
135 Src: ProjectFilePathsDlg.cpp
138 BUG: [ 1573240 ] Crash in subversion trunk
139 Src: MainFrm.cpp MainFrm.h OptionsInit.cpp
142 BUG: [ 1570259 ] Bookmarks GUI get reset after save
143 Src/editlib: ccrystaltextview.cpp
146 BUG: [ 1570173 ] Crash when merging all differences
150 PATCH: [ 1555344 ] Separate active/inactive developers in Contributors.txt
151 Docs/Users: Contributors.txt
154 PATCH: [ 1572359 ] Various Updates in German Translation for WinMerge 2.6
155 Src/Languages/German: MergeGerman.rc
158 PATCH: [ 1570241 ] Various Updates in German Translation for WinMerge 2.6
159 Src/Languages/German: MergeGerman.rc
162 BUG: [ 1566783 ] Crash on Save Project when no file is selected
166 PATCH: [ 1567874 ] Change manual URL to point to 2.6 manual
170 BUG: [ 1564572 ] Leak memory on undoing
171 Src: GhostTextBuffer.h
172 Src/editlib: ccrystaltextbuffer.h
175 PATCH: [ 1565917 ] Register.bat to register ShellExt for 64-bit Windows
176 ShellExtension: Register.bat
177 BUG: [ 1563187 ] Can't close a file compare with -e switch
181 PATCH: [ 1565359 ] Various Updates in German Translation for WinMerge 2.6
182 Src/Languages/German: MergeGerman.rc
185 PATCH: [ 1564857 ] FindAnyFile function doesn't compile with VC6
186 Src/Common: coretools.cpp
189 PATCH: [ 1563171 ] Catalan translation update (Open-dialog)
190 Submitted by Jordi Vilar
191 Src/Languages/Catalan: MergeCatalan.rc
194 BUG: [ 1564283 ] Parameter -x causes files to be closed after merging
198 PATCH: [ 1564280 ] Stack corruption in LanguageSelect
199 Src/Common: LanguageSelect.cpp
202 Couple of type fixes to CMoveConstraint
203 Src/Common: CMoveConstraint.cpp CMoveConstraint.h
204 Fix check for pointer/value by using bit-shift instead of a cast + add trivial typecasts
205 Src: GhostTextBuffer.cpp
206 Src/editlib: ccrystaltextbuffer.cpp
209 PATCH: [ 1563157 ] Fix coretools.cpp for 64-bit
210 Src/Common: coretools.cpp coretools.h
211 Fix type in ccrystaltextbuffer.h
212 Src/editlib: ccrystaltextbuffer.h
213 PATCH: [ 1563171 ] Catalan translation update
214 Submitted by Jordi Vilar
215 Src/Languages/Catalan: MergeCatalan.rc
216 PATCH: [ 1563386 ] Spanish translation update
217 Submitted by Jesus M. Delgado 'Mack'
218 Src/Languages/Spanish: MergeSpanish.rc
219 Quiet warnings from DiffList.cpp
221 Some SPECIAL_ITEM_POS cleanups
222 Src: DirActions.cpp DirDoc.cpp DirView.cpp DirView.h
223 Fix check for pointer/value by using bit-shift instead of a cast
224 Src: GhostTextBuffer.h
225 Src/editlib: ccrystaltextbuffer.h
227 2006-09-21 WinMerge experimental release 2.5.7.1 (SVN revision 3600)
230 PATCH: [ 1558213 ] Tweak text positions in splash screen
232 Bump ShellExtension version to 1.9.0 (first 64-bit Windows version)
233 ShellExtension: ShellExtension.rc
234 Fix 64-bit typecast warning
235 Src: GhostTextBuffer.h
236 Fix 64-bit pointer truncation in SetWindowLongPtr call (the last I hope)
238 Minor tweaks to 64-bit ShellExtension project file
239 ShellExtension: ShellExtensionX64.vcproj
242 PATCH: [ 1561788 ] Fix 64-bit CFile constructor usage
243 Src/Common: UniFile.cpp
244 PATCH: [ 1561796 ] Get/SetWindowLong not supported in 64-bit Windows
245 Src: 7zCommon.cpp ChildFrm.cpp
246 Src/Common: CSubclass.cpp sizecbar.cpp
247 BUG: [ 1561781 ] 64-bit compile errors from 7zCommon.cpp
249 PATCH: [ 1561650 ] Separate FilterCommentsManager code from DiffWrapper
250 Src: DiffWrapper.cpp DiffWrapper.h Merge.dsp
251 Src new files: FilterCommentsManager.cpp FilterCommentsManager.h
252 Fix 64-bit compile warning by casting last SendMessage() param to LPARAM
254 Fix hex number used instead of INVALID_HANDLE_VALUE
255 Src/Common: sinstance.cpp
256 Fix 64-bit pointer truncation in SetWindowLongPtr call
260 PATCH: [ 1561001 ] Fix FileActionScript type in running actions
261 Src: FileActionScript.cpp
262 PATCH: [ 1561008 ] Warning fix for FileActionScript
264 PATCH: [ 1561080 ] Cleanup for loglevel definition
265 Src: DirDoc.cpp DirScan.cpp MainFrm.cpp Plugins.cpp StdAfx.cpp
266 Src/Common: LogFile.cpp LogFile.h
269 Cleanup 64-bit ShellExtension projectfile, add a debug target
270 ShellExtension: ShellExtensionX64.vcproj
273 PATCH: [ 1559619 ] 64-bit shellextension project file
274 ShellExtension new files: ShellExtensionX64.def ShellExtensionX64.vcproj
275 Remove unused variable
276 Src/editlib: memcombo.cpp
277 Remove unused variable
279 Fix typecasting warnings
280 Src: locality.cpp locality.h MergeDoc.cpp
281 Remove unused variable
282 Src: FileActionScript.cpp
283 Remove unused variable
284 Src: FileFiltersDlg.cpp
287 BUG: [ 1558839 ] ShellExtension does not compile as 64-bit
288 ShellExtension: WinMergeShell.cpp WinMergeShell.h
289 PATCH: [ 1558893 ] Fix incompatible prototype in MessageBoxDialog
290 Src/Common: MessageBoxDialog.cpp MessageBoxDialog.h
291 PATCH: [ 1558913 ] Fix OnTimer prototypes (64-bit compatibility)
292 Src: ChildFrm.cpp ChildFrm.h DircompProgressDlg.cpp DirCompProgressDlg.h DirView.cpp
293 Dirview.h MainFrm.cpp MainFrm.h MergeEditview.cpp MergeEditView.h OpenDlg.cpp
294 Opendlg.h Splash.cpp Splash.h
295 Src/Common: MessageBoxDialog.cpp MessageBoxDialog.h
296 Src/editlib: ccrystaltextview2.cpp ccrystaltextview.h
299 BUG: [ 1547247 ] WinMerge ANSI target does not compile with VS2005
301 Src: Common/SuperComboBox.cpp
302 PATCH: [ 1558152 ] Italian translation updated
303 Submitted by Andrea Decorte
304 Src/Languages/Italian: MergeItalian.rc
307 PATCH: [ 1555764 ] prevent from shaking in view when pressing F5 down
308 Src: GhostTextView.cpp MergeDiffDetailView.cpp
311 PATCH: [ 1556851 ] An Swedish translation update
312 Submitted by Hans Eriksson
313 Src/Languages/Swedish: MergeSwedish.rc
315 2006-09-11 WinMerge beta release 2.5.6 (revision 3552)
318 Japanese translation - update
319 Src/Languages/Japanese: MergeJapanese.rc
322 PATCH: [ 1555764 ] prevent from shaking in view when pressing F5 down
323 Src: GhostTextView.cpp GhostTextView.h MergeDiffDetailView.cpp MergeDiffDetailView.h
326 BUG: [ 1555664 ] fail to copy all to right when enabling moved block detect
330 Czech translation update from Jan Hryz
331 Src/Languages/Czech/MergeCzech.rc
332 PATCH: [ 1553714 ] Add new commandine switches to help dialog
333 Src: Merge.rc MergeArgs.cpp resource.h
334 Src/Languages/*: Merge*.rc
335 PATCH: [ 1552228 ] Don't use 'export' as variable name
339 RFE: [ 1533506 ] Need commandline switch for single-instance
343 PATCH: [ 1552901 ] Update VC loose filefilter
344 Filters: Merge_VC_loose.flt
345 PATCH: [ 1552917 ] Fix GUI for autocompletion option
347 Src/Languages/*: Merge*.rc
350 PATCH: [ 1552095 ] Fix last compare method not visible in GUI list
352 Src/Languages/*: Merge*.rc
355 PATCH: [ 1551332 ] defer loading plugin
356 Src: MainFrm.cpp Merge.rc MergeDoc.cpp MergeEditView.cpp MergeEditView.h
357 Src/Languages/*: Merge*.rc
360 BUG: [ 1550427 ] WinMerge 2.5.5.7 don't save "Include subfoders by default"
361 Src: PropRegistry.cpp
364 Japanese translation - update
365 Src/Languages/Japanese: MergeJapanese.rc
368 PATCH: [ 1544777 ] Compare by size
369 Forgot to commit Options-dialog changes last time so option for this wasn't visible
371 BUG: [ 1547262 ] Suspicious bit shift warning
373 Src/Common: UniFile.cpp
376 PATCH: [ 1547190 ] Fix VS2005 compile
380 BUG: [ 1546938 ] New toolbar icons only works for 'disabled' icons
381 Src/Languages/*/Merge*.rc
384 Fix compiling WinMerge after moving folders around (Merge7z moved under ArchiveSupport)
387 ***** Switch to Subversion *****
389 2006-08-24 WinMerge experimental release 2.5.5.7 (cvs)
392 PATCH: [ 1545411 ] Add some missing options to configlog
393 Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
394 PATCH: [ 1545165 ] WinMarge Bulgarian Translation
395 Submitted by tigertron
396 Src/Languages/Bulgarian: MergeBulgarian.rc
397 Docs/Users/Languages: Readme-Bulgarian.txt
398 Docs/Users/Contributors.txt
399 InnoSetup: WinMerge.iss
400 ShellExtension: ShellExtension.rc
401 ShellExtension/Languages: ShellExtensionBulgarian.rc
402 PATCH: [ 1545890 ] Swedish translation for update for WinMerge 2.5.5.7+
403 Submitted by Hans Eriksson
404 Src/Languages/Swedish: MergeSwedish.rc
405 BUG: [ 1545082 ] Crash when comparing .rc files
406 Fix submitted by Takashi
407 Src/editlib: ccrystaltextview.cpp
410 PATCH: [ 1544905 ] Use stat() to check if file is read-only
411 Src: files.cpp files.h
412 PATCH: [ 1544777 ] Compare by size
413 Src: DiffWrapper.h DirScan.cpp Merge.rc resource.h
414 Src/Languages/*: Merge*.rc
417 PATCH: [ 1541427 ] Using as an external diff tool (RFE 1454623)
418 Src: MainFrm.cpp MainFrm.h MergeArgs.cpp MergeDoc.cpp
421 PATCH: [ 1544784 ] Use as ClearCase external merge tool
425 BUG: [ 1543783 ] Misbehave margin draw
426 Src/editlib: ccrystaltextview.cpp
429 PATCH: [ 1544147 ] Add Install-feature for file filters
430 Src: FileFiltersDlg.cpp FileFiltersDlg.h Merge.rc resource.h
431 Src/Languages/*: Merge*.rc
432 BUG: [ 1534429 ] Message IDS_SUGGEST_IGNOREEOL incorrect
436 PATCH: [ 1424673 ] Widen labels on OpenDialog
439 Src/Languages/*: Merge*.rc
442 PATCH: [ 1542201 ] Change default user filter folder to WinMerge/Filters
444 PATCH: [ 1542829 ] Rename Format-item in File-menu to Convert
446 Src/Languages/*: Merge*.rc
449 PATCH: [ 1540090 ] Change horizontal scroll synch from relative to absolute
450 Src/Common: SplitterWndEx.cpp
453 PATCH: [ 1541158 ] New high-color toolbar icons
454 Src: BCMenu.cpp MainFrm.cpp MainFrm.h Merge.rc resource.h
455 Src/res: ToolbarDisabled.bmp ToolbarEnabled.bmp
458 PATCH: [ 1539568 ] draw icon at modified line (it was changed to line revision marks)
459 Src: GhostTextBuffer.cpp GhostTextBuffer.h MergeDoc.cpp MergeDoc.h
460 Src/editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h ccrystaltextview.cpp
463 PATCH: [ 1456356 ] Scrollbars sometimes not initially active
467 PATCH: [ 1540129 ] Fix indentation of diffutils io.c
468 Src/diffutils/src: IO.C
469 PATCH: [ 1540054 ] Remove Copy All -items from folder compare menu
471 Src/Languages/*: Merge*.rc
472 PATCH: [ 1535558 ] Add GUI for shell extension folder include
473 Src: Merge.rc PropRegistry.cpp PropRegistry.h resource.h
474 Src/Languages/*: Merge*.rc
477 BUG: [ 1538340 ] Undo enabled for folder compare.
478 Src: DirView.h DirView.cpp
481 Japanese translation - update
482 Src/Languages/Japanese: MergeJapanese.rc
485 PATCH: [ 1539204 ] Remove '#' from '#differences' column
487 Src/Languages/*: Merge*.rc
490 PATCH: [ 1538264 ] Split DiffFileData class to own files
491 Src: DiffWrapper.cpp DiffWrapper.h DirScan.cpp DirViewColItems.cpp Merge.dsp
492 Src new files: DiffFileData.cpp DiffFileData.h
493 PATCH: [ 1537261 ] Swedish 2.5.5.6+ translation update
494 Submitted by Hans Eriksson
495 Src/Languages/Swedish: MergeSwedish.rc
498 Fix doxygen comment for ImportOptions()
499 Src/Common: OptionsMgr.cpp
502 PATCH: Code cleanup. Removed commented out code.
503 Src/Common: SuperComboBox.cpp
505 BUG: [ 1531965 ] Crash undoing empty (?) event
506 Src/editlib: ccrystaleditview.cpp
509 Czech translation - update
510 Src/Languages/Czech/MergeCzech.rc
513 PATCH: [ 1310951 ] Option to copy DirCmpReport to clipboard
514 Src: DirCmpReport.cpp DirCmpReport.h DirCmpReportDlg.cpp DirCmpReportDlg.h
516 Src/Languages/*: Merge*.rc
519 Czech translation - update
520 Src/Languages/Czech/MergeCzech.rc
522 2006-08-08 WinMerge experimental release 2.5.5.6 (cvs)
525 BUG: [ 1535835 ] Import settings from the file
526 Src/Common: PreferencesDlg.cpp PreferencesDlg.h
527 PATCH: [ 1536240 ] Fix diff count numbers for real
528 Src: DiffWrapper.cpp DirScan.cpp
529 Src/diffutils/src: analyze.c UTIL.c
532 PATCH: [ 1514487 ] Merge7z DllBuild 0018
533 Merge7z: Merge7z311.cpp Merge7z409.cpp Merge7zCommon.cpp Merge7zCommon.h
534 revision.txt Merge7z*.dsp
535 Merge7z new files: Merge7z433.dsp Merge7z434.dsp Merge7z435.dsp Merge7z436.dsp
536 Merge7z437.dsp Merge7z438.dsp Merge7z439.dsp Merge7z440.dsp Merge7z442.dsp
537 Merge7zInstaller: Installer.cpp Installer.rc Files.rc2
538 Change recommended version of 7-Zip to 4.42
542 PATCH: [ 1535175 ] Shell ext: Add flag for subfolder inclusion
543 ShellExtension: WinMergeShell.cpp WinMergeShell.h
544 Bump ShellExtension version to 1.8.0
545 ShellExtension: ShellExtension.rc
548 BUG: [ 1533292 ] crash when specifying nonexistent project file.
552 PATCH: [ 1534770 ] Add "don't wrap end of file" option for Find
553 Src: Merge.rc resource.h
554 Src/editlib: ccrystaleditview.cpp ccrystaltextview.cpp ccrystaltextview.h
555 ceditreplacedlg.cpp cfindtextdlg.cpp cfindtextdlg.h
556 Src/Languages/*: Merge*.rc
557 BUG: [ 1534461 ] WinMerge 2.5.5.5 ingoring subfolders option in project files
558 Src: MainFrm.cpp Merge.cpp
561 Czech translation - update
562 Src/Languages/Czech/MergeCzech.rc
564 2006-08-03 WinMerge experimental release 2.5.5.5 (cvs)
567 PATCH: [ 1533457 ] Add Refresh Selected -item to Folder compare main menu
568 Src: DirActions.cpp DirView.cpp DirView.h Merge.rc
569 Src/Languages/*: Merge*.rc
572 PATCH: [ 1532743 ] Improve difference count columns in folder compare
573 Src: DiffItem.h DiffItemList.cpp DirScan.cpp DirVierwColItems.cpp
575 Src/Languages/*: Merge*.rc
576 PATCH: [ 1529864 ] Stop using Application Data folders as filefilter folders
577 Src: FileFilterHelper.cpp FileFilterHelper.h
580 PATCH: [ 1531845 ] Fix memory leak after find
581 Src/editlib: ccrystaltextview.cpp
582 PATCH: [ 1531957 ] Fix imagelist memory leak in editor
583 Src/editlib: ccrystaltextview.cpp
584 PATCH: [ 1430331 ] New Debug menu
585 Submitted by Perry, modified by me
586 Src: MainFrm.cpp MainFrm.h Merge.rc resource.h
587 Src/Languages/*: Merge*.rc
588 PATCH: [ 1531319 ] Tidy Folder compare progress dialog
590 Src/Languages/*: Merge*.rc
593 PATCH: [ 1531293 ] Fix wrong cursor position after find
594 Src: ccrystaltextview.cpp ccrystaltextview.h cfindtextdlg.cpp
595 PATCH: [ 1406051 ] code cleanup for ScriptFileActions
597 Src: DirActions.cpp FileActionScript.cpp FileActionScript.h
598 PATCH: [ 1530459 ] Add some doxygen comments for ViewableWhitespace
599 Src: ViewableWhitespace.cpp ViewableWhitespace.h
602 BUG: [ 1528322 ] Crash when using F6 / Bugg for file differences
603 Src: MergeEditView.cpp
606 PATCH: [ 1530352 ] Start flashing WinMerge window when folder compare is ready
607 Src: DirView.cpp MainFrm.cpp MainFrm.h
608 PATCH: [ 1529995 ] Swedish translation update for 2.5.5.4+
609 Submitted by Hans Eriksson
610 Src/Languages/Swedish: MergeSwedish.rc
611 PATCH: [ 1530655 ] Catalan translation update
612 Submitted by Jordi Vilar
613 Src/Languages/Catalan: MergeCatalan.rc
616 PATCH: [ 1529915 ] Refresh menu on DirView does not work correctly
617 Src: DirActions.cpp DirScan.cpp
620 PATCH: [ 1529599 ] Cleanup DiffWrapper
621 Src: DiffWrapper.cpp DiffWrapper.h MergeDoc.cpp PatchTool.cpp
622 PATCH: [ 1529965 ] Add error messages for managing file filters
623 Src: FileFiltersDlg.cpp FileFiltersDlg.h Merge.rc resource.h
624 Src/Languages/*: Merge*.rc
627 PATCH: [ 1527843 ] prevent dialog from flickering
628 Src: DirCompProgressDlg.cpp DirView.cpp
629 Src/Common: CMoveConstraint.cpp
632 PATCH: [ 1528841 ] Cleanup ByteComparator
633 Src: ByteComparator.cpp ByteComparator.h FileTextStats.h
634 PATCH: [ 1528987 ] Use 64-bit variable as file position in Bytecompare
635 Src: ByteComparator.cpp ByteComparator.h DiffWrapper.cpp FileTextStats.h
636 PATCH: [ 1529053 ] Success message for loading/saving project file
637 Src: Merge.rc ProjectFilePathsDlg.cpp resource.h
638 Src/Languages/*: Merge*.rc
641 PATCH: [ 1528444 ] Cleanup for AppSerialize
642 Src: AppSerialize.cpp AppSerialize.h
645 PATCH: [ 1527771 ] Remove Apply syntax highlight to other side option
646 Src: Merge.rc MergeDoc.cpp OptionsDef.h OptionsInit.cpp PropEditor.cpp
647 PropEditor.h resource.h
648 Src/Languages/*: Merge*.rc
651 PATCH: [ 1527947 ] Various Updates in German Translation for WinMerge 2.5
652 Src/Languages/German: MergeGerman.rc
655 PATCH: [ 1526918 ] Detect which side file is binary file
656 Src: DiffItem.h DiffWrapper.cpp DiffWrapper.h
657 Src/diffutils/src: DIFF.H IO.c analyze.c
659 2006-07-20 WinMerge experimental release 2.5.5.4 (cvs)
662 PATCH: [ 1525013 ] Add description for ASP.NET filter
664 PATCH: [ 1525417 ] Move MovedBlock code to own file
665 Src: DiffWrapper.cpp Merge.dsp
666 Src new file: MovedBlocks.cpp
667 PATCH: [ 1525531 ] Allow comparing project files from Open-dialog
669 Config log files are .txt files (not .log)
671 BUG: [ 1495212 ] Wrong cursor position after selecting wordwrapped line
673 Src/editlib: ccrystaltextview.cpp
676 Czech translation - update
677 Src/Languages/Czech/MergeCzech.rc
680 BUG: [ 1198248 ] version copyright symbol needs review
681 Src/Languages/*: MergeChineseSimplified.rc MergeChineseTraditional.rc MergeJapanese.rc
685 BUG: [ 1525451 ] ASSERT in CCrystalTextView::DrawSingleLine()
686 Src/editlib: ccrystaltextview.cpp
687 BUG: [ 1525466 ] ASSERT in CCrystalTextView::AssertValidTextPos()
688 Src/editlib: ccrystaltextview2.cpp
691 BUG: [ 1524832 ] Bogus include's
692 Src: DirColsDlg.cpp PropEditor.cpp
693 PATCH: [ 1522037 ] Add read-only option for paths in Project file
694 Src: MainFrm.cpp Merge.cpp Merge.rc OpenDlg.cpp OpenDlg.h ProjectFile.cpp
695 ProjectFile.h ProjectFilePathsDlg.cpp ProjectFilePathsDlg.h resource.h
696 Src/Languages/*: Merge*.rc
697 PATCH: [ 1525025 ] Copy/paste error in MainFrm.cpp
699 PATCH: [ 1525198 ] Version info misses copyright (c) char
703 Fix and improve comment for folder compare columns table
705 BUG: [ 1524251 ] File filter does not work on 2.5.5.3
706 Original fix from Takashi, modified by Kimmo
707 Src: FileFilterMgr.cpp
710 PATCH: [ 1517057 ] Option to Ignore Multiline Comments (bugfix for single-line comments)
711 Submitted by David Maisonave
715 Strip SuperComboBox strings before saving
716 Src/Common: SuperComboBox.cpp
718 2006-07-14 WinMerge experimental release 2.5.5.3 (cvs)
721 BUG: [ 1521555 ] Location Pane - can't see current location because of color
722 Use 3d-color instead of scrollbar color in location pane
723 Src: LocationView.cpp
724 PATCH: [ 1521696 ] Improve Text color option dialog
725 Src: Merge.rc PropTextColors.cpp PropTextColors.h
726 Src/Languages/*: Merge*.rc
729 PATCH: [ 1521352 ] Cleanup char constants for CRegExep
730 Src/Common: RegExp.cpp
731 PATCH: [ 1521392 ] Fix reading last line in linefilter file
732 Src: FileFilterMgr.cpp
733 BUG: [ 1498511 ] Conflict accelerator key in IDR_DIRVIEWMENU
735 Src/Languages/*: Merge*.rc
736 PATCH: [ 1517057 ] Option to Ignore Multiline Comments (bugfix + rename to filtering)
737 Submitted by David Maisonave
738 Src: DiffWrapper.cpp DiffWrapper.h DirDoc.cpp MainFrm.cpp Merge.rc MergeDoc.cpp
739 OptionsDef.h OptionsInit.cpp PropCompare.cpp Propcompare.h resource.h
740 Src/Languages/*: Merge*.rc
741 PATCH: [ 1517057 ] Option to Ignore Multiline Comments (bugfix)
742 Submitted by David Maisonave
746 PATCH: [ 1517057 ] Option to Ignore Multiline Comments
747 Submitted by David Maisonave
748 Src: DiffWrapper.cpp DiffWrapper.h DirDoc.cpp MainFrm.cpp Merge.rc MergeDoc.cpp
749 OptionsDef.h OptionsInit.cpp PatchTool.cpp PropCompare.cpp Propcompare.h
751 Src/Languages/*: Merge*.rc
752 Add Ed_K and David Maisonave to Contributors
753 Docs/Users: Contributors.txt
754 Document UniMemFile::ReadString() function parameters and return values
755 Src/Common: UniFile.cpp
758 Quiet warning about deprecated function for VS2003 and later
762 PATCH: [ 1517362 ] Ensure diff is visible in location view
763 Src: LocationView.cpp
764 Fix codinstyle in LocationView.cpp (messed up by patch #1517362)
765 Src: LocationView.cpp
766 Make VS2005 build less noisy by defining _CRT_SECURE_NO_DEPRECATE for it
770 PATCH: [ 1516626 ] Enable double-click in column customization dialog
771 Src: DirColsDlg.cpp DirColsDlg.h
772 PATCH: [ 1514435 ] Optimize versioninfo reading
773 Src: AboutDlg.cpp ConfigLog.cpp Splash.cpp
774 Src/Common: version.cpp version.h
777 BUG: [ 1303166 ] crash or freeze on closing all window
780 2006-07-03 WinMerge experimental release 2.5.5.2 (cvs)
783 PATCH: [ 1515380 ] Page Up/Down Anomaly
785 Src/editlib: ccrystaltextview2.cpp
786 PATCH: [ 1515966 ] Use View-IDs in MergeDoc.cpp
787 Src: MergeDoc.cpp MergeDoc.h
788 PATCH: [ 1516016 ] Fix poor handling of invalid tab size in Options-dialog
789 Src: Merge.rc PropEditor.cpp PropEditor.h resource.h
790 Src/Languages/*: Merge*.rc
791 Fix comment in DiffList.cpp
795 PATCH: [ 1515669 ] Add selected difference marker for locationview
796 Src: LocationView.cpp LocationView.h
799 PATCH: [ 1514459 ] Cleanup for LocationView code (use view ID)
800 Src: LocationView.cpp LocationView.h StdAfx.h
801 PATCH: [ 1514580 ] Tweak location view bar look
802 Src: LocationView.cpp
805 PATCH: [ 1514645 ] Various Updates in German Translation for WinMerge 2.5
806 Src/Languages/German: MergeGerman.rc
809 PATCH: [ 1513618 ] Fix Merge.rc translation id
813 PATCH: [ 1512708 ] Fix compile with VS2005
814 Also additional cleanup for CCrystalTextView::GetMarginWidth()
815 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
816 PATCH: [ 1512726 ] Fix combining filesize from two values
817 Src: DiffFileInfo.cpp DirScan.cpp FileInfo.cpp FileInfo.h
818 PATCH: [ 1512775 ] Fix encoding columns showing -1
819 Src: FileTextEncoding.cpp FileTextEncoding.h
822 PATCH: [ 1510596 ] Updated Readme-Swedish.txt
823 Submitted by Hans Eriksson
824 Docs/Users/Languages: ReadMe-Swedish.txt
825 PATCH: [ 1510600 ] Updated MergeSwedish.rc file for 2.5.5.1+
826 Submitted by Hans Eriksson
827 Src/Languages/Swedish: MergeSwedish.rc
828 BUG: [ 1483242 ] Needless resource file 'MergeSwedish_LastTranslation.rc'?
830 Removed: Src/Languages/Swedish: MergeSwedish_LastTranslation.rc
831 BUG: [ 1489034 ] Src/Common/LanguageSelect.rc unused?
833 Removed: Src/Common/LanguageSelect.rc
834 Remove unused files (language.h & language.c)
835 Removed: Src: language.c language.h
837 2006-06-21 WinMerge experimental release 2.5.5.1 (cvs)
840 PATCH: [ 1509505 ] Manual: new compare method and options export/import
841 Docs/Users/Manual: Configuration.xml
842 Bump manual revision to 1.2.4
843 Docs/Users/Manual: WinMerge_help.xml
844 Bump ShellExtension version to 1.7.2
845 ShellExtension: ShellExtension.rc
848 BUG: [ 1505763 ] Crash after closing file compare window
849 Src: MergeEditView.cpp
850 PATCH: [ 1508865 ] Improve error handling for loading file filters
851 Src: FileFilterHelper.cpp FileFilterMgr.cpp FileFilterMgr.h FileFiltersDlg.cpp
853 PATCH: [ 1508898 ] Show binary as one of EOL types
854 Src: DirViewColItems.cpp Merge.rc resource.h
855 Src/Languages/*: Merge*.rc
856 PATCH: [ 1506184 ] Polish translation update for WM 2.5.4.0
857 Submitted by dr_prozac
858 Src/Languages/Polish: MergePolish.rc
859 PATCH:[ 1509495 ] Polish translation for ShellExtension
860 Submitted by dr_prozac
861 ShellExtension/Languages: ShellExtensionPolish.rc
864 RFE: [ 1499245 ] Ruby Syntax Highlighting
866 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h ruby.cpp
869 BUG: [ 1494776 ] Can't rename files if '|' seperator exists
870 Src: DirView.h DirView.cpp DirActions.cpp
873 BUG: [ 1486434 ] Copy Pathnames for right-only dir copies parent dir only
877 PATCH: [ 1483544 ] New compare method: by date and size
878 Src: DiffWrapper.h DirScan.cpp Merge.rc PropCompare.cpp resource.h
879 Src/Languages/*: Merge*.rc
882 BUG: [ 1496066 ] WinMerge crashed with those files
883 Src: GhostTextView.cpp GhostTextView.h
886 BUG: [ 1494610 ] Wrong selection in ccrystalview2.cpp
887 Src/editlib: ccrystaltextview2.cpp
888 PATCH: [ 1497817 ] Cleanup CCrystalTextView::GetLineBySubLine
889 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
892 PATCH: [ 1497154 ] Fix memory leak in wordwrap code
893 Src/editlib: ccrystaltextview.cpp
894 PATCH: [ 1497068 ] Initialize cursorpositions in GhostTextView
896 PATCH: [ 1497147 ] Cleanup CCrystalTextView::ClientToText
897 Src/editlib: ccrystaltextview.cpp
900 BUG: [ 1494610 ] Wrong selection in ccrystalview2.cpp
902 Src/editlib: ccrystaltextview2.cpp
905 PATCH: [ 1495017 ] Translate 'Textcolors' options to German
906 Src/Languages/German: MergeGerman.rc
909 PATCH: [ 1494627 ] Skip processing empty paths in Open dialog
911 Doxygen comments and trivial cleanups for paths.cpp & paths.h
912 Src: paths.cpp paths.h
915 PATCH: [ 1493742 ] Limit vertical scrolling to last line of files
916 Src/editlib: ccrystaltextview.cpp
917 PATCH: [ 1493868 ] Add bookmark by double-clicking selection frame
918 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h ccrystaltextview2.cpp
919 PATCH: [ 1492458 ] Swedish translation update for 2.5.4.0
920 Submitted by Hans Eriksson
921 Src/Languages/Swedish: MergeSwedish.rc
922 Add some const keywords and fix comments, remove unused function.
923 Src: DiffList.cpp DiffList.h
924 BUG: [ 1488797 ] ASSERT in CMergeEditView::OnPrevdiff
926 Src: MergeEditView.cpp
929 PATCH: [ 1493713 ] Translate 'Bookmarks' feature to German
930 Src/Languages/German: MergeGerman.rc
933 PATCH: [ 1491436 ] Spanish Readme.txt
934 Submitted by Jesus M. Delgado 'Mack'
935 Docs/Users/Languages new file: ReadMe-Spanish.txt
936 InnoSetup: WinMerge.iss
939 PATCH: [ 1491993 ] Ability to rename files (RFE 1380228)
940 Src: DirActions.cpp DirView.cpp DirView.h Merge.rc resource.h
943 PATCH: [ 1491212 ] Czech Translation
944 Submitted by: Jan Hryz
945 Src/Languages/Czech/MergeCzec.rc
946 PATCH: [ 1492025 ] Catalan translation update
947 Submitted by Jordi Vilar
948 Src/Languages/Catalan: MergeCatalan.rc
949 PATCH: [ 1491424 ] Spanish translation for v2.5.3.7
950 Submitted by Jesus M. Delgado 'Mack'
951 Languages/Spanish: MergeSpanish.rc
953 2006-05-18 WinMerge beta release 2.5.4
956 PATCH: [ 1490540 ] Manual: add picture and explanation about our version tree
957 Docs/Users/Manual: Introduction.xml
958 Docs/Users/Manual/build: build_html.bat build_htmlhelp.bat
959 Docs/Users/Manual/Art new files: WinMerge_versions.gif WinMerge_versions.odg
962 PATCH: [ 1489824 ] Better default folder for user filters
964 BUG: [ 1445975 ] BuildDll.bat exit is not good
965 Src/Languages: BuildDll.bat
966 PATCH: [ 1488387 ] Russian translation update for 2.4.6
967 Submitted by Dmitriy Aleshkowskiy
968 Src/Languages/Russian: MergeRussian.rc
971 PATCH: [ 1489133 ] Manual: document new filter location(s)
972 Docs/Users/Manual: Filters.xml
973 PATCH: [ 1489091 ] Enable Help/Index
975 PATCH: [ 1489098 ] Doesn't open Help TOC correctly
977 BUG: [ 1487856 ] Long delay if many language dlls
979 Src/Common: LanguageSelect.cpp LanguageSelect.h
980 BUG: [ 1487854 ] ASSERT in CCrystalTextView::OnPrint
981 Fix suggested by Mallato
982 Src/editlib: ccrystaltextview.cpp
983 Graphic Design: Alexander Skinner
984 Docs/Users: Contributors.txt
985 BUG: [ 1478057 ] Memory leak when cancelling print preview
986 Fix suggested by Mallato
987 Src/editlib: ccrystaltextview.cpp
990 PATCH: [ 1488637 ] PHP/ASP Syntax Highlighting Fix (Bug 1441643)
991 Src/editlib: asp.cpp php.cpp
994 PATCH: [ 1485861 ] Czech translation - update
995 Submitted by: Jan Hryz
996 Src/Languages/Czech/MergeCzec.rc
997 PATCH: [ 1483553 ] Swedish MergeSwedish.rc 1.304 2.5.3.7 update
998 Submitted by Hans Eriksson
999 Src/Languages/Swedish: MergeSwedish.rc
1000 PATCH: [ 1484004 ] Manual: new Open-dialog screenshot and small fixes
1001 Docs/Users/Manual: Quick_start.xml
1002 Docs/Users/Manual/screenshots: OpenDlg1.gif
1003 PATCH: [ 1484013 ] Manual: small changes to Introduction chapter
1004 Docs/Users/Manual: Introduction.xml
1005 PATCH: [ 1484092 ] Manual: preliminary whats new list for 2.5
1006 Docs/Users/Manual: Whatsnew_2_1.xml
1007 PATCH: [ 1484101 ] Manual: Add index
1008 Docs/Users/Manual: WinMerge_help.xml
1009 PATCH: [ 1484142 ] Manual: update some options descriptions
1010 Docs/Users/Manual: Configuration.xml
1013 PATCH: [ 1483344 ] Fix creating private file filters
1014 Src: FileFiltersDlg.cpp
1015 PATCH: [ 1483486 ] Add commenting for CLogFile
1016 Src/Common: LogFile.cpp LogFile.h
1019 PATCH: [ 1483107 ] Remove dublicated code from folder compare progress dlg
1020 Src: DirCompProgressDlg.cpp DirCompProgressDlg.h
1021 PATCH: [ 1483088 ] Add GUI for user to select filter folder
1022 Src: FileFilterHelper.cpp FileFilterHelper.h FileFiltersDlg.cpp MainFrm.cpp Merge.rc
1023 OptionsDef.h OptionsInit.cpp paths.cpp paths.h PropRegistry.cpp PropRegistry.h
1025 Src/Languages/*: Merge*.rc
1028 BUG: [ 1481053 ] Options: Text Colors should use 3D-Look too
1030 Src/Languages/*: Merge*.rc
1031 PATCH: [ 1482352 ] Icons for 'Bookmarks' feature
1032 Src: MainFrm.cpp Merge.rc resource.h
1033 Src/res new files: clear_bookmarks.bmp next_bookmark.bmp prev_bookmark.bmp
1035 Src/Languages/*: Merge*.rc
1038 BUG: [ 1363364 ] DisplayBinaryFiles extension list wrong
1039 Also bump version of plugin to 1.0.3.0
1040 Plugins/src_VCPP/DisplayBinaryFiles: ChangeLog.txt DisplayBinaryFiles.rc WinMergeScript.cpp
1041 Plugins/dlls: DisplayBinaryFiles.dll
1044 PATCH: [ 1482411 ] Add line before 'Open Project' in main menu
1046 Src/Languages/*: Merge*.rc
1049 PATCH: [ 1482688 ] sgml.cpp contains "lt" twice
1050 Src/editlib: sgml.cpp
1051 PATCH: [ 1482694 ] xml.cpp contains "lt" twice
1052 Src/editlib: xml.cpp
1053 PATCH: [ 1482765 ] Fix closing folder compare progress dialog
1054 Src: DirCompProgressDlg.cpp DirCompProgressDlg.h DirView.cpp
1056 2006-05-04 WinMerge experimental release 2.5.3.7 (cvs)
1059 PATCH: [ 1481213 ] Fix foldercompare short-size suffixes and localize them
1060 Src: DirViewColItems.cpp Merge.rc resource.h
1061 Src/Languages/*: Merge*.rc
1062 PATCH: [ 1481391 ] Make LocationView update from MergeView more safe
1063 Src: LocationView.cpp MergeEditView.cpp MergeEditView.h
1064 BUG: [ 1456356 ] Scrollbars sometimes not initially active
1065 Another possible fix..
1066 Src/editlib: ccrystaltextview.cpp
1069 PATCH: [ 1480652 ] Small fix for XML syntax highlight
1070 Src/editlib: xml.cpp
1073 PATCH: [ 1479007 ] WinMerge Icon Set Revision 3
1074 Submitted by Alexander Skinner
1076 BUG: [ 1474782 ] Crash when comparing SQL with with binary data
1077 Fix suggested by anonymous submitter
1078 Src/editlib: asp.cpp basic.cpp batch.cpp cplusplus.cpp csharp.cpp dcl.cpp
1079 fortran.cpp html.cpp ini.cpp innosetup.cpp is.cpp java.cpp lisp.cpp nsis.cpp
1080 pascal.cpp perl.cpp php.cpp python.cpp rexx.cpp rsrc.cpp sgml.cpp sh.cpp
1081 siod.cpp sql.cpp tcl.cpp tex.cpp xml.cpp
1082 PATCH: [ 1471835 ] Fix setting filename in folder-compare report dialog
1083 Fix bug in the original patch
1084 Src: DirCmpReportDlg.cpp
1087 PATCH: [ 1475649 ] Enable selection margin and line numbers
1088 Src/res new file: mg_icons.bmp
1091 PATCH: [ 1475649 ] Enable selection margin and line numbers
1092 Src: GhostTextView.cpp GhostTextView.h Merge.rc MergeEditView.cpp
1093 MergeEditView.h OptionsDef.h OptionsInit.cpp resource.h
1094 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h editcmd.h
1095 Src/Languages/*: Merge*.rc
1098 PATCH: [ 1477957 ] Fix 'Help' button position in German translation
1099 Src/Languages/German: MergeGerman.rc
1102 PATCH: [ 1476279 ] Cleanup CDiffContext::UpdateInfoFromDiskHalf() and its usage
1103 Src: Diffcontext.cpp DiffContext.h DirScan.cpp DirViewColItems.cpp
1106 PATCH: [ 1475776 ] Optimize dirview UI updates
1107 Src: DirActions.cpp DirDoc.cpp DirDoc.h
1108 PATCH: [ 1472622 ] Czech translation - update (more dialog fixes)
1109 Submitted by: Jan Hryz
1110 Src/Languages/*: Merge*.rc
1113 PATCH: [ 1474884 ] Fix XmlDoc not releasing file handles
1114 Src: XmlDoc.cpp XmlDoc.h
1115 PATCH: [ 1475092 ] Add DocumentsLoaded() to MergeDiffDetailView
1116 Src: MergeDiffDetailView.cpp MergeDiffDetailView.h MergeDoc.cpp
1117 Gal Hammer is now a developer
1118 Docs/Users: Contributors.txt
1121 PATCH: [ 1473902 ] Add dialog for editing and saving project files
1122 Src: DirDoc.cpp DirDoc.h MainFrm.cpp MainFrm.h Merge.dsp Merge.rc MergeDoc.cpp
1123 MergeDoc.h resource.h
1124 Src new files: ProjectFilePathsDlg.cpp ProjectFilePathsDlg.h
1125 Src/Languages/*: Merge*.rc
1126 PATCH: [ 1472622 ] Czech translation - update
1127 Submitted by: Jan Hryz
1128 Src/Languages/Czech/MergeCzec.rc
1129 PATCH: [ 1472622 ] Czech translation - update (apply dialog fixes)
1130 Submitted by: Jan Hryz
1131 Src/Languages/*: Merge*.rc
1134 PATCH: [ 1473635 ] Move some results update code to DirDoc
1135 Src: DirActions.cpp DirDoc.cpp DirDoc.h
1136 PATCH: [ 1468691 ] Center folder compare status dialog to mainframe
1137 Adding line I missed previous time applying the patch (2006-04-12)
1141 TODO: [ 1469363 ] Need image for aborted status in folder compare
1143 Src: DirView.cpp Merge.rc resource.h
1144 Src/res new file: aborted.ico
1145 Src/Languages/*: Merge*.rc
1146 PATCH: [ 1400653 ] Write project files using objects
1148 Src: Merge.dsp ProjectFile.cpp ProjectFile.h
1149 Src new files: XmlDoc.cpp XmlDoc.h
1152 PATCH: [ 1471835 ] Fix setting filename in folder-compare report dialog
1153 Src: DirCmpReportDlg.cpp DirCmpReportDlg.h
1156 PATCH: [ 1445996 ] Fix wrong PgDown scrolling after mousescroll(2)
1157 Src/editlib: ccrystaltextview2.cpp
1159 2006-04-12 WinMerge experimental release 2.5.3.6 (cvs)
1162 PATCH: [ 1468691 ] Center folder compare status dialog to mainframe
1164 PaTCH: [ 1468783 ] Fix disabled scrollbars after loading files
1165 Src: MergeDoc.cpp MergeEditView.cpp MergeEditView.h
1168 PATCH: [ 1467872 ] Fix diff navigation for first-line of diff
1169 Src: MergeEditView.cpp
1170 PATCH: [ 1443719 ] xml output reports
1171 Submitted by Perry, modified by me
1172 Src: DirCmpReport.cpp DirCmpReport.h DirCmpReportDlg.cpp DirCmpReportDlg.h
1173 DirView.cpp DirView.h Merge.dsp Merge.rc resource.h
1174 Src new file: DirReportTypes.h
1177 PATCH: [ 1467305 ] Beep when long compare is ready
1178 Src: DirView.cpp DirView.h
1181 BUG: [ 1461375 ] Forgot old patch #981526 for sgml.cpp, sh.cpp and tcl.cpp?
1182 Src\editlib: sgml.cpp sh.cpp tcl.cpp
1185 BUG: [ 1383719 ] ShellExtension resources opening in IDE fails
1187 ShellExtension/Languages/*.rc
1188 BUG: [ 1465893 ] Compile error with VC6 (SuperComboBox.cpp)
1190 Src/Common: SuperComboBox.cpp
1193 BUG: [ 1463137 ] MergeArgs.h is empty file?
1196 Src removed file: MergeArgs.h
1199 PATCH: [ 1461896 ] Syntax highlighting of HTML for ASP not complete
1200 Src\editlib: asp.cpp
1203 PATCH: [ 1460749 ] Print relative paths to patch files
1204 Src: DiffWrapper.cpp DiffWrapper.h MainFrm.cpp MergeDoc.cpp PatchDlg.h
1205 PatchTool.cpp PatchTool.h
1206 BUG: [ 1461328 ] Commandline handling overwrites flags?
1209 BUG: [ 1460236 ] Splash localization is broken
1210 Src: Merge.rc resource.h Splash.cpp
1211 Src/Languages/*: Merge*.rc
1212 PATCH: [ 1445426 ] Clear PrivateBuild flag in SetResourceVersions.wsf
1214 Src: SetResourceVersions.wsf
1217 BUG: [ 1458714 ] [Replace All] doesn't work
1218 Src/editlib: ceditreplacedlg.cpp
1221 PATCH: [ 1459284 ] Update of MergeSwedish.rc for WinMerge 2.5.3.5+
1222 Submitted by Hans Eriksson
1223 Src/Languages/Swedish: MergeSwedish.rc
1224 PATCH: [ 1458852 ] Fix UI for multiple file patches
1225 Src: PatchDlg.cpp PatchDlg.h
1226 PATCH: [ 1441718 ] Auto Complete on files or folders selection
1227 Submitted by Gal Hammer
1228 Src/Common: SuperComboBox.cpp SupercompoBox.h
1229 Src: Merge.rc OpenDlg.cpp OptionsDef.h OptionsInit.cpp PropGeneral.cpp
1230 PropGeneral.h resource.h
1231 Src/Languages/*: Merge*.rc
1234 PATCH: [ 1458066 ] Use / as path delimiter in patch files
1235 Src: DiffWrapper.cpp
1236 PATCH: [ 1406944 ] Compute text statistics in QuickCompare
1237 Src new file: FileTextStats.h
1240 PATCH: [ 1457203 ] Create patch from multiple files in folder compare
1241 Src: DirView.cpp DirView.h MainFrm.cpp
1244 PATCH: [ 1457306 ] Revamped Visual Basic syntax highlighter
1245 Src\editlib: basic.cpp
1248 BUG: [ 1455656 ] GPL text still contains 'How to Apply These Terms...'
1251 2006-03-22 WinMerge experimental release 2.5.3.5 (cvs)
1254 PATCH: [ 1455706 ] Catalan translation update
1255 Submitted by Jordi Vilar
1256 Src/Languages/Catalan: MergeCatalan.rc
1257 PATCH: [ 1406944 ] Compute text statistics in QuickCompare
1258 Src: ByteComparator.cpp ByteComparator.h DiffFileInfo.cpp DiffFileInfo.h DiffWrapper.cpp
1259 Diffwrapper.h DirScan.cpp DirViewColItems.cpp Merge.dsp Merge.rc resource.h
1260 Src/diffutils/src: DIFF.H IO.C
1261 Src/Languages/*: Merge*.rc
1264 PATCH: [ 1455663 ] Add new keywords to Visual Basic highlighter
1265 Src\editlib: basic.cpp
1268 PATCH: [ 1448599 ] WinMerge Program Icon Set
1269 Submitted by Alexander Skinner
1271 PATCH: [ 1452288 ] Add ASP.NET filefilter
1272 By By Jon Galloway and Josh Blair
1273 Filters new file: ASPNET.flt
1274 PATCH: [ 1454720 ] Fix resizable dialogs missing captionbar close button
1276 Src/Languages/*: Merge*.rc
1277 PATCH: [ 1455430 ] New Splash Screen Revision 2
1278 Submitted by Alexander Skinner
1280 Remove obsolete splashscreen image (for old splashscreen)
1281 Src/res removed file: WinMergesplash.psd
1284 PATCH: [ 1449892 ] Add compare method to configlog
1285 Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
1286 PATCH: [ 1453252 ] Fix closing filecompare after error
1287 Src: MainFrm.cpp MergeDoc.cpp
1290 PATCH: [ 1449571 ] Add '*.pm' and '*.plx' to Perl highlighter
1291 Src/editlib: ccrystaleditview.cpp
1294 BUG: [ 1449947 ] Looks like diffutils bug for mac-style
1295 BUG: [ 1449949 ] crash comparing two simple test mac files
1296 Fix looping which missed mac case
1300 PATCH: [ 1449868 ] Fix difference counts
1301 Src: DiffWrapper.cpp
1304 PATCH: [ 1449038 ] Add Help-button to Open-dialog
1305 Src: FileFiltersDlg.cpp FileFiltersDlg.h Merge.rc OpenDlg.cpp OpenDlg.h
1306 PropLineFilter.cpp PropLineFilter.h
1307 Src/Common: PreferencesDlg.cpp
1308 Src/Languages/*: Merge*.rc
1311 PATCH: [ 1447927 ] Add Help Search to menu, open correct manual location
1312 Src: DirView.cpp DirView.h MainFrm.cpp MainFrm.h Merge.rc MergeEditView.cpp
1313 MergeEditView.h resource.h
1314 Src/Languages/*: Merge*.rc
1317 PATCH: [ 1447506 ] Don't include splash bitmap to lang files
1318 Src/Languages/*: Merge*.rc
1319 Remove Catalan localized splash screen
1320 Src/Languages/Catalan/res removed files: splash1.bmp WinMergeSplash.psd
1321 BUG: [ 1447851 ] Not enough space for version info in new splash screen
1323 PaTCH: [ 1445377 ] WinMerge Logos (72 DPI)
1324 Submitted by Alexander Skinner
1325 Add new folder Docs/Logos
1326 New Docs/Logos files: readme.txt WinMerge_logo_24bit.png
1327 WinMerge_logo_shadow_24bit.png WinMerge_logo_shadow_trans.tif
1328 WinMerge_logo_trans.gif
1329 Change Splashscreen text to according to Dean's wish
1331 Add Alexander Skinner to contributors list
1332 Docs/Users: Contributors.txt
1333 PATCH: [ 1447348 ] Build language files to Build directory
1334 Src/Languages: BuildDll.bat
1335 PATCH: [ 1447806 ] Use JPEG splashscreen
1336 Src: Merge.dsp Merge.rc resource.h Splash.cpp Splash.h
1337 Src/Common new files: Picture.cpp Picture.h
1338 Src/res new file: splash.jpg
1339 Src/res deleted file: splash1.bmp
1340 Src/Languages/*: Merge*.rc
1343 BUG: [ 1441389 ] Comparing root directory - mysterious
1344 Src: DiffWrapper.cpp
1347 PATCH: [ 1447539 ] Add explanatory comment to CCrystalTextBuffer::MoveLine
1348 Src/editlib: ccrystaltextbuffer.cpp
1349 PATCH: [ 1447547 ] Add more comments to CMergeDoc::PrimeTextBuffers
1353 Remove unneeded splash image (Splash2.bmp) as noted in Patch item #1441392
1354 Src/res removed file: Splash2.bmp
1357 PATCH: [ 1445434 ] SyntaxColors scrambling reg values
1358 Src: SyntaxColors.cpp
1360 2006-03-10 WinMerge experimental release 2.5.3.4 (cvs)
1363 PATCH: [ 1445996 ] Fix wrong PgDown scrolling after mousescroll
1364 Src/editlib: ccrystaltextview2.cpp
1365 BUG: [ 1446648 ] cvs trunk doesn't compile
1369 PATCH: [ 1441392 ] New Splash Screen
1370 Submitted by Alexander Skinner
1372 Src/res: splash1.bmp
1375 Update MakeResDll readme with current information (MSVC.Net 2003 works
1376 now), and better explanation of how to pick a specific version.
1377 MakeResDll: readme.txt
1378 PATCH: [ 1443391 ] Update MakeResDll for VS.NET 2005
1379 MakeResDll: MakeResDll.cpp MakeResDll.dsp MakeResDll.rc
1380 StdAfx.cpp StdAfx.h readme.txt resource.h
1381 New MakeResDll: Merge.ico VsVersionDlg.cpp VsVersionDlg.h
1382 Bump MakeResDll version from 1.0.6.0 to 1.0.7.0.
1383 MakeResDll: MakeResDll.rc
1384 PATCH: [ 1442844 ] Make GetFileExt easier to understand
1385 Src: MergeDoc.cpp MergeDoc.h
1386 Add two minor comments to PropRegistry.
1389 2006-03-06 WinMerge experimental release 2.5.3.3 (cvs)
1392 BUG: [ 1444211 ] bug in current SelectFile
1394 PATCH: [ 1443841 ] Add header comment to Src/Changes.txt
1398 BUG: [ 1442866 ] German RC format error
1399 Src/Languages/German: MergeGerman.rc
1400 BUG: [ 1442865 ] languages lack generate patch & report bitmaps
1401 Src/Languages/*: Merge*.rc
1404 PATCH: [ 1435361 ] Fix and cleanup project file code
1405 Src: DiffContext.cpp DiffContext.h DirDoc.cpp MainFrm.cpp
1406 Merge.cpp Merge.h Merge.rc MergeArgs.cpp ProjectFile.cpp
1408 Src/Languages/*: Merge*.rc
1411 PATCH: [ 1396506 ] customizable text colors
1412 Fix compilation (MSVC.NET 2003 correctly gave error that MSVC6 ignored)
1413 Src: PreferencesDlg.cpp
1414 PATCH: [ 1442125 ] Improvements for MakeResDll parsing
1415 MakeResDll: MakeResDll.cpp MakeResDll.rc resource.h
1416 Src\Common: RegKey.cpp RegKey.h
1417 PATCH: [ 1442134 ] MakeResDll: check that RC file exists
1418 MakeResDll: MakeResDll.cpp MakeResDll.rc resource.h
1419 PATCH: [ 1442238 ] Fix MakeResDll to work with VS.NET 2003
1420 MakeResDll: MakeResDll.cpp MakeResDll.rc
1421 PATCH: [ 1442791 ] Update MakeResDll project
1422 Add Changes.txt to project.
1423 Change version copyright from "2003" to "2003-2006"
1424 MakeResDll: MakeResDll.dsp MakeResDll.rc
1426 2006-03-04 Perry (MSVC6)
1427 Current selftests status: Failure count: 0 (of 756)
1430 PATCH: [ 1396506 ] customizable text colors
1431 Src: MainFrm.cpp MainFrm.h Merge.dsp Merge.rc MergeDoc.cpp
1432 OptionsDef.h OptionsInit.cpp PropArchive.cpp PropArchive.h
1433 PropCodepage.cpp PropCodepage.h PropColors.cpp PropColors.h
1434 PropCompare.cpp PropCompare.h PropEditor.h PropGeneral.h
1435 PropRegistry.h PropSyntaxColors.cpp PropSyntaxColors.h
1436 PropVss.h SyntaxColors.cpp SyntaxColors.h resource.h
1437 Src\Common: PreferencesDlg.cpp PreferencesDlg.h
1438 Src/Languages/*: Merge*.rc
1439 PATCH: [ 1439335 ] Reset cwd in Merge.cpp SelectFile
1440 Src: Merge.cpp OpenDlg.cpp
1441 PATCH: [ 1442082 ] Fix MakeDirs to not error if directory exists
1442 Src\Common: coretools.cpp
1443 PATCH: [ 1396506 ] customizable text colors
1445 Src: new PropTextColors.cpp PropTextColors.h
1448 PATCH: [ 1442699 ] New Changes.txt file for MakeResDll
1449 Add Changes.txt change log (this file).
1450 MakeResDll: new Changes.txt
1451 PATCH: [ 1424636 ] New BuildOneLanguage.vbs & fix MakeResDll exit
1452 MakeResDll: MakeResDll.cpp StdAfx.h
1453 Src\Languages: BuildDll.bat BuildOneLanguage.vbs
1456 PATCH: [ 1441387 ] Improve File Encoding dialog
1458 Src/Languages/*: Merge*.rc
1459 PATCH: [ 1442107 ] Move About-dialog code to separate files from Merge.cpp
1460 Src: Merge.cpp Merge.dsp
1461 Src new files: AboutDlg.cpp AboutDlg.h
1464 PATCH: [ 1437770 ] Icons for 'Generate Patch' and 'Generate Report'
1465 Src: MainFrm.cpp Merge.rc resource.h
1466 Src/res new files: patch.bmp report.bmp
1469 PATCH: [ 1441124 ] Improve filter test dialog
1471 Src/Languages/*: Merge*.rc
1474 PATCH: [ 1424535 ] Czech Translation, Submitted by Jan Hryz
1475 Improve unpacker selection dialog and new filter location selection dialog
1477 Src/Languages/*: Merge*.rc
1480 PATCH: [ 1438233 ] New icons for 'notequalfile', 'lfile' and 'rfile'
1481 Src/res: lfile.ico notequalfile.ico rfile.ico
1484 PATCH: [ 1436855 ] Typo in lang files (change pactch to patch)
1485 Src/Languages/*: Merge*.rc
1486 BUG: [ 1440774 ] Test button for file filters enabled for no filter
1487 Fix submitted by Gal Hammer
1488 Src: FileFiltersDlg.cpp
1489 PATCH: [ 1395847 ] Integration with Rational ClearCase
1490 Submitted by Gal Hammer
1491 Src: MainFrm.cpp MainFrm.h Merge.h MergeArgs.cpp MergeDoc.cpp MergeDoc.h
1492 Src/Common: coretools.cpp coretools.h
1495 BUG: [ 1439360 ] Native languages sometimes suppressed in Unicode Build
1496 Add note to CLanguageSelect::GetNativeLanguageNameString
1497 explaining why codepage check is done even for Unicode build.
1498 Src/Common: LanguageSelect.cpp
1501 BUG: [ 1439350 ] Russian language name in LanguageSelect?
1502 Src/Common: LanguageSelect.cpp
1505 PATCH: [ 1435470 ] Remove CTextFile
1507 Deleted Src\Common: textfile.cpp textfile.h
1508 PATCH: [ 1439229 ] Fix CMergeDoc::SanityCheckD not to dereference illegal lines
1509 BUG: [ 1438390 ] Crash when editting the attached files
1511 PATCH: [ 1434007 ] Move source control code out of MainFrm.cpp
1512 Src: MainFrm.cpp MainFrm.h Merge.dsp
1513 New Src: SourceControl.cpp
1516 PATCH: [ 1437758 ] Improve diff selection when selected diff not visible
1517 Src: MergeEditView.cpp MergeEditView.h
1518 PATCH: [ 1431607 ] Fix worddiff highlight error
1520 Src: stringdiffs.cpp
1523 PATCH: [ 1437677 ] Various Updates in German Translation for WinMerge 2.5
1524 Src/Languages/German: MergeGerman.rc
1527 PATCH: [ 1435431 ] Fix GenerateReport lines
1529 Src: DirCmpReport.cpp
1530 PATCH: [ 1395721 ] VS.NET 2003 warning of SEH bug
1532 PATCH: [ 1428686 ] Catalan translation update
1534 Src/Languages/Catalan: MergeCatalan.rc
1535 PATCH: [ 1430321 ] Swedish translation update and feedback on WinMerge 2.5.3.2
1537 Src\Languages\Swedish: MergeSwedish.rc
1538 PATCH: [ 1434270 ] Fix difference counts
1540 Src: DiffWrapper.cpp
1543 PATCH: [ 1435384 ] Add context menu for diff pane
1544 Src: Merge.rc MergeDiffDetailView.cpp MergeDiffDetailView.h resource.h
1545 Src/Languages/*: Merge*.rc
1546 PATCH: [ 1433125 ] Trap errors from filesystem during actions
1547 Src: FileActionScript.cpp
1550 PATCH: [ 1405603 ] New Test dialog for file filters
1551 (Forgot to do all the language resources)
1552 and misc RC file fixes (eg, many fixes in editor proppage)
1553 New: Src/Languages: WinMerge_Resource_Discrepencies.txt
1556 PATCH: [ 1405603 ] New Test dialog for file filters
1557 Src: FileFilterMgr.cpp FileFilterMgr.h FileFiltersDlg.cpp
1558 FileFiltersDlg.h Merge.dsp Merge.rc resource.h
1559 Src new: TestFilterDlg.cpp TestFilterDlg.h
1560 PATCH: [ 1433312 ] Add cvs tags to source files
1561 Src: ByteComparator.cpp SharedFilterDlg.cpp StdAfx.cpp
1562 TestFilterDlg.cpp TestFilterDlg.h ViewableWhitespace.cpp
1563 Src/Common: SortHeaderCtrl.cpp SortHeaderCtrl.h UniFile.cpp
1564 UniFile.h textfile.cpp textfile.h unicoder.cpp unicoder.h
1565 varprop.cpp varprop.h version.cpp version.h
1568 PATCH: [ 1178743 ] Disable lang menu if no additional langs installed
1569 Src: Merge.cpp Merge.h
1570 Src/Common: LanguageSelect.cpp LanguageSelect.h
1573 PATCH: [ 1433931 ] Add comment before isBin checks in DirView
1575 PATCH: [ 1424153 ] Remove VTS_PUI1 from lwdisp.h
1576 BUG: [ 1395475 ] VTS_UI1 & VTSPUI1 macro redefinition warnings (VS.NET)
1577 Src\Common: lwdisp.h
1578 PATCH: [ 1433927 ] Fix external editor default and messages
1579 BUG: [ 1433774 ] default editor is blank
1580 Src: MainFrm.cpp Merge.cpp Merge.rc OptionsInit.cpp resource.h
1581 Src/Languages/*: Merge*.rc
1582 PATCH: [ 1433353 ] Fix menu resources
1583 Src: MainFrm.cpp Merge.cpp Merge.rc resource.h
1584 Src/Languages/*: Merge*.rc
1586 2006-02-19 Christian
1587 PATCH: [ 1429125 ] Return number of diffs instead of true/false
1591 BUG: [ 1395483 ] Signed/unsigned mismatch warning from LocationView.cpp
1592 Src: LocationView.cpp
1595 BUG: [ 1395475 ] VTS_UI1 & VTSPUI1 macro redefinition warnings (VS.NET)
1596 Fixed VTS_PUI1 (which previous patch for this bug missed).
1597 Src\Common: lwdisp.h
1600 PATCH: [ 1424535 ] Czech Translation, Submitted by Jan Hryz
1601 Improve folder compare columns dialog (idea for new arrows from Catalan translation)
1603 Src/Languages/*: Merge*.rc
1606 PATCH: [ 1431771 ] Alter CheckTranslations.vbs to YesNoCancel
1607 Src/Languages: CheckTranslations.vbs
1608 PATCH: [ 1419582 ] Polish translation update for latest v2.5
1609 Contributed by dr_prozac
1610 Src/Languages/Polish: MergePolish.rc
1611 PATCH: [ 1431846 ] Update Czech Translation
1612 Contributed by Jan Hryz
1613 Src/Languages/Czech: MergeCzech.rc
1614 ShellExtension/Languages/ShellExtensionCzech.rc
1615 A few control adjustments matching Czech to English (many left)
1616 Src/Languages/Czech: MergeCzech.rc
1619 PATCH: [ 1431636 ] IgnoreEOL broken in cvs trunk
1620 Src: PropCompare.cpp
1623 PATCH: [ 1431768 ] Write paths to patch files as given
1624 Src: DiffWrapper.cpp
1627 PATCH: [ 1431205 ] Fix ViewWhitespace \r\n bug
1628 BUG: [ 1431012 ] View line differences adds additional EOL char
1629 Src/editlib: ccrystaltextview.cpp
1630 PATCH: [ 1431197 ] Fix off-by-one highlight error
1631 Src: stringdiffs.cpp
1632 Fix button movement on LanguageSelect (broken by PATCH#1423461).
1633 Also add cvs id comment at top, and doxygen file label.
1634 Src\Common: LanguageSelect.cpp
1637 BUG: [ 1197976 ] GeneratePatch file browse not intialized correctly
1638 Fix submitted by Perry
1642 PATCH: [ 1431131 ] Fix VS.NET 2003 compilation
1643 Src\Common: coretools.cpp scbarg.cpp scbarg.h sizecbar.cpp sizecbar.h
1644 Shrink Swedish dialog IDD_PROPPAGE_LARGE to same size as English
1645 (all controls already were the same size anyway)
1646 Src\Languages\Swedish: MergeSwedish.rc
1649 PATCH: [ 1212124 ] File encoding GUI
1650 Src: DiffContext.cpp DiffFileInfo.cpp DiffFileInfo.h DiffItem.cpp
1651 DiffItem.h DiffThread.cpp DiffWrapper.cpp DirActions.cpp
1652 DirScan.cpp DirView.cpp DirView.h DirViewColItems.cpp FileLocation.h
1653 MainFrm.cpp Merge.dsp Merge.rc MergeDoc.cpp MergeDoc.h OpenDlg.cpp
1654 codepage_detect.cpp codepage_detect.h resource.h
1655 NEW Src: FileTextEncoding.cpp FileTextEncoding.h IntToIntMap.h
1656 LoadSaveCodepageDlg.cpp LoadSaveCodepageDlg.h MergeDocEncoding.cpp
1657 dlgutil.cpp dlgutil.h
1660 Adjust whitespace to match English translation
1661 Also update Russian options/editor controls to match English
1662 Src\Languages\Russian: MergeRussian.rc
1663 Src\Languages\Slovak: MergeSlovak.rc
1664 Src\Languages\Swedish: MergeSwedish.rc
1665 Src\Languages\Turkish: MergeTurkish.rc
1666 PATCH: [ 1424681 ] Widen labels on unpacker dialog
1668 Src\Languages: Merge*.rc
1671 PATCH: [ 1429517 ] Fix coretools.cpp compilation (for MakeResDll)
1672 Src/Common: coretools.cpp
1673 PATCH: [ 1427838 ] code cleanup bottom of merge.cpp
1675 Synchronizing Turkish translation to English where feasible.
1676 Src/Languages/Turkish: MergeTurkish.rc
1677 Update Swedish Options/Editor to current English layout
1678 Src/Languages/Swedish: MergeSwedish.rc
1681 PATCH: [ 1428800 ] Fix ListCopy/AllLeft
1682 BUG: [ 1428791 ] All Left gave me a bunch of msgboxes
1683 Src: MergeDoc.cpp MergeDoc.h
1684 PATCH: [ 1428726 ] Fix for compilation under VS2005
1685 Src: BCMenu.cpp DiffWrapper.cpp DirCmpReport.cpp
1686 DirColsDlg.cpp DirViewColHandler.cpp GhostTextBuffer.cpp
1687 MergeArgs.cpp MergeDiffDetailView.cpp MergeDoc.cpp
1689 Src\Common: LanguageSelect.cpp SuperComboBox.cpp UniFile.cpp
1690 coretools.cpp multiformatText.cpp scbarg.cpp scbarg.h
1691 sizecbar.cpp sizecbar.h
1692 Src\editlib: asp.cpp basic.cpp batch.cpp ccrystaltextview.cpp
1693 cplusplus.cpp crystaltextblock.cpp csharp.cpp dcl.cpp
1694 fortran.cpp html.cpp ini.cpp innosetup.cpp is.cpp java.cpp
1695 lisp.cpp nsis.cpp pascal.cpp perl.cpp php.cpp python.cpp
1696 rexx.cpp rsrc.cpp sgml.cpp sh.cpp siod.cpp sql.cpp
1697 tcl.cpp tex.cpp xml.cpp
1698 PATCH: [ 1427563 ] Give descriptive name to CMergeDoc::SaveHelper
1699 Src: MainFrm.cpp MergeDiffDetailView.cpp MergeDoc.cpp
1700 MergeDoc.h MergeEditView.cpp
1701 PATCH: [ 1426593 ] Remove empty CMergeDoc::SetDiffViewMode()
1703 Src: MergeDoc.cpp MergeDoc.h
1705 2006-02-09 WinMerge experimental release 2.5.3.2 (cvs)
1708 PATCH: [ 1427851 ] Small cleanup for FileFilterMgr::AddFilter()
1709 Src: FileFilterMgr.cpp
1710 Add Jan Hryz as Czech translator and contributor
1711 Docs/Users: Contributors.txt
1714 PATCH: [ 1427845 ] Double-click fails to open, no message
1716 BUG: [ 1427956 ] Differences count in Folder Compare wrong?
1717 Make sure to set diff count to 0 just before counting them
1718 Src: DiffWrapper.cpp
1721 PATCH: [ 1426499 ] Move Save Projectfile to File menu
1722 Src: DirDoc.cpp DirDoc.h MainFrm.cpp MainFrm.h Merge.rc MergeDoc.cpp
1723 MergeDoc.h OpenDlg.cpp OpenDlg.h resource.h
1724 Src/Languages/*: Merge*.rc
1727 PATCH: [ 1424884 ] Fix UniStdioFile encoding of TCHAR
1728 BUG: [ 1402379 ] A character display and save error with encoding of unicode
1729 Src\Common: UniFile.cpp unicoder.cpp unicoder.h
1732 Current selftests status: Failure count: 0 (of 756)
1735 PATCH: [ 1426552 ] Add selftests between platform versions
1736 Src: Changes.txt ConfigLog.cpp DiffWrapper.cpp DiffWrapper.h
1737 DirDoc.cpp MainFrm.cpp MergeArgs.cpp MergeDoc.cpp
1738 MergeDocLineDiffs.cpp OptionsDef.h OptionsInit.cpp PatchTool.cpp
1739 PropCompare.cpp PropCompare.h
1740 Src\editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h
1743 Current selftests status: Failure count: 0 (of 588)
1746 PATCH: [ 1424867 ] Fix common prefix code for \r\n
1747 Src\diffutils\src: IO.C
1748 PATCH: [ 1426793 ] Fix diffutils that counts lines in suffix
1749 Src\diffutils\src: IO.C
1752 Current selftests status: Failure count: 0 (of 588)
1755 PATCH: [ 1424535 ] Czech Translation, Submitted by Jan Hryz
1756 Fix dir compare report dialog layout
1758 Src/Languages/*: Merge*.rc
1761 Synchronizing Slovak translation to English where feasible.
1762 Src/Languages/Slovak: MergeSlovak.rc
1763 Synchronizing Swedish translation to English where feasible.
1764 Src/Languages/Swedish: MergeSwedish.rc
1765 PATCH: [ 1392413 ] Track lossy encodings & warn user
1766 Src: FileFilterMgr.cpp Merge.rc MergeDoc.cpp files.h resource.h
1767 Src/Common: UniFile.cpp UniFile.h unicoder.cpp
1768 PATCH: [ 1392413 ] Track lossy encodings & warn user
1769 Src/Languages/*: Merge*.rc
1772 PATCH: [ 1414201 ] Cleanup Merge Line Flags
1773 Src: LocationView.cpp Merge.dsp MergeDiffDetailView.cpp MergeDoc.cpp
1774 MergeEditView.cpp MergeEditView.h
1775 NEW Src: MergeLineFlags.h
1778 PATCH: [ 1424264 ] Use 'Item' instead of file in View-menu
1780 Src/Language: */Merge*.rc
1783 Fix Italian Edit/Options/Editor line selection controls.
1784 Src/Languages/Italian/MergeItalian.rc
1785 PATCH: [ 1414904 ] updated italian translation for winmerge 2.5.3.1
1786 Submitted by A. Decorte
1787 New updates for selecting current diffs and wrap lines.
1788 Src/Languages/Italian/MergeItalian.rc
1791 BUG: [ 1422257 ] Wrong text in tooltip
1792 (Dutch translation had wrong shortcut keys in tooltip)
1793 Src/Languages/Dutch/MergeDutch.rc
1794 PATCH: [ 1424535 ] Czech Translation
1795 Submitted by Jan Hryz
1796 Src/Languages/Czech/MergeCzech.rc
1799 PATCH: [ 1424142 ] Wrap two lwdisp macros in ifndef
1800 Src/Common: lwdisp.h
1801 Undo PATCH: [ 1424142 ] Wrap two lwdisp macros in ifndef
1802 Src/Common: lwdisp.h
1803 BUG: [ 1383052 ] warning C4005: 'COMPILE_MULTIMON_STUBS' : macro redefinition
1804 (Wrap multimon def with ifndef
1806 PATCH: [ 1423461 ] Rearrange language select dialog
1807 Revise patch applied earlier: put Ok on left and Cancel on right.
1808 (Also fix French dialog which was left out before.)
1810 Src/Languages: */Merge*.rc
1811 PATCH: [ 1421199 ] Fix plugin menu for when location or diff detail view active
1812 Src: ChildFrm.cpp ChildFrm.h MainFrm.cpp MainFrm.h MergeDoc.cpp MergeDoc.h
1813 PATCH: [ 1414904 ] updated italian translation for winmerge 2.5.3.1
1814 Submitted by A. Decorte
1815 Src/Languages/Italian: MergeItalian.rc
1816 PATCH: [ 1423907 ] Fix diffutils hashing of \r
1817 Src/diffutils: IO.C UTIL.C
1818 Current selftests status: Failure count: 0 (of 480)
1819 Created branch "R_diffutils_branch"
1822 PATCH: [ 1409651 ] fix diffutils handling trailing whitespace
1823 Src/diffutils/src: IO.C UTIL.C
1824 Current selftests status: Failure count: 24 (of 480)
1825 Failing -b t002 (u & m platforms, all 4 builds)
1826 Failing -bi t002 (u & m platforms, all 4 builds)
1827 Failing -b bug1406950 (u & m platforms, all 4 builds)
1830 PATCH: [ 1423060 ] Modify perl selftest to test all 4 builds
1832 Current selftests status: Failure count: 36 (of 480)
1833 Failing -b t002 (all 3 platforms, all 4 builds)
1834 Failing -bi t002 (all 3 platforms, all 4 builds)
1835 Failing -b bug1406950 (all 3 platforms, all 4 builds)
1836 PATCH: [ 1421694 ] Widen comments label in Rational ClearCase dialog
1838 Src/Languages: */Merge*.rc
1839 PATCH: [ 1423461 ] Rearrange language select dialog
1840 Src: MainFrm.cpp MainFrm.h Merge.rc OpenDlg.cpp OpenDlg.h
1841 Src/Common: LanguageSelect.cpp LanguageSelect.h
1842 Src/Languages: */Merge*.rc
1845 PATCH: [ 1422052 ] Correction of Swedish for 2.5.3.1+
1846 Contributed by Hans Eriksson
1847 Src/Languages/Swedish: Merge Swedish
1850 PATCH: [ 1412386 ] Adding readme files
1851 New WinMerge/readme.txt
1852 (Various other directories affected -- readme.txt & Changes.txt files)
1855 PATCH: [ 1419329 ] Select Line Difference
1856 Src: Merge.rc MergeDiffDetailView.cpp MergeDiffDetailView.h MergeEditView.cpp
1857 MergeEditView.h resource.h
1858 Src/Language: */Merge*.rc
1861 BUG: [ 1419317 ] link error on 8-bit cvs trunk
1862 Add HtmlHelp.lib to link lines MergeRelease, MergeDebug, MergeUnicodeRelease.
1864 PATCH: [ 1419582 ] Polish translation update for latest v2.5
1865 Contributed by dr_prozac
1866 Src/Languages/Polish: MergePolish.rc
1867 PATCH: [ 1421018 ] Fix handle leak in GetOpenFileName
1868 BUG: [ 1418765 ] 2.4.4.0U maintain opened a handle on folders
1869 Adds new method paths_GetWindowsDirectory & resets current
1870 directory to WINDIR after GetOpenFileName call
1871 Src: MainFrm.cpp OpenDlg.cpp paths.cpp paths.h
1872 Cosmetic: synchronizing whitespace to English version
1873 Src/Languages/*: MergeTurkish.rc MergeSwedish.rc MergeSpanish.rc
1874 Cosmetic: synchronizing whitespace to English version
1875 Src/Languages/*: MergePolish.rc
1876 Updating Polish dialog control layout to English (except where
1877 would hinder appearance)
1878 Src/Languages/*: MergePolish.rc
1881 PATCH: [ 1419171 ] Various Updates in German Translation for WinMerge 2.5
1882 Src/Languages/German: MergeGerman.rc
1885 PATCH: [ 1415895 ] Split cmdline help string into chunks
1886 Src: Merge.cpp Merge.h Merge.rc MergeArgs.cpp resource.h
1887 Src/Languages: */*.rc
1890 PATCH: [ 1414904 ] updated italian translation for winmerge 2.5.3.1
1891 Submitted by A. Decorte
1892 InnoSetup\Languages: Italian.isl
1893 PATCH: [ 1415165 ] Updated Swedish translation for 2.5.3.1+
1894 Submitted by Hans Eriksson
1895 Src\Languages\Swedish: MergeSwedish.rc
1896 PATCH: [ 1414195 ] Delete two old TODO notes
1898 PATCH: [ 1414196 ] Delete useless CChildFrame::OnNotify method
1899 Src: ChildFrm.cpp ChildFrm.h
1900 PATCH: [ 1414199 ] Fix outdated comment on DirView.cpp :: NumToStr
1904 PATCH: [ 1413230 ] Use HtmlHelp API to open help
1905 Src: MainFrm.cpp Merge.dsp
1908 BUG: [ 1412237 ] InitOption return value wrong if RegCreateKey fails
1909 Fix unused wrong return value of InitOption & improve one comment
1910 Src/Common: OptionsMgr.cpp
1911 BUG: [ 1414868 ] Bug in byte_compare (early finish)
1912 (Also added some comments.)
1913 Src: DiffWrapper.cpp
1915 2006-01-24 WinMerge experimental release 2.5.3.1 (cvs)
1918 PATCH: [ 1406840 ] Use HTMLHelp locally
1920 PATCH: [ 1411727 ] Merge inactive diff when cursor is inside it
1921 Src: MergeDoc.cpp MergeDoc.h MergeEditView.cpp MergeEditView.h
1924 Add repro files to selftests from
1925 BUG [ 1406950 ] QuickCompare vs diffutils, disagree on trailing whitespace
1926 Current selftests status: Failure count: 9 (of 108)
1927 Failing -b t002 (all 3 platforms)
1928 Failing -bi t002 (all 3 platforms)
1929 Failing -b bug1406950 (all 3 platforms)
1930 PATCH: [ 1406950 ] QuickCompare vs diffutils, disagree on trailing whitespace
1931 Src: ByteComparator.cpp
1932 (selftests results unimproved, because selftest uses diffutils core, not QuickCompare)
1935 PATCH: [ 1405540 ] Cleanup filters dialog
1936 Src: FileFiltersDlg.cpp FileFiltersDlg.h
1939 PATCH: [ 1411102 ] Add '*.dsl' and '*.jsp' to syntax highlighter
1940 Src/editlib: ccrystaleditview.cpp
1943 PATCH: [ 1411406 ] self-tests and new arguments and new diff2winmerge.exe
1944 Src: Changes.txt MainFrm.cpp MainFrm.h Merge.cpp Merge.h MergeArgs.cpp
1945 Src/Common: OptionsMgr.cpp OptionsMgr.h
1946 New directory WinMerge/diff2winmerge, for diff2winmerge utility
1947 New directory WinMerge/selftests added
1948 Current selftests status: Failure count: 6 (of 108)
1949 Failing -b t002 (all 3 platforms)
1950 Failing -bi t002 (all 3 platforms)
1953 PATCH: [ 1411150 ] Add GetActiveMergeView for MergeDoc
1954 Src: MergeDoc.cpp MergeDoc.h
1957 PATCH: [ 1407740 ] Polish translation update (for version 2.4.4.0)
1958 Submitted by dr_prozac
1959 (Perry merging many of these to cvs trunk)
1960 Src/Language/Polish: MergePolish.rc
1963 BUG: [ 1408587 ] Unused DoScroll() function in Merge*View
1964 Remove DoScroll() from CMergeEditView and CMergeDiffDetailView
1965 Src: MergeDiffDetailView.cpp MergeDiffDetailView.h MergeEditView.cpp
1969 PATCH: [ 1406207 ] Fix error message for unique folders
1970 Src: DirView.cpp Merge.rc resource.h
1971 Src/Language: */Merge*.rc
1974 PATCH: [ 1401711 ] A hybrid of word diff and char diff
1975 Submitted by Takashi Sawanaka
1976 Src: MergeDocLineDiffs.cpp PropEditor.cpp
1977 stringdiffs.cpp stringdiffs.h
1980 PATCH: [ 1406203 ] Open unique files to external editor
1981 Src: DirView.cpp Merge.rc resource.h
1982 Src/Language: */Merge*.rc
1985 PATCH: [ 1333600 ] Get rid of global MainFrame pointer (part1)
1986 Src: DirActions.cpp DirDoc.cpp DirView.cpp FileActionScript.cpp
1987 MainFrm.cpp MainFrm.h Merge.cpp MergeDoc.cpp MergeEditView.cpp
1988 OpenDlg.cpp PropRegistry.cpp
1989 Src\Common: PreferencesDlg.cpp
1992 PATCH: [ 1403457 ] Support Unicode file filter files
1993 Src: FileFilterMgr.cpp
1996 PATCH: [ 1372044 ] Add FileActionScript for folder compare actions
1997 Src: DirActions.cpp DirView.h Merge.dsp
1998 Src new files: FileActionScript.cpp FileActionScript.h
1999 PATCH: [ 1385672 ] Replace some 'file's with 'item's
2001 Src/Language: */Merge*.rc
2002 PATCH: [ 1405340 ] Add XP shadow to folderskip.ico
2004 Src/res: folderskip.ico
2007 TODO: [ 1395638 ] CChildFrame::PreCreateWindow() does nothing
2008 Src: ChildFrm.cpp ChildFrm.h MainFrm.cpp
2011 PATCH: [ 1403454 ] Add comment to UniStdioFile.h
2013 Src/Common: UniFile.h
2014 PATCH: [ 1403893 ] Fix whitespace error in ByteCompare
2015 BUG: [ 1400779 ] Whitespace bug in ByteComparator
2016 Src: ByteComparator.cpp
2019 PATCH: [ 1039677 ] Alter text of Reset button label
2021 Src/Language: */Merge*.rc
2024 PATCH: [ 1399263 ] Captioned panes (new style)
2025 Src: ChildFrm.cpp DiffViewBar.h LocationBar.h Merge.dsp Merge.rc resource.h
2026 Src/Common new files: scbarcf.cpp scbarcf.h
2027 Src/Language: */Merge*.rc
2028 PATCH: [ 1399738 ] Filename bars to use caption colors
2029 Src: ChildFrm.cpp FilePathEdit.cpp FilePathEdit.h
2032 PATCH: [ 1403412 ] German: Option 'Line Difference Coloring' looks broken
2033 Src/Languages/German: MergeGerman.rc
2035 2006-01-11 WinMerge beta release 2.5.2
2038 PATCH: [ 1402774 ] Use dark red color for 'binarydiff.ico'
2040 Src/res: binarydiff.ico
2041 PATCH: [ 1400845 ] Allow Shift+Ctrl+F3 to search selected text backwards
2042 With addition from Takashi for Shift+F3 backwards search
2044 Src/editlib: ccrystaltextview.cpp
2045 Src/Language: */Merge*.rc
2046 BUG: [ 1400829 ] Crash trying to open location pane context menu
2047 Src: LocationView.cpp
2050 PATCH: [ 1401420 ] New 'MergeDir' icon
2051 Src/res: MergeDir.ico
2054 PATCH: [ 1400830 ] Fix drop to only do LoadProjectFile when 1 file dropped
2055 BUG: [ 1400797 ] Dropping two project files doesn't work to compare them
2056 (Also fixes extension test to be case-sensitive)
2060 BUG: [ 1396222 ] CDirView::MoveSelection() is confused
2061 (Rename MoveSelection to MoveFocus & add more commenting)
2062 Src: DirActions.cpp DirView.cpp DirView.h
2065 PATCH: [ 1398064 ] Catalan translation update
2067 Src/Languages/Catalan: MergeCatalan.rc
2068 PATCH: [ 1398959 ] Implement GuessEncoding in QuickCompare
2069 Src: codepage_detect.cpp DiffWrapper.cpp DiffWrapper.h
2071 2006-01-05 WinMerge experimental release 2.5.0.5 (cvs)
2074 PATCH: [ 1393635 ] Save pane sizes and positions when they change
2075 Src: ChildFrm.cpp ChildFrm.h DiffViewBar.cpp DiffViewBar.h LocationBar.cpp
2076 LocationBar.h LocationView.cpp LocationView.h MergeDiffDetailView.cpp
2077 MergeDiffDetailView.h StdAfx.h
2078 PATCH: [ 1396413 ] Update Open dialog controls when its activated
2079 Src: OpenDlg.cpp OpenDlg.h
2082 Cosmetic; normalizing blank lines to agree with English Merge.rc
2084 Brazilian\MergeBrazilian.rc
2085 ChineseSimplified\MergeChineseSimplified.rc
2086 Korean\MergeKorean.rc
2087 Norwegian\MergeNorwegian.rc
2090 PATCH: [ 1394877 ] Find selected text with Ctrl+F3
2092 Src/editlib: ccrystaltextview.cpp
2093 Src/Language: */Merge*.rc
2094 PATCH: [ 1395584 ] Update CSizingControlBar to latest version
2095 Src: DiffViewBar.cpp DiffViewBar.h LocationBar.cpp LocationBar.h Merge.dsp StdAfx.h
2096 Src/Common: sizecbar.cpp sizecbar.h
2097 Src/Common new files: scbarg.cpp scbarg.h
2098 Src/Common deleted files: sizecbarg.cpp sizecbarg.h
2099 PATCH: [ 1383262 ] Fix bitmap leak in ShellExtension
2100 Also bump version number to 1.7.1
2102 ShellExtension: ShellExtension.rc WinMergeShell.cpp WinMergeShell.h
2105 PATCH: [ 1390104 ] fix for BUG: [ 1384069 ] Wrapped lines have incorrect column
2106 Src: MergeEditView.cpp
2107 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
2110 BUG: [ 1390849 ] cvs trunk MergeChineseSimplified doesn't compile
2111 Src/Languages: ChineseSimplified: MergeChineseSimplified.rc
2112 PATCH: [ 1212161 ] Fix handling of \r\n in ByteComparator
2113 Src: ByteComparator.cpp
2116 PATCH: [ 1383802 ] Cleanup line difference options in Editor-options
2117 Src: Merge.rc PropEditor.cpp PropEditor.h resource.h
2118 PATCH: [ 1383802 ] Cleanup line difference options in Editor-options
2120 Src/Language: */Merge*.rc
2121 PATCH: [ 1391550 ] vbs script to check & optionally merge WinMerge resources
2122 Src: new CheckTranslations.vbs
2125 PATCH: [ 1395474 ] Define WINVER for compiling with VS.net
2127 PATCH: [ 1395018 ] Small cleanup for CMergeDoc::PrimeTextBuffers()
2128 Src: DiffList.cpp DiffList.h MergeDoc.cpp
2131 PATCH: [ 1395487 ] Unused local variable in UniStdioFile::DoOpen()
2132 (Delete unused variable)
2133 Src/Common: UniFile.cpp
2134 BUG: [ 1395497 ] Unused local variables in CMergeDoc::GetWordDiffArray()
2135 (Delete unused variables)
2136 Src: MergeDocLineDiffs.cpp
2137 BUG: [ 1395494 ] stringdiffs.cpp / LastChar() returning uninitialized value?
2138 Src: stringdiffs.cpp
2141 Remove unused variable from VSSHelper.cpp/VSSHelper::ReLinkVCProj()
2145 PATCH: [ 1392647 ] Prefix members with m_ in storage_for_plugins
2146 Src/Common: multiformatText.cpp multiformatText.h
2147 PATCH: [ 1394717 ] Fix resource.h include for translations
2148 Src/Languages: */Merge*.rc
2149 Src/Languages deleted: UpdateAll_resource_h.bat
2150 Src/Languages deleted: */resource.h (localized versions of resource.h)
2151 BUG: [ 1395107 ] MergeKorean.rc not compile in cvs trunk
2152 (resource.h => ..\..\resource.h fix missed Korean somehow)
2153 Src/Languages/Korean: MergeKorean.rc
2154 PATCH: [ 1394073 ] Fix ByteComparator: m_bol0
2155 (Change in ByteComparator.h is cosmetic typo fix in comment)
2156 (Fixes some bad tabbing as well)
2157 Src: ByteComparator.cpp ByteComparator.h
2160 PATCH: [ 1394759 ] Allows quotes in Rational ClearCase checkout comment
2161 Submitted by Gal Hammer
2163 Add Gal Hammer to contributors list
2164 Docs/Users: Contributors.txt
2167 BUG: [ 1394857 ] cvs trunk does not compile, ANSI, FindEncodingIdFromNameOrAl
2168 Src: codepage_detect.cpp
2171 PATCH: [ 1392347 ] Fix status after synching unique binary files
2173 PATCH: [ 1394464 ] Find again code doesn't recognize dos/mac EOLs
2174 Src/editlib: ccrystaltextview.cpp
2175 BUG: [ 1394851 ] cvs trunk does not compile (DirScan.cpp, sRule)
2179 PATCH: [ 1394247 ] Fix GuessEncoding recognition of codepages
2180 BUG: [ 1394234 ] GuessEncodings fails to recognize CP-437
2181 Src: codepage_detect.cpp
2182 PATCH: [ 1393979 ] Delete unused DiffWrapper fnc cleanup_script
2183 Src: DiffWrapper.cpp
2186 PATCH: [ 1391732 ] Do not offer to unify codepages in UNICODE build
2187 Also introduces new error IDS_DIFFERENT_UNICODINGS and new
2188 global function IsUnicodeBuild.
2190 Doing language synchronizations for this patch.
2192 Languages\Brazilian\MergeBrazilian.rc
2193 Languages\Bulgarian\MergeBulgarian.rc
2194 Languages\Catalan\MergeCatalan.rc
2195 Languages\ChineseSimplified\MergeChineseSimplified.rc
2196 Languages\ChineseTraditional\MergeChineseTraditional.rc
2197 Languages\Czech\MergeCzech.rc
2198 Languages\Danish\MergeDanish.rc
2199 Languages\Dutch\MergeDutch.rc
2200 Languages\German\MergeGerman.rc
2201 Languages\Hungarian\MergeHungarian.rc
2202 Languages\Italian\MergeItalian.rc
2203 Languages\Japanese\MergeJapanese.rc
2204 Languages\Korean\MergeKorean.rc
2205 Languages\Norwegian\MergeNorwegian.rc
2206 Languages\Polish\MergePolish.rc
2207 Languages\Russian\MergeRussian.rc
2208 Languages\Slovak\MergeSlovak.rc
2209 Languages\Spanish\MergeSpanish.rc
2210 Languages\Swedish\MergeSwedish.rc
2211 Languages\Turkish\MergeTurkish.rc
2212 PATCH: [ 1212368 ] Display correct paths in context patches
2214 Revising patched code, removing unneeded dispname added when patch applied
2215 Src: DiffWrapper.cpp
2216 diffutils\src: CONTEXT.C DIFF.H
2217 PATCH: [ 1393239 ] Split functions out of RunFileDiff
2218 Src: DiffWrapper.cpp DiffWrapper.h
2219 PATCH: [ 1392229 ] Fix Column item handling
2220 Src: DirView.h DirViewColHandler.cpp DirViewColItems.cpp
2224 PATCH: [ 1390774 ] Rename CRegOptions to CRegOptionsMgr
2225 Docs\Developers: Options.html
2226 Src\Common: OptionsMgr.cpp OptionsMgr.h
2227 Src: FileTransform.cpp MainFrm.cpp MainFrm.h SyntaxColors.cpp
2228 SyntaxColors.h codepage.h
2229 PATCH: [ 1392650 ] Fix locals of CDiffWrapper::RunFileDiff
2230 Src: DiffWrapper.cpp DiffWrapper.h MergeDoc.cpp PatchTool.cpp
2231 PATCH: [ 1392729 ] Cleanup variables in RunFileDiff
2232 Src: DiffWrapper.cpp
2233 BUG: [ 1369646 ] Confusing half-commented lines in DiffFileData::prepAndCompa
2234 Src: DiffWrapper.cpp
2235 BUG: [ 1392740 ] Clutter in debug output
2237 PATCH: [ 1391766 ] Sync language resources to English
2239 Languages\Brazilian\MergeBrazilian.rc
2240 Languages\Bulgarian\MergeBulgarian.rc
2241 Languages\Catalan\MergeCatalan.rc
2242 Languages\ChineseSimplified\MergeChineseSimplified.rc
2243 Languages\ChineseTraditional\MergeChineseTraditional.rc
2244 Languages\Czech\MergeCzech.rc
2245 Languages\Danish\MergeDanish.rc
2246 Languages\Dutch\MergeDutch.rc
2247 Languages\German\MergeGerman.rc
2248 Languages\Hungarian\MergeHungarian.rc
2249 Languages\Italian\MergeItalian.rc
2250 Languages\Japanese\MergeJapanese.rc
2251 Languages\Korean\MergeKorean.rc
2252 Languages\Norwegian\MergeNorwegian.rc
2253 Languages\Polish\MergePolish.rc
2254 Languages\Russian\MergeRussian.rc
2255 Languages\Slovak\MergeSlovak.rc
2256 Languages\Spanish\MergeSpanish.rc
2257 Languages\Swedish\MergeSwedish.rc
2258 Languages\Turkish\MergeTurkish.rc
2259 PATCH: [ 1212368 ] Display correct paths in context patches
2260 Src: DiffWrapper.cpp DiffWrapper.h
2261 diffutils\src: CONTEXT.C DIFF.H
2262 PATCH: [ 1390454 ] new commandline arguments (prediffer, ignorews...)
2263 Src: ConfigLog.cpp DirDoc.cpp DirDoc.h FileTransform.cpp
2264 MainFrm.cpp MainFrm.h Merge.cpp Merge.dsp Merge.h
2265 MergeEditView.cpp MergeEditView.h
2266 PluginManager.cpp PluginManager.h Plugins.cpp Plugins.h
2268 Src New files: MergeArgs.h MergeArgs.cpp
2269 Src/Common: CmdArgs.cpp CmdArgs.h OptionsMgr.cpp OptionsMgr.h
2272 PATCH: [ 1391732 ] Do not offer to unify codepages in UNICODE build
2273 Also introduces new error IDS_DIFFERENT_UNICODINGS and new
2274 global function IsUnicodeBuild.
2275 Src: ConfigLog.cpp MainFrm.cpp Merge.rc resource.h StdAfx.cpp StdAfx.h
2278 PATCH: [ 1390793 ] New global function GetOptionMgr
2279 Src: DirActions.cpp DirDoc.cpp DirView.cpp DirViewColHandler.cpp
2280 LocationView.cpp MainFrm.cpp MainFrm.h MergeDiffDetailView.cpp
2281 MergeDoc.cpp MergeEditView.cpp OpenDlg.cpp
2282 Src/Common: OptionsMgr.h
2285 PATCH: [ 1382130 ] New line-based RCLocalizationHelper
2289 PATCH: [ 1388704 ] Simplified Chinese language .rc file for RC1
2290 Src/Languages/ChineseSimplified: MergeChineseSimplified.rc
2291 Update language versions of resource.h
2292 Src/Languages/*: resource.h
2295 Update & synchronize translations: Danish Dutch French Hungarian Italian Japanese
2298 Danish: MergeDanish.rc
2299 Dutch: MergeDutch.rc
2300 French: MergeFrench.rc
2301 Hungarian: MergeHungarian.rc
2302 Italian: MergeItalian.rc
2303 Japanese: MergeJapanese.rc
2304 Remove needless cast
2305 Src/Common: unicoder.cpp
2306 Update & synchronize translations: Korean Norwegian Polish Russian
2309 Korean: MergeKorean.rc
2310 Norwegian: MergeNorwegian.rc
2311 Polish: MergePolish.rc
2312 Russian: MergeRussian.rc
2315 PATCH: [ 1388456 ] Convert rest of folder compare bitmaps to icons
2316 Icons from Tim (Thanks!)
2317 Src: CompareStatisticsDlg.cpp DirView.cpp Merge.dsp Merge.rc resource.h
2318 Src/res added files: binarydiff.ico equalbinary.ico equalfile.ico error.ico
2319 fileskip.ico folderup.ico folderup_disable.ico lfile.ico notequalfile.ico
2320 rfile.ico sigma.ico unknown.ico
2321 Src/res removed files: binary.bmp binarydiff.bmp error.bmp fileskip.bmp
2322 folderup.bmp folderup_disable.bmp lfile.bmp notequal.bmp rfile.bmp
2323 sigma.bmp unknown.bmp
2324 Src/Languages: *.rc resource.h
2326 2005-12-21 WinMerge experimental release 2.5.0.4 (cvs)
2329 BUG: [ 1385518 ] Batch file syntax highlighting weirdness
2331 Src/editlib: batch.cpp
2332 PATCH: [ 1387297 ] Swedish translation update for 2.5.0.3+
2333 Submitted by Hans Eriksson
2334 Src/Languages/Swedish: MergeSwedish.rc
2337 PATCH: [ 1386442 ] Local variable uses m_ prefix in CChildFrame
2341 PATCH: [ 1384646 ] Replace Question icons with warning icons in messageboxes
2342 Src: DirActions.cpp FileFiltersDlg.cpp MainFrm.cpp MergeDoc.cpp PatchDlg.cpp
2345 PATCH: [ 1383120 ] Fix background colors in WinMerge
2346 Src: SyntaxColors.cpp SyntaxColors.h
2347 Src/Common: OptionsMgr.cpp OptionsMgr.h
2348 PATCH: [ 1384181 ] Fix byte difference fencepost/infinite loop
2349 Src: CompareOptions.h ConfigLog.cpp DiffWrapper.cpp DiffWrapper.h
2350 Merge.dsp PatchDlg.cpp stringdiffs.cpp
2353 BUG: [ 1379277 ] typo fix for docs
2354 Docs/Developers: Plugins.html
2355 BUG: [ 1375661 ] Readme incomplete in WinMerge 2.5.0.3
2356 Docs/Users: ReadMe.txt
2357 PATCH: [ 1382966 ] Remove empty CMergeEditView::AddMod() and ResetMod()
2358 Src: MergeEditView.cpp MergeEditView.h
2361 PATCH: [ 1378771 ] Fix for BUG:[ 1376552 ] char offset not getting updated when...
2362 Src: ChildFrm.cpp MergeEditView.cpp
2365 PATCH: [ 1378795 ] The searched word is not highlighted correctly
2366 Src/editlib: ccrystaltextview.cpp
2369 PATCH: [ 1382955 ] Remove unused CompareStats.h include from DirFrame.cpp
2371 PATCH: [ 1376711 ] Change CFile::GetStatus to paths_DoesPathExist
2372 Src: files.cpp MainFrm.cpp MainFrm.h Merge.cpp MergeDoc.cpp OpenDlg.cpp
2374 Src/Common: coretools.cpp
2377 PATCH: [ 1381984 ] Folder compare progressdialog could be drawn off-screen
2378 Src: DirCompProgressDlg.cpp
2381 PATCH: [ 1380083 ] Fix EditBinaryFiles Plugin BuildTmp paths
2382 Plugins\src_VCPP\EditBinaryFiles: EditBinaryFiles.dsp
2385 PATCH: [ 1381975 ] Don't open Open-dialog outside screen
2386 Src: MainFrm.cpp OpenDlg.cpp
2387 Src removed file: multimon.h
2390 BUG: [ 1380019 ] Bulgarian translation has wrong language id
2391 Src/Languages/Bulgarian: MergeBulgarian.rc
2392 PATCH: [ 1382131 ] English rc file has numbers instead of symbols for language
2394 PATCH: [ 1379227 ] Fix ExpatLibs BuildTmp paths
2395 Src/ExpatLib: expat_static.dsp
2396 Src/ExpatMapLib: expat_maps_static.dsp
2397 PATCH: [ 1379228 ] Fix Merge7zInstaller BuildTmp paths
2398 Merge7zInstaller: Merge7zInstaller.dsp
2401 PATCH: [ 1381935 ] Simplify DirView icon loading
2405 BUG: [ 1382021 ] Merge7z432 missing?
2406 Merge7z new files: Merge7z431.dsp Merge7z432.dsp
2409 PATCH: [ 1188787 ] New Chinese translation rc file (from PATCH 1183476)
2410 Some more synchronizing from submitted patch
2411 Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
2412 PATCH: [ 1379226 ] Fix Display Plugins BuildTmp paths
2414 PATCH: [ 1188787 ] New Chinese translation rc file (from PATCH 1183476)
2415 Last updates from submitted patch
2416 Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
2417 BUG: [ 1381879 ] Unused variable in unicoder.cpp
2418 Src/common: unicoder.cpp
2421 Update & synchronize translations: ChineseTraditional Czech Danish Dutch
2423 ChineseTraditional: MergeChineseTraditional.rc
2424 Czech: MergeCzech.rc
2425 Danish: MergeDanish.rc
2426 Dutch: MergeDutch.rc
2427 Update & synchronize translations: French German Hungarian Italian Japanese
2429 French: MergeFrench.rc
2430 German: MergeGerman.rc
2431 Hungarian: MergeHungarian.rc
2432 Italian: MergeItalian.rc
2433 Japanese: MergeJapanese.rc
2436 PATCH: [ 1379894 ] Fix handling of unknown encoding
2438 Src/Common: unicoder.cpp
2439 Update & synchronize translations: Brazilian Bulgarian Catalan ChineseSimplified
2441 Brazilian: MergeBrazilian.rc
2442 Bulgarian: MergeBulgarian.rc
2443 Catalan: MergeCatalan.rc
2444 ChineseSimplified: MergeChineseSimplified.rc
2447 PATCH: [ 1378174 ] Share Src/res between translations
2449 Src/Languages/res: removed .bmp .cur and .ico files and WinMergeSplash.psd
2450 splash1.bmp and splash WinMergeSplash.psd not removed from Catalan
2453 PATCH: [ 1377545 ] Remove needless casts
2456 PATCH: [ 1372549 ] readme for Merge7z distributables
2460 PATCH: [ 1371994 ] Enable hi-color icons for folder compare
2461 Icons from Tim (Thanks!)
2462 Src: CompareStatisticsDlg.cpp DirView.cpp Merge.rc resource.h
2463 res new files: folder.ico folderskip.ico lfolder.ico rfolder.ico
2464 res deleted files: folder.bmp folderskip.bmp lfolder.bmp rfolder.bmp
2465 Src/Languages: *.rc resource.h
2466 Src/Languages/res: new and deleted files like in res above
2469 PATCH: [ 1371384 ] Move Expat maps into WinMerge src
2470 Plugins\src_VCPP\DisplayXMLFiles: DisplayXMLFiles.dsp
2471 Src\ExpatMapLib added
2472 Many files moved from DisplayXMLFiles to new ExpatMapLib
2473 PATCH: [ 1373020 ] Carry unicoding, codepage, & file path together
2474 & PATCH: [ 1377545 ] Remove needless casts
2475 Src: DiffWrapper.cpp DiffWrapper.h DirScan.cpp DirView.cpp
2476 MainFrm.cpp MainFrm.h Merge.dsp MergeDoc.cpp MergeDoc.h
2477 Src\Common: RegKey.cpp
2478 NEW Src\FileLocation.h
2481 PATCH: [ 1188787 ] New Chinese translation rc file (from PATCH 1183476)
2482 Remainder of dialogs
2483 Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
2484 BUG: [ 1376825 ] infinite loop bug in byte diffs
2485 Src: stringdiffs.cpp
2486 PATCH: [ 1188787 ] New Chinese translation rc file (from PATCH 1183476)
2487 A few string resources
2488 Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
2489 PATCH: [ 1249007 ] Short size column
2490 Src: DirViewColItems.cpp locality.cpp locality.h Merge.rc resource.h
2491 PATCH: [ 1377362 ] Fix coretools to MakeResDll compiles
2492 BUG: [ 1377361 ] MakeResDll broken b/c coretools broken
2493 Src/Common: coretools.cpp
2496 PATCH: [1374728 ] Fix filter dialog delete
2497 Src: FileFilterMgr.cpp
2500 PATCH: [ 1374782 ] fix for bug 1300957 Crash on save 'unique' file comparison
2501 Submitted by Oliver Mellet, some additional comment improvements by me.
2503 Takashi is now developer, Olivier Mellet submitted a patch
2504 Docs/Users: Contributors.txt
2507 PATCH: [ 1376457 ] Need clarification in platform test in ShellExtension
2508 ShellExtension: ShellExtension.cpp
2511 fix two-line-end-markers bug that was reported in:
2512 "PATCH: [ 1372716 ] patch for RFE:[ 922992 ] Word Wrap/split long lines"
2513 Src: stringdiffs.cpp
2516 PATCH: [ 1372716 ] patch for RFE:[ 922992 ] Word Wrap/split long lines
2517 Src: Merge.rc MergeDoc.cpp MergeEditView.cpp MergeEditView.h OptionsDef.h
2518 OptionsInit.cpp resource.h
2519 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h ccrystaltextview2.cpp
2520 crystalparser.cpp editcmd.h
2521 Src/Languages: *.rc resource.h
2524 PATCH [ 1374931 ] Bugfixes & upload binary for RCLocalizationHelper
2525 (RCLocalizationHelper plugin)
2528 PATCH [ 1372575 ] Fix link for DisplayXmlFiles plugin
2529 (DisplayXMLFiles plugin)
2530 TODO [ 1341058 ] ToDoDeleteThisValidateColumnOrdering()
2531 Src: DirView.cpp DirView.h DirViewColHandler.cpp
2533 2005-12-06 WinMerge experimental release 2.5.0.3 (cvs)
2536 PATCH: [ 1372589 ] Document tildas in config
2539 PATCH: [ 1373037 ] Fix filter dialog to correctly add new filters
2541 Src: FileFiltersDlg.cpp
2542 PATCH: [ 1370183 ] ShellExtension: better way to check for WinMerge executable
2543 ShellExtension: WinMergeShell.cpp
2544 Bump ShellExtension version to 1.7.0
2545 ShellExtension: ShellExtension.rc
2548 PATCH: [ 1372974 ] Make local function "GuessEncoding_from_bytes" static
2549 Src: codepage_detect.cpp
2550 PATCH: [ 1368762 ] Fix assignment in DirScan_GetItems
2551 Also add explanatory comment, for what variable does.
2555 CMarkdown::FileImage::GuessByteOrder(), GuessCodepageEncoding(): Fix UTF-8 signature detection
2556 CMarkdown::GetTagName(): Strip bogus trailing slash in name of empty tag
2557 Src: markdown.cpp codepage_detect.cpp
2560 PATCH: [ 1335128 ] Ignore uninstalled codepages
2561 Src: MergeDoc.cpp MergeDoc.h codepage.cpp codepage_detect.cpp
2562 Src/Common: unicoder.cpp
2565 PATCH: [ 1358408 ] Import and export for options
2566 Increase buffer size
2567 Src/Common: OptionsMgr.cpp
2570 PATCH: [ 1369660 ] Delete unused variables m_msgUpdateStatus
2572 Src: DirDoc.cpp DiffContext.cpp DiffContext.h DiffThread.cpp
2576 PATCH: [ 1369657 ] Delete unused variable DiffFuncStruct::msgStatusUpdate
2578 BUG: [ 1369856 ] Crashed when interface language is changed
2580 BUG: [ 1368755 ] Want comment on format line in 7ZCommon.cpp
2581 Cosmetic: adding explanatory comment to Merge7z::Proxy::operator->
2585 PATCH: [ 1369544 ] Catalan translation update
2586 Submitted by Jordi Vilar
2587 Docs/Users/Languages: ReadMe-Catalan.txt
2588 Src/Languages/Catalan: MergeCatalan.rc
2589 PATCH: [ 1265295 ] Swap file compare panes (use pointers for buffers)
2590 Forgot to update resource.h in language folders
2591 Src/Languages: resource.h
2594 Cosmetic: add comment to DiffThread giving value of msgID variable
2595 (to help debugging).
2599 BUG: [ 1368492 ] cvs ASSERT failing
2600 Fix reversion bug from Patch [ 1265295 ]
2603 PATCH: [ 1265295 ] Swap file compare panes (use pointers for buffers)
2604 Submitted by Takashi Sawanaka
2605 Src: ChildFrm.cpp DiffList.cpp DiffList.h DirDoc.cpp EditorFilepathBar.cpp
2606 EditorFilepathBar.h LocationView.cpp LocationView.h MainFrm.cpp Merge.rc
2607 MergeDiffDetailView.cpp MergeDiffDetailView.h MergeDoc.cpp MergeDoc.h
2608 MergeDocLineDiffs.cpp MergeEditView.cpp MergeEditView.h PathContext.cpp
2609 PathContext.h resource.h
2610 Src/Languages: *.rc resource.h
2613 PATCH: [ 1336598 ] Add extensions DisplayXMLFiles plugin
2614 Add several new extensions, bump version (1.0.2.0 -> 1.0.3.0)
2615 Plugins\src_VCPP\DisplayXMLFiles:
2616 DisplayXMLFiles.dsp DisplayXMLFiles.rc WinMergeScript.cpp
2621 PATCH: [ 1241935 ] Implement Line Diff coloring on byte diffs
2622 Src: MergeDoc.cpp MergeDoc.h MergeDocLineDiffs.cpp PropEditor.cpp
2624 2005-11-23 WinMerge experimental release 2.5.0.2 (cvs)
2627 PATCH: [ 1363114 ] Add '*.ctl;*.pag;*.dsr' to Visual Basic highlighter
2628 Src/editlib: ccrystaltextview.cpp
2631 PATCH: [ 1362882 ] Remove option for autoclosing compare statepane
2632 Src: Merge.rc OptionsDef.h OptionsInit.cpp PropGeneral.cpp PropGeneral.h resource.h
2633 Src/Languages: *.rc resource.h
2634 BUG: [ 1355884 ] 2.4.2 fails to open dvd files
2635 File/folder selection dialog couldn't open read-only folders
2639 PATCH: [ 1334277 ] Show asterisk in #diffs for QuickCompare results
2640 Src: DiffWrapper.cpp DiffWrapper.h DirViewColItems.cpp
2641 PATCH: [ 1334589 ] Encoding maps for Expat parser, for DisplayXmlFiles plugin
2642 Plugins/src_VCPP/DisplayXMLFiles
2643 BUG: [ 1277320 ] Plugins.txt not up-to-date
2644 Plugins/dll/IgnoreCommentsC
2647 Merge7z DllBuild 0017
2648 Merge7z: StdAfx.h Merge7zCommon.cpp Merge7zCommon.h revision.txt
2649 Merge7z new files: Merge7z430.dsp
2650 Merge7zInstaller: Files.rc2 Installer.cpp Merge7zInstaller.dsp
2653 PATCH: [ 1358408 ] Import and export for options
2654 Src: Merge.rc resource.h
2655 Src/Common: OptionsMgr.cpp OptionsMgr.h PreferencesDlg.cpp PreferencesDlg.h
2656 Src/Languages: *.rc resource.h
2659 PATCH: [ 1349645 ] Folder Compare Statistics dialog
2660 PATCH: [ 1347787 ] Use non-modal dialog for dir compare status
2661 Src: DirDoc.cpp DirDoc.h DirFrame.cpp DirFrame.h DirView.cpp DirView.h Merge.cpp Merge.dsp
2663 Src new files: CompareStatisticsDlg.cpp CompareStatisticsDlg.h DirCompProgressDlg.cpp
2664 DirCompProgressDlg.h
2665 Src deleted files: DirCompStateBar.cpp DirCompStateBar.h
2666 Src/res new file: sigma.bmp
2667 Src/Languages: *.rc resource.h
2670 PATCH: [ 1356783 ] Use OptionsMgr in SyntaxColors class
2671 Src: MainFrm.cpp SyntaxColors.cpp SyntaxColors.h
2674 PATCH: [ 1350638 ] Move options read/write code to options panels
2675 Src: MainFrm.cpp Merge.dsp PropArchive.cpp PropArchive.h PropCodepage.cpp PropCodepage.h
2676 PropColors.cpp PropColors.h PropCompare.cpp PropCompare.h PropEditor.cpp PropEditor.h
2677 PropGeneral.cpp PropGeneral.h PropRegistry.cpp PropRegistry.h PropVss.cpp PropVss.h
2678 Src new file: IOptionsPanel.h
2679 Src/Common: PreferencesDlg.cpp PreferencesDlg.h
2682 Merge Perry's fix for OpenDlg/SelectFile() to Merge.cpp/SelectFile() (PATCH #1348733)
2684 PATCH: [ 1350489 ] Use SelectFile() for external editor selection
2685 Src: PropRegistry.cpp
2688 PATCH: [ 1327413 ] Fix bug in CDirDoc::AllowUpwardDirectory()
2689 Change CDirView::AreItemsOpenable() to consider archive files as openable
2690 Src: DirActions.cpp DirDoc.cpp DirView.cpp
2693 PATCH: [ 1337905 ] Allow comparing binary files with binary unpacker
2695 PATCH: [ 1348733 ] Fix open dialog for cvs version 2.4
2699 PATCH: [ 1335072 ] Add text to Plugins.txt to cover DisplayXMLFiles
2700 Plugins/dlls: Plugins.txt
2702 2005-11-02 WinMerge experimental release 2.5.0.1 (cvs)
2705 BUG: [ 1341243 ] Current Find string is too fragile
2706 Was resetting find string after rescanning
2707 Src/editlib: ccrystaltextview.cpp
2708 PATCH: [ 1342550 ] Modernize file selection dialog
2709 PATCH: [ 1345110 ] Properly compare projectfile extension
2710 Src: Merge.cpp Merge.h OpenDlg.cpp
2711 Bump ShellExtension version to 1.6.2
2712 ShellExtension: ShellExtension.rc
2715 PATCH: [ 1345382 ] Translated Shell Extension to German
2716 ShellExtension/Languages: ShellExtensionGerman.rc
2719 RFE: [ 1324314 ] CTRL+W to close current diff
2722 PATCH: [ 1342871 ] Disable Copy Filenames for folders
2723 Src: DirView.cpp DirView.h
2724 PATCH: [ 1343059 ] Swedish translation update for 2.5.0.1 experimental
2725 Submitted by Hans Eriksson
2726 Src/Languages/Swedish: MergeSwedish.rc
2729 PATCH: [ 1341813 ] VSS project linking misdetects project files
2731 PATCH: [ 1310710 ] Fix bug #1309450
2733 Src: DiffContext.cpp DiffContext.h DiffFileInfo.cpp DiffFileInfo.h DirScan.cpp
2736 PATCH: [ 1341183 ] Fix VSS checkout canceling
2737 Src: DirActions.cpp MainFrm.cpp
2738 Open 2.4 manual (update link)
2742 PATCH: [ 1334444 ] Remove needless (& therefore confusing) cast
2743 Src: LocationView.cpp
2746 PATCH: [ 1334484 ] Skip location view paint if buffer not initialized
2747 Src: LocationView.cpp MergeDoc.cpp MergeDoc.h
2748 MergeEditView.cpp MergeEditView.h
2749 Cosmetic changes to GetFunctionsFromScript, to document
2750 arguments passed to GetTypeInfo.
2754 PATCH: [ 1333545 ] Small improvement to Open-dialog folder selection
2756 PATCH: [ 1333581 ] Increase quick compare limit and make it option
2757 Src: DiffContext.h DiffWrapper.cpp DirDoc.cpp OptionsDef.h OptionsInit.cpp
2760 PATCH: [ 1330179 ] Icon for 'Print'
2761 Src: MainFrm.cpp Merge.rc resource.h
2762 Src/res new file: print.bmp
2763 Src/Languages: *.rc resource.h
2764 Src/Languages/res new file: print.bmp
2767 PATCH: [ 1332365 ] Make some DirActions.cpp functions consts
2768 Src: DirActions.cpp DirView.h
2771 PATCH: [ 1329951 ] Readme.txt points to version 2.2 manual
2772 Docs/Users: ReadMe.txt
2773 Docs/Users/Languages: ReadMe-Catalan.txt ReadMe-Swedish.txt
2774 BUG: [ 1326621 ] Extention ".WinMerge" is omitted
2778 PATCH: [ 1330059 ] Translated 3 missing sentences to German
2779 Src/Languages/German: MergeGerman.rc
2782 PATCH: [ 1326813 ] Fix binary detection to allow archives
2786 PATCH: [ 1305541 ] Rational ClearCase support
2787 Submitted by Greg (rys1908)
2788 Src: CCPrompt.cpp CCprompt.h DirActions.cpp MainFrm.cpp MainFrm.h Merge.rc resource.h
2789 Src/Common: coretools.cpp
2790 Src/Languages: *.rc resource.h
2793 PATCH: [ 1323107 ] Patch for crash on save filenames with different cases
2794 From anonymous submitter
2796 PATCH: [ 1286629 ] print support
2797 Submitted by Markus Rollmann
2798 Src: MainFrm.cpp Merge.rc MergeEditView.cpp MergeEditView.h
2799 Src/Common: SplitterWndEx.cpp SplitterWndEx.h
2800 Src/editlib: ccrystaleditview.cpp
2802 Add Markus Rollmann to Contributors.txt
2803 Docs/Users/Contributors.txt
2806 PATCH: [ 1242008 ] Update status to binary if open fails because binary
2807 Follow on for 2nd case
2808 Src: DirView.cpp MergeDoc.cpp
2811 PATCH: [ 1302710 ] generating a report is slow
2812 Perry added comments explaining one code line
2813 Src: DirCmpReport.cpp
2816 PATCH: [ 1302710 ] generating a report is slow
2817 Submitted by Takashi Sawanaka
2818 Src: DirCmpReport.cpp
2819 PATCH: [ 1310214 ] Shell extension italian translation
2820 Submitted by Andrea Decorte
2821 ShellExtension/Languages: ShellExtensionItalian.rc
2824 PATCH: [ 1253949 ] cosmetic comment fix
2826 PATCH: [ 1253950 ] cosmetic--remove old code in InitInstance
2828 PATCH: [ 1253951 ] trivial cosmetic comment upgrade in arg parsing
2832 Merge7z DllBuild 0015
2833 Merge7z: Merge7zCommon.cpp Merge7zCommon.h revision.txt
2834 Merge7z new files: Merge7z427.dsp Merge7z428.dsp Merge7z429.dsp
2835 Merge7zInstaller update
2836 Merge7zInstaller: Files.rc2 Installer.cpp Installer.rc
2839 PATCH: [ 1309423 ] Small typo in MergeSwedish.rc
2840 Submitted by Hans Eriksson
2841 Src/Languages/Swedish: MergeSwedish.rc
2844 PATCH: [ 1229867 ] RFE [ 1205516 ], RFE [ 887948 ], and other issues
2845 Cosmetic, transcribing comment from patch discussion
2849 PATCH: [ 1302608 ] crash on generating a report
2850 Submitted by Takashi Sawanaka
2851 Src: DirCmpReport.cpp
2854 BUG: [ 1298687 ] The files marked as 'skipped' are compared
2855 Fix from Takashi Sawanaka, comment updates by me
2859 PATCH: [ 1301504 ] Danish ShellExtension translation
2860 Submitted by Christial List
2861 ShellExtension/Languages: ShellExtensionDanish.rc
2864 PATCH: [ 1297642 ] Japanese translation update
2865 Submitted by Takashi Sawanaka
2866 ShellExtension/Languages: ShellExtensionJapanese.rc
2867 Src/Languages/Japanese: MergeJapanese.rc
2870 PATCH: [ 1297406 ] updated hungarian translation
2871 Submitted by Márton Balázs
2872 Src/Languages/Hungarian: MergeHungarian.rc
2875 PATCH: [ 1295701 ] Scrolling for dir compare report filename
2878 PATCH: [ 1295758 ] Update URL for downloads page (archive options)
2879 Src: PropArchive.cpp
2882 PATCH: [ 1295767 ] German Translation for 'Highlight Line * Diff'
2883 Src/Languages/German: MergeGerman.rc
2886 PATCH: [ 1294514 ] Set file loading traces debug-only
2888 PATCH: [ 1295473 ] updated italian rc file for winmerge 2.3.6
2889 Submitted by Andrea Decorte
2890 Src/Languages/Italian: MergeItalian.rc
2893 PATCH: [ 1292120 ] More significant diff navigations fixes
2894 Src: DiffList.cpp DiffList.h MergeDoc.cpp MergeEditView.cpp
2895 BUG: [ 1290305 ] ShellExtensionU.dll info missing from config log
2899 PATCH: [ 1292279 ] Various Updates in German Translation
2900 Src/Languages/German: MergeGerman.rc
2903 PATCH: [ 1290477 ] Catalan translation update
2904 Submitted by Jordi Vilar
2905 Src/Languages/Catalan: MergeCatalan.rc
2908 PATCH: [ 1289037 ] Some (non)significant diff count fixes
2909 Src: DiffList.cpp DiffList.h MergeDoc.cpp MergeEditView.cpp
2912 PATCH: [ 1284150 ] Fix Shell Extension registering problem
2913 Also bump version to 1.6
2914 ShellExtension: ShellExtension.cpp ShellExtension.rc
2917 BUG: [ 1284304 ] StaticLink crashes after mouse over event
2918 Changed signature of CStaticLink::OnSetCursor to start with CWnd *
2919 Src\Common: StaticLink.cpp StaticLink.h
2922 PATCH: [ 1285404 ] Various Updates in German Translation
2923 Src/Languages/German: MergeGerman.rc
2926 PATCH: [ 1284890 ] Use Changes.txt instead of readme.txt for ChangeLog
2927 Added ChangeLogs folder to project, and put Changes.txt (this),
2928 readme.txt, and CHANGELO into new ChangeLogs folder.
2929 PATCH: [ 1283466 ] French translation
2930 New translation by Jean-F Jolin
2931 Src/Languages/French: MergeFrench.rc
2934 Previous change history is in file readme.txt