3 (This summarizes all changes to all files under Src, including Src\Languages.)
6 PATCH: [ 1447506 ] Don't include splash bitmap to lang files
7 Src/Languages/*: Merge*.rc
8 Remove Catalan localized splash screen
9 Src/Languages/Catalan/res removed files: splash1.bmp WinMergeSplash.psd
10 BUG: [ 1447851 ] Not enough space for version info in new splash screen
12 PaTCH: [ 1445377 ] WinMerge Logos (72 DPI)
13 Submitted by Alexander Skinner
14 Add new folder Docs/Logos
15 New Docs/Logos files: readme.txt WinMerge_logo_24bit.png
16 WinMerge_logo_shadow_24bit.png WinMerge_logo_shadow_trans.tif
17 WinMerge_logo_trans.gif
20 BUG: [ 1441389 ] Comparing root directory - mysterious
24 PATCH: [ 1447539 ] Add explanatory comment to CCrystalTextBuffer::MoveLine
25 Src/editlib: ccrystaltextbuffer.cpp
26 PATCH: [ 1447547 ] Add more comments to CMergeDoc::PrimeTextBuffers
30 Remove unneeded splash image (Splash2.bmp) as noted in Patch item #1441392
31 Src/res removed file: Splash2.bmp
34 PATCH: [ 1445434 ] SyntaxColors scrambling reg values
37 2006-03-10 WinMerge experimental release 2.5.3.4 (cvs)
40 PATCH: [ 1445996 ] Fix wrong PgDown scrolling after mousescroll
41 Src/editlib: ccrystaltextview2.cpp
42 BUG: [ 1446648 ] cvs trunk doesn't compile
46 PATCH: [ 1441392 ] New Splash Screen
47 Submitted by Alexander Skinner
52 Update MakeResDll readme with current information (MSVC.Net 2003 works
53 now), and better explanation of how to pick a specific version.
54 MakeResDll: readme.txt
55 PATCH: [ 1443391 ] Update MakeResDll for VS.NET 2005
56 MakeResDll: MakeResDll.cpp MakeResDll.dsp MakeResDll.rc
57 StdAfx.cpp StdAfx.h readme.txt resource.h
58 New MakeResDll: Merge.ico VsVersionDlg.cpp VsVersionDlg.h
59 Bump MakeResDll version from 1.0.6.0 to 1.0.7.0.
60 MakeResDll: MakeResDll.rc
61 PATCH: [ 1442844 ] Make GetFileExt easier to understand
62 Src: MergeDoc.cpp MergeDoc.h
63 Add two minor comments to PropRegistry.
66 2006-03-06 WinMerge experimental release 2.5.3.3 (cvs)
69 BUG: [ 1444211 ] bug in current SelectFile
71 PATCH: [ 1443841 ] Add header comment to Src/Changes.txt
75 BUG: [ 1442866 ] German RC format error
76 Src/Languages/German: MergeGerman.rc
77 BUG: [ 1442865 ] languages lack generate patch & report bitmaps
78 Src/Languages/*: Merge*.rc
81 PATCH: [ 1435361 ] Fix and cleanup project file code
82 Src: DiffContext.cpp DiffContext.h DirDoc.cpp MainFrm.cpp
83 Merge.cpp Merge.h Merge.rc MergeArgs.cpp ProjectFile.cpp
85 Src/Languages/*: Merge*.rc
88 PATCH: [ 1396506 ] customizable text colors
89 Fix compilation (MSVC.NET 2003 correctly gave error that MSVC6 ignored)
90 Src: PreferencesDlg.cpp
91 PATCH: [ 1442125 ] Improvements for MakeResDll parsing
92 MakeResDll: MakeResDll.cpp MakeResDll.rc resource.h
93 Src\Common: RegKey.cpp RegKey.h
94 PATCH: [ 1442134 ] MakeResDll: check that RC file exists
95 MakeResDll: MakeResDll.cpp MakeResDll.rc resource.h
96 PATCH: [ 1442238 ] Fix MakeResDll to work with VS.NET 2003
97 MakeResDll: MakeResDll.cpp MakeResDll.rc
98 PATCH: [ 1442791 ] Update MakeResDll project
99 Add Changes.txt to project.
100 Change version copyright from "2003" to "2003-2006"
101 MakeResDll: MakeResDll.dsp MakeResDll.rc
103 2006-03-04 Perry (MSVC6)
104 Current selftests status: Failure count: 0 (of 756)
107 PATCH: [ 1396506 ] customizable text colors
108 Src: MainFrm.cpp MainFrm.h Merge.dsp Merge.rc MergeDoc.cpp
109 OptionsDef.h OptionsInit.cpp PropArchive.cpp PropArchive.h
110 PropCodepage.cpp PropCodepage.h PropColors.cpp PropColors.h
111 PropCompare.cpp PropCompare.h PropEditor.h PropGeneral.h
112 PropRegistry.h PropSyntaxColors.cpp PropSyntaxColors.h
113 PropVss.h SyntaxColors.cpp SyntaxColors.h resource.h
114 Src\Common: PreferencesDlg.cpp PreferencesDlg.h
115 Src/Languages/*: Merge*.rc
116 PATCH: [ 1439335 ] Reset cwd in Merge.cpp SelectFile
117 Src: Merge.cpp OpenDlg.cpp
118 PATCH: [ 1442082 ] Fix MakeDirs to not error if directory exists
119 Src\Common: coretools.cpp
120 PATCH: [ 1396506 ] customizable text colors
122 Src: new PropTextColors.cpp PropTextColors.h
125 PATCH: [ 1442699 ] New Changes.txt file for MakeResDll
126 Add Changes.txt change log (this file).
127 MakeResDll: new Changes.txt
128 PATCH: [ 1424636 ] New BuildOneLanguage.vbs & fix MakeResDll exit
129 MakeResDll: MakeResDll.cpp StdAfx.h
130 Src\Languages: BuildDll.bat BuildOneLanguage.vbs
133 PATCH: [ 1441387 ] Improve File Encoding dialog
135 Src/Languages/*: Merge*.rc
136 PATCH: [ 1442107 ] Move About-dialog code to separate files from Merge.cpp
137 Src: Merge.cpp Merge.dsp
138 Src new files: AboutDlg.cpp AboutDlg.h
141 PATCH: [ 1437770 ] Icons for 'Generate Patch' and 'Generate Report'
142 Src: MainFrm.cpp Merge.rc resource.h
143 Src/res new files: patch.bmp report.bmp
146 PATCH: [ 1441124 ] Improve filter test dialog
148 Src/Languages/*: Merge*.rc
151 PATCH: [ 1424535 ] Czech Translation, Submitted by Jan Hryz
152 Improve unpacker selection dialog and new filter location selection dialog
154 Src/Languages/*: Merge*.rc
157 PATCH: [ 1438233 ] New icons for 'notequalfile', 'lfile' and 'rfile'
158 Src/res: lfile.ico notequalfile.ico rfile.ico
161 PATCH: [ 1436855 ] Typo in lang files (change pactch to patch)
162 Src/Languages/*: Merge*.rc
163 BUG: [ 1440774 ] Test button for file filters enabled for no filter
164 Fix submitted by Gal Hammer
165 Src: FileFiltersDlg.cpp
166 PATCH: [ 1395847 ] Integration with Rational ClearCase
167 Submitted by Gal Hammer
168 Src: MainFrm.cpp MainFrm.h Merge.h MergeArgs.cpp MergeDoc.cpp MergeDoc.h
169 Src/Common: coretools.cpp coretools.h
172 BUG: [ 1439360 ] Native languages sometimes suppressed in Unicode Build
173 Add note to CLanguageSelect::GetNativeLanguageNameString
174 explaining why codepage check is done even for Unicode build.
175 Src/Common: LanguageSelect.cpp
178 BUG: [ 1439350 ] Russian language name in LanguageSelect?
179 Src/Common: LanguageSelect.cpp
182 PATCH: [ 1435470 ] Remove CTextFile
184 Deleted Src\Common: textfile.cpp textfile.h
185 PATCH: [ 1439229 ] Fix CMergeDoc::SanityCheckD not to dereference illegal lines
186 BUG: [ 1438390 ] Crash when editting the attached files
188 PATCH: [ 1434007 ] Move source control code out of MainFrm.cpp
189 Src: MainFrm.cpp MainFrm.h Merge.dsp
190 New Src: SourceControl.cpp
193 PATCH: [ 1437758 ] Improve diff selection when selected diff not visible
194 Src: MergeEditView.cpp MergeEditView.h
195 PATCH: [ 1431607 ] Fix worddiff highlight error
200 PATCH: [ 1437677 ] Various Updates in German Translation for WinMerge 2.5
201 Src/Languages/German: MergeGerman.rc
204 PATCH: [ 1435431 ] Fix GenerateReport lines
206 Src: DirCmpReport.cpp
207 PATCH: [ 1395721 ] VS.NET 2003 warning of SEH bug
209 PATCH: [ 1428686 ] Catalan translation update
211 Src/Languages/Catalan: MergeCatalan.rc
212 PATCH: [ 1430321 ] Swedish translation update and feedback on WinMerge 2.5.3.2
214 Src\Languages\Swedish: MergeSwedish.rc
215 PATCH: [ 1434270 ] Fix difference counts
220 PATCH: [ 1435384 ] Add context menu for diff pane
221 Src: Merge.rc MergeDiffDetailView.cpp MergeDiffDetailView.h resource.h
222 Src/Languages/*: Merge*.rc
223 PATCH: [ 1433125 ] Trap errors from filesystem during actions
224 Src: FileActionScript.cpp
227 PATCH: [ 1405603 ] New Test dialog for file filters
228 (Forgot to do all the language resources)
229 and misc RC file fixes (eg, many fixes in editor proppage)
230 New: Src/Languages: WinMerge_Resource_Discrepencies.txt
233 PATCH: [ 1405603 ] New Test dialog for file filters
234 Src: FileFilterMgr.cpp FileFilterMgr.h FileFiltersDlg.cpp
235 FileFiltersDlg.h Merge.dsp Merge.rc resource.h
236 Src new: TestFilterDlg.cpp TestFilterDlg.h
237 PATCH: [ 1433312 ] Add cvs tags to source files
238 Src: ByteComparator.cpp SharedFilterDlg.cpp StdAfx.cpp
239 TestFilterDlg.cpp TestFilterDlg.h ViewableWhitespace.cpp
240 Src/Common: SortHeaderCtrl.cpp SortHeaderCtrl.h UniFile.cpp
241 UniFile.h textfile.cpp textfile.h unicoder.cpp unicoder.h
242 varprop.cpp varprop.h version.cpp version.h
245 PATCH: [ 1178743 ] Disable lang menu if no additional langs installed
246 Src: Merge.cpp Merge.h
247 Src/Common: LanguageSelect.cpp LanguageSelect.h
250 PATCH: [ 1433931 ] Add comment before isBin checks in DirView
252 PATCH: [ 1424153 ] Remove VTS_PUI1 from lwdisp.h
253 BUG: [ 1395475 ] VTS_UI1 & VTSPUI1 macro redefinition warnings (VS.NET)
255 PATCH: [ 1433927 ] Fix external editor default and messages
256 BUG: [ 1433774 ] default editor is blank
257 Src: MainFrm.cpp Merge.cpp Merge.rc OptionsInit.cpp resource.h
258 Src/Languages/*: Merge*.rc
259 PATCH: [ 1433353 ] Fix menu resources
260 Src: MainFrm.cpp Merge.cpp Merge.rc resource.h
261 Src/Languages/*: Merge*.rc
264 PATCH: [ 1429125 ] Return number of diffs instead of true/false
268 BUG: [ 1395483 ] Signed/unsigned mismatch warning from LocationView.cpp
269 Src: LocationView.cpp
272 BUG: [ 1395475 ] VTS_UI1 & VTSPUI1 macro redefinition warnings (VS.NET)
273 Fixed VTS_PUI1 (which previous patch for this bug missed).
277 PATCH: [ 1424535 ] Czech Translation, Submitted by Jan Hryz
278 Improve folder compare columns dialog (idea for new arrows from Catalan translation)
280 Src/Languages/*: Merge*.rc
283 PATCH: [ 1431771 ] Alter CheckTranslations.vbs to YesNoCancel
284 Src/Languages: CheckTranslations.vbs
285 PATCH: [ 1419582 ] Polish translation update for latest v2.5
286 Contributed by dr_prozac
287 Src/Languages/Polish: MergePolish.rc
288 PATCH: [ 1431846 ] Update Czech Translation
289 Contributed by Jan Hryz
290 Src/Languages/Czech: MergeCzech.rc
291 ShellExtension/Languages/ShellExtensionCzech.rc
292 A few control adjustments matching Czech to English (many left)
293 Src/Languages/Czech: MergeCzech.rc
296 PATCH: [ 1431636 ] IgnoreEOL broken in cvs trunk
300 PATCH: [ 1431768 ] Write paths to patch files as given
304 PATCH: [ 1431205 ] Fix ViewWhitespace \r\n bug
305 BUG: [ 1431012 ] View line differences adds additional EOL char
306 Src/editlib: ccrystaltextview.cpp
307 PATCH: [ 1431197 ] Fix off-by-one highlight error
309 Fix button movement on LanguageSelect (broken by PATCH#1423461).
310 Also add cvs id comment at top, and doxygen file label.
311 Src\Common: LanguageSelect.cpp
314 BUG: [ 1197976 ] GeneratePatch file browse not intialized correctly
315 Fix submitted by Perry
319 PATCH: [ 1431131 ] Fix VS.NET 2003 compilation
320 Src\Common: coretools.cpp scbarg.cpp scbarg.h sizecbar.cpp sizecbar.h
321 Shrink Swedish dialog IDD_PROPPAGE_LARGE to same size as English
322 (all controls already were the same size anyway)
323 Src\Languages\Swedish: MergeSwedish.rc
326 PATCH: [ 1212124 ] File encoding GUI
327 Src: DiffContext.cpp DiffFileInfo.cpp DiffFileInfo.h DiffItem.cpp
328 DiffItem.h DiffThread.cpp DiffWrapper.cpp DirActions.cpp
329 DirScan.cpp DirView.cpp DirView.h DirViewColItems.cpp FileLocation.h
330 MainFrm.cpp Merge.dsp Merge.rc MergeDoc.cpp MergeDoc.h OpenDlg.cpp
331 codepage_detect.cpp codepage_detect.h resource.h
332 NEW Src: FileTextEncoding.cpp FileTextEncoding.h IntToIntMap.h
333 LoadSaveCodepageDlg.cpp LoadSaveCodepageDlg.h MergeDocEncoding.cpp
334 dlgutil.cpp dlgutil.h
337 Adjust whitespace to match English translation
338 Also update Russian options/editor controls to match English
339 Src\Languages\Russian: MergeRussian.rc
340 Src\Languages\Slovak: MergeSlovak.rc
341 Src\Languages\Swedish: MergeSwedish.rc
342 Src\Languages\Turkish: MergeTurkish.rc
343 PATCH: [ 1424681 ] Widen labels on unpacker dialog
345 Src\Languages: Merge*.rc
348 PATCH: [ 1429517 ] Fix coretools.cpp compilation (for MakeResDll)
349 Src/Common: coretools.cpp
350 PATCH: [ 1427838 ] code cleanup bottom of merge.cpp
352 Synchronizing Turkish translation to English where feasible.
353 Src/Languages/Turkish: MergeTurkish.rc
354 Update Swedish Options/Editor to current English layout
355 Src/Languages/Swedish: MergeSwedish.rc
358 PATCH: [ 1428800 ] Fix ListCopy/AllLeft
359 BUG: [ 1428791 ] All Left gave me a bunch of msgboxes
360 Src: MergeDoc.cpp MergeDoc.h
361 PATCH: [ 1428726 ] Fix for compilation under VS2005
362 Src: BCMenu.cpp DiffWrapper.cpp DirCmpReport.cpp
363 DirColsDlg.cpp DirViewColHandler.cpp GhostTextBuffer.cpp
364 MergeArgs.cpp MergeDiffDetailView.cpp MergeDoc.cpp
366 Src\Common: LanguageSelect.cpp SuperComboBox.cpp UniFile.cpp
367 coretools.cpp multiformatText.cpp scbarg.cpp scbarg.h
368 sizecbar.cpp sizecbar.h
369 Src\editlib: asp.cpp basic.cpp batch.cpp ccrystaltextview.cpp
370 cplusplus.cpp crystaltextblock.cpp csharp.cpp dcl.cpp
371 fortran.cpp html.cpp ini.cpp innosetup.cpp is.cpp java.cpp
372 lisp.cpp nsis.cpp pascal.cpp perl.cpp php.cpp python.cpp
373 rexx.cpp rsrc.cpp sgml.cpp sh.cpp siod.cpp sql.cpp
374 tcl.cpp tex.cpp xml.cpp
375 PATCH: [ 1427563 ] Give descriptive name to CMergeDoc::SaveHelper
376 Src: MainFrm.cpp MergeDiffDetailView.cpp MergeDoc.cpp
377 MergeDoc.h MergeEditView.cpp
378 PATCH: [ 1426593 ] Remove empty CMergeDoc::SetDiffViewMode()
380 Src: MergeDoc.cpp MergeDoc.h
382 2006-02-09 WinMerge experimental release 2.5.3.2 (cvs)
385 PATCH: [ 1427851 ] Small cleanup for FileFilterMgr::AddFilter()
386 Src: FileFilterMgr.cpp
387 Add Jan Hryz as Czech translator and contributor
388 Docs/Users: Contributors.txt
391 PATCH: [ 1427845 ] Double-click fails to open, no message
393 BUG: [ 1427956 ] Differences count in Folder Compare wrong?
394 Make sure to set diff count to 0 just before counting them
398 PATCH: [ 1426499 ] Move Save Projectfile to File menu
399 Src: DirDoc.cpp DirDoc.h MainFrm.cpp MainFrm.h Merge.rc MergeDoc.cpp
400 MergeDoc.h OpenDlg.cpp OpenDlg.h resource.h
401 Src/Languages/*: Merge*.rc
404 PATCH: [ 1424884 ] Fix UniStdioFile encoding of TCHAR
405 BUG: [ 1402379 ] A character display and save error with encoding of unicode
406 Src\Common: UniFile.cpp unicoder.cpp unicoder.h
409 Current selftests status: Failure count: 0 (of 756)
412 PATCH: [ 1426552 ] Add selftests between platform versions
413 Src: Changes.txt ConfigLog.cpp DiffWrapper.cpp DiffWrapper.h
414 DirDoc.cpp MainFrm.cpp MergeArgs.cpp MergeDoc.cpp
415 MergeDocLineDiffs.cpp OptionsDef.h OptionsInit.cpp PatchTool.cpp
416 PropCompare.cpp PropCompare.h
417 Src\editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h
420 Current selftests status: Failure count: 0 (of 588)
423 PATCH: [ 1424867 ] Fix common prefix code for \r\n
424 Src\diffutils\src: IO.C
425 PATCH: [ 1426793 ] Fix diffutils that counts lines in suffix
426 Src\diffutils\src: IO.C
429 Current selftests status: Failure count: 0 (of 588)
432 PATCH: [ 1424535 ] Czech Translation, Submitted by Jan Hryz
433 Fix dir compare report dialog layout
435 Src/Languages/*: Merge*.rc
438 Synchronizing Slovak translation to English where feasible.
439 Src/Languages/Slovak: MergeSlovak.rc
440 Synchronizing Swedish translation to English where feasible.
441 Src/Languages/Swedish: MergeSwedish.rc
442 PATCH: [ 1392413 ] Track lossy encodings & warn user
443 Src: FileFilterMgr.cpp Merge.rc MergeDoc.cpp files.h resource.h
444 Src/Common: UniFile.cpp UniFile.h unicoder.cpp
445 PATCH: [ 1392413 ] Track lossy encodings & warn user
446 Src/Languages/*: Merge*.rc
449 PATCH: [ 1414201 ] Cleanup Merge Line Flags
450 Src: LocationView.cpp Merge.dsp MergeDiffDetailView.cpp MergeDoc.cpp
451 MergeEditView.cpp MergeEditView.h
452 NEW Src: MergeLineFlags.h
455 PATCH: [ 1424264 ] Use 'Item' instead of file in View-menu
457 Src/Language: */Merge*.rc
460 Fix Italian Edit/Options/Editor line selection controls.
461 Src/Languages/Italian/MergeItalian.rc
462 PATCH: [ 1414904 ] updated italian translation for winmerge 2.5.3.1
463 Submitted by A. Decorte
464 New updates for selecting current diffs and wrap lines.
465 Src/Languages/Italian/MergeItalian.rc
468 BUG: [ 1422257 ] Wrong text in tooltip
469 (Dutch translation had wrong shortcut keys in tooltip)
470 Src/Languages/Dutch/MergeDutch.rc
471 PATCH: [ 1424535 ] Czech Translation
472 Submitted by Jan Hryz
473 Src/Languages/Czech/MergeCzech.rc
476 PATCH: [ 1424142 ] Wrap two lwdisp macros in ifndef
478 Undo PATCH: [ 1424142 ] Wrap two lwdisp macros in ifndef
480 BUG: [ 1383052 ] warning C4005: 'COMPILE_MULTIMON_STUBS' : macro redefinition
481 (Wrap multimon def with ifndef
483 PATCH: [ 1423461 ] Rearrange language select dialog
484 Revise patch applied earlier: put Ok on left and Cancel on right.
485 (Also fix French dialog which was left out before.)
487 Src/Languages: */Merge*.rc
488 PATCH: [ 1421199 ] Fix plugin menu for when location or diff detail view active
489 Src: ChildFrm.cpp ChildFrm.h MainFrm.cpp MainFrm.h MergeDoc.cpp MergeDoc.h
490 PATCH: [ 1414904 ] updated italian translation for winmerge 2.5.3.1
491 Submitted by A. Decorte
492 Src/Languages/Italian: MergeItalian.rc
493 PATCH: [ 1423907 ] Fix diffutils hashing of \r
494 Src/diffutils: IO.C UTIL.C
495 Current selftests status: Failure count: 0 (of 480)
496 Created branch "R_diffutils_branch"
499 PATCH: [ 1409651 ] fix diffutils handling trailing whitespace
500 Src/diffutils/src: IO.C UTIL.C
501 Current selftests status: Failure count: 24 (of 480)
502 Failing -b t002 (u & m platforms, all 4 builds)
503 Failing -bi t002 (u & m platforms, all 4 builds)
504 Failing -b bug1406950 (u & m platforms, all 4 builds)
507 PATCH: [ 1423060 ] Modify perl selftest to test all 4 builds
509 Current selftests status: Failure count: 36 (of 480)
510 Failing -b t002 (all 3 platforms, all 4 builds)
511 Failing -bi t002 (all 3 platforms, all 4 builds)
512 Failing -b bug1406950 (all 3 platforms, all 4 builds)
513 PATCH: [ 1421694 ] Widen comments label in Rational ClearCase dialog
515 Src/Languages: */Merge*.rc
516 PATCH: [ 1423461 ] Rearrange language select dialog
517 Src: MainFrm.cpp MainFrm.h Merge.rc OpenDlg.cpp OpenDlg.h
518 Src/Common: LanguageSelect.cpp LanguageSelect.h
519 Src/Languages: */Merge*.rc
522 PATCH: [ 1422052 ] Correction of Swedish for 2.5.3.1+
523 Contributed by Hans Eriksson
524 Src/Languages/Swedish: Merge Swedish
527 PATCH: [ 1412386 ] Adding readme files
528 New WinMerge/readme.txt
529 (Various other directories affected -- readme.txt & Changes.txt files)
532 PATCH: [ 1419329 ] Select Line Difference
533 Src: Merge.rc MergeDiffDetailView.cpp MergeDiffDetailView.h MergeEditView.cpp
534 MergeEditView.h resource.h
535 Src/Language: */Merge*.rc
538 BUG: [ 1419317 ] link error on 8-bit cvs trunk
539 Add HtmlHelp.lib to link lines MergeRelease, MergeDebug, MergeUnicodeRelease.
541 PATCH: [ 1419582 ] Polish translation update for latest v2.5
542 Contributed by dr_prozac
543 Src/Languages/Polish: MergePolish.rc
544 PATCH: [ 1421018 ] Fix handle leak in GetOpenFileName
545 BUG: [ 1418765 ] 2.4.4.0U maintain opened a handle on folders
546 Adds new method paths_GetWindowsDirectory & resets current
547 directory to WINDIR after GetOpenFileName call
548 Src: MainFrm.cpp OpenDlg.cpp paths.cpp paths.h
549 Cosmetic: synchronizing whitespace to English version
550 Src/Languages/*: MergeTurkish.rc MergeSwedish.rc MergeSpanish.rc
551 Cosmetic: synchronizing whitespace to English version
552 Src/Languages/*: MergePolish.rc
553 Updating Polish dialog control layout to English (except where
554 would hinder appearance)
555 Src/Languages/*: MergePolish.rc
558 PATCH: [ 1419171 ] Various Updates in German Translation for WinMerge 2.5
559 Src/Languages/German: MergeGerman.rc
562 PATCH: [ 1415895 ] Split cmdline help string into chunks
563 Src: Merge.cpp Merge.h Merge.rc MergeArgs.cpp resource.h
564 Src/Languages: */*.rc
567 PATCH: [ 1414904 ] updated italian translation for winmerge 2.5.3.1
568 Submitted by A. Decorte
569 InnoSetup\Languages: Italian.isl
570 PATCH: [ 1415165 ] Updated Swedish translation for 2.5.3.1+
571 Submitted by Hans Eriksson
572 Src\Languages\Swedish: MergeSwedish.rc
573 PATCH: [ 1414195 ] Delete two old TODO notes
575 PATCH: [ 1414196 ] Delete useless CChildFrame::OnNotify method
576 Src: ChildFrm.cpp ChildFrm.h
577 PATCH: [ 1414199 ] Fix outdated comment on DirView.cpp :: NumToStr
581 PATCH: [ 1413230 ] Use HtmlHelp API to open help
582 Src: MainFrm.cpp Merge.dsp
585 BUG: [ 1412237 ] InitOption return value wrong if RegCreateKey fails
586 Fix unused wrong return value of InitOption & improve one comment
587 Src/Common: OptionsMgr.cpp
588 BUG: [ 1414868 ] Bug in byte_compare (early finish)
589 (Also added some comments.)
592 2006-01-24 WinMerge experimental release 2.5.3.1 (cvs)
595 PATCH: [ 1406840 ] Use HTMLHelp locally
597 PATCH: [ 1411727 ] Merge inactive diff when cursor is inside it
598 Src: MergeDoc.cpp MergeDoc.h MergeEditView.cpp MergeEditView.h
601 Add repro files to selftests from
602 BUG [ 1406950 ] QuickCompare vs diffutils, disagree on trailing whitespace
603 Current selftests status: Failure count: 9 (of 108)
604 Failing -b t002 (all 3 platforms)
605 Failing -bi t002 (all 3 platforms)
606 Failing -b bug1406950 (all 3 platforms)
607 PATCH: [ 1406950 ] QuickCompare vs diffutils, disagree on trailing whitespace
608 Src: ByteComparator.cpp
609 (selftests results unimproved, because selftest uses diffutils core, not QuickCompare)
612 PATCH: [ 1405540 ] Cleanup filters dialog
613 Src: FileFiltersDlg.cpp FileFiltersDlg.h
616 PATCH: [ 1411102 ] Add '*.dsl' and '*.jsp' to syntax highlighter
617 Src/editlib: ccrystaleditview.cpp
620 PATCH: [ 1411406 ] self-tests and new arguments and new diff2winmerge.exe
621 Src: Changes.txt MainFrm.cpp MainFrm.h Merge.cpp Merge.h MergeArgs.cpp
622 Src/Common: OptionsMgr.cpp OptionsMgr.h
623 New directory WinMerge/diff2winmerge, for diff2winmerge utility
624 New directory WinMerge/selftests added
625 Current selftests status: Failure count: 6 (of 108)
626 Failing -b t002 (all 3 platforms)
627 Failing -bi t002 (all 3 platforms)
630 PATCH: [ 1411150 ] Add GetActiveMergeView for MergeDoc
631 Src: MergeDoc.cpp MergeDoc.h
634 PATCH: [ 1407740 ] Polish translation update (for version 2.4.4.0)
635 Submitted by dr_prozac
636 (Perry merging many of these to cvs trunk)
637 Src/Language/Polish: MergePolish.rc
640 BUG: [ 1408587 ] Unused DoScroll() function in Merge*View
641 Remove DoScroll() from CMergeEditView and CMergeDiffDetailView
642 Src: MergeDiffDetailView.cpp MergeDiffDetailView.h MergeEditView.cpp
646 PATCH: [ 1406207 ] Fix error message for unique folders
647 Src: DirView.cpp Merge.rc resource.h
648 Src/Language: */Merge*.rc
651 PATCH: [ 1401711 ] A hybrid of word diff and char diff
652 Submitted by Takashi Sawanaka
653 Src: MergeDocLineDiffs.cpp PropEditor.cpp
654 stringdiffs.cpp stringdiffs.h
657 PATCH: [ 1406203 ] Open unique files to external editor
658 Src: DirView.cpp Merge.rc resource.h
659 Src/Language: */Merge*.rc
662 PATCH: [ 1333600 ] Get rid of global MainFrame pointer (part1)
663 Src: DirActions.cpp DirDoc.cpp DirView.cpp FileActionScript.cpp
664 MainFrm.cpp MainFrm.h Merge.cpp MergeDoc.cpp MergeEditView.cpp
665 OpenDlg.cpp PropRegistry.cpp
666 Src\Common: PreferencesDlg.cpp
669 PATCH: [ 1403457 ] Support Unicode file filter files
670 Src: FileFilterMgr.cpp
673 PATCH: [ 1372044 ] Add FileActionScript for folder compare actions
674 Src: DirActions.cpp DirView.h Merge.dsp
675 Src new files: FileActionScript.cpp FileActionScript.h
676 PATCH: [ 1385672 ] Replace some 'file's with 'item's
678 Src/Language: */Merge*.rc
679 PATCH: [ 1405340 ] Add XP shadow to folderskip.ico
681 Src/res: folderskip.ico
684 TODO: [ 1395638 ] CChildFrame::PreCreateWindow() does nothing
685 Src: ChildFrm.cpp ChildFrm.h MainFrm.cpp
688 PATCH: [ 1403454 ] Add comment to UniStdioFile.h
690 Src/Common: UniFile.h
691 PATCH: [ 1403893 ] Fix whitespace error in ByteCompare
692 BUG: [ 1400779 ] Whitespace bug in ByteComparator
693 Src: ByteComparator.cpp
696 PATCH: [ 1039677 ] Alter text of Reset button label
698 Src/Language: */Merge*.rc
701 PATCH: [ 1399263 ] Captioned panes (new style)
702 Src: ChildFrm.cpp DiffViewBar.h LocationBar.h Merge.dsp Merge.rc resource.h
703 Src/Common new files: scbarcf.cpp scbarcf.h
704 Src/Language: */Merge*.rc
705 PATCH: [ 1399738 ] Filename bars to use caption colors
706 Src: ChildFrm.cpp FilePathEdit.cpp FilePathEdit.h
709 PATCH: [ 1403412 ] German: Option 'Line Difference Coloring' looks broken
710 Src/Languages/German: MergeGerman.rc
712 2006-01-11 WinMerge beta release 2.5.2
715 PATCH: [ 1402774 ] Use dark red color for 'binarydiff.ico'
717 Src/res: binarydiff.ico
718 PATCH: [ 1400845 ] Allow Shift+Ctrl+F3 to search selected text backwards
719 With addition from Takashi for Shift+F3 backwards search
721 Src/editlib: ccrystaltextview.cpp
722 Src/Language: */Merge*.rc
723 BUG: [ 1400829 ] Crash trying to open location pane context menu
724 Src: LocationView.cpp
727 PATCH: [ 1401420 ] New 'MergeDir' icon
728 Src/res: MergeDir.ico
731 PATCH: [ 1400830 ] Fix drop to only do LoadProjectFile when 1 file dropped
732 BUG: [ 1400797 ] Dropping two project files doesn't work to compare them
733 (Also fixes extension test to be case-sensitive)
737 BUG: [ 1396222 ] CDirView::MoveSelection() is confused
738 (Rename MoveSelection to MoveFocus & add more commenting)
739 Src: DirActions.cpp DirView.cpp DirView.h
742 PATCH: [ 1398064 ] Catalan translation update
744 Src/Languages/Catalan: MergeCatalan.rc
745 PATCH: [ 1398959 ] Implement GuessEncoding in QuickCompare
746 Src: codepage_detect.cpp DiffWrapper.cpp DiffWrapper.h
748 2006-01-05 WinMerge experimental release 2.5.0.5 (cvs)
751 PATCH: [ 1393635 ] Save pane sizes and positions when they change
752 Src: ChildFrm.cpp ChildFrm.h DiffViewBar.cpp DiffViewBar.h LocationBar.cpp
753 LocationBar.h LocationView.cpp LocationView.h MergeDiffDetailView.cpp
754 MergeDiffDetailView.h StdAfx.h
755 PATCH: [ 1396413 ] Update Open dialog controls when its activated
756 Src: OpenDlg.cpp OpenDlg.h
759 Cosmetic; normalizing blank lines to agree with English Merge.rc
761 Brazilian\MergeBrazilian.rc
762 ChineseSimplified\MergeChineseSimplified.rc
763 Korean\MergeKorean.rc
764 Norwegian\MergeNorwegian.rc
767 PATCH: [ 1394877 ] Find selected text with Ctrl+F3
769 Src/editlib: ccrystaltextview.cpp
770 Src/Language: */Merge*.rc
771 PATCH: [ 1395584 ] Update CSizingControlBar to latest version
772 Src: DiffViewBar.cpp DiffViewBar.h LocationBar.cpp LocationBar.h Merge.dsp StdAfx.h
773 Src/Common: sizecbar.cpp sizecbar.h
774 Src/Common new files: scbarg.cpp scbarg.h
775 Src/Common deleted files: sizecbarg.cpp sizecbarg.h
776 PATCH: [ 1383262 ] Fix bitmap leak in ShellExtension
777 Also bump version number to 1.7.1
779 ShellExtension: ShellExtension.rc WinMergeShell.cpp WinMergeShell.h
782 PATCH: [ 1390104 ] fix for BUG: [ 1384069 ] Wrapped lines have incorrect column
783 Src: MergeEditView.cpp
784 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
787 BUG: [ 1390849 ] cvs trunk MergeChineseSimplified doesn't compile
788 Src/Languages: ChineseSimplified: MergeChineseSimplified.rc
789 PATCH: [ 1212161 ] Fix handling of \r\n in ByteComparator
790 Src: ByteComparator.cpp
793 PATCH: [ 1383802 ] Cleanup line difference options in Editor-options
794 Src: Merge.rc PropEditor.cpp PropEditor.h resource.h
795 PATCH: [ 1383802 ] Cleanup line difference options in Editor-options
797 Src/Language: */Merge*.rc
798 PATCH: [ 1391550 ] vbs script to check & optionally merge WinMerge resources
799 Src: new CheckTranslations.vbs
802 PATCH: [ 1395474 ] Define WINVER for compiling with VS.net
804 PATCH: [ 1395018 ] Small cleanup for CMergeDoc::PrimeTextBuffers()
805 Src: DiffList.cpp DiffList.h MergeDoc.cpp
808 PATCH: [ 1395487 ] Unused local variable in UniStdioFile::DoOpen()
809 (Delete unused variable)
810 Src/Common: UniFile.cpp
811 BUG: [ 1395497 ] Unused local variables in CMergeDoc::GetWordDiffArray()
812 (Delete unused variables)
813 Src: MergeDocLineDiffs.cpp
814 BUG: [ 1395494 ] stringdiffs.cpp / LastChar() returning uninitialized value?
818 Remove unused variable from VSSHelper.cpp/VSSHelper::ReLinkVCProj()
822 PATCH: [ 1392647 ] Prefix members with m_ in storage_for_plugins
823 Src/Common: multiformatText.cpp multiformatText.h
824 PATCH: [ 1394717 ] Fix resource.h include for translations
825 Src/Languages: */Merge*.rc
826 Src/Languages deleted: UpdateAll_resource_h.bat
827 Src/Languages deleted: */resource.h (localized versions of resource.h)
828 BUG: [ 1395107 ] MergeKorean.rc not compile in cvs trunk
829 (resource.h => ..\..\resource.h fix missed Korean somehow)
830 Src/Languages/Korean: MergeKorean.rc
831 PATCH: [ 1394073 ] Fix ByteComparator: m_bol0
832 (Change in ByteComparator.h is cosmetic typo fix in comment)
833 (Fixes some bad tabbing as well)
834 Src: ByteComparator.cpp ByteComparator.h
837 PATCH: [ 1394759 ] Allows quotes in Rational ClearCase checkout comment
838 Submitted by Gal Hammer
840 Add Gal Hammer to contributors list
841 Docs/Users: Contributors.txt
844 BUG: [ 1394857 ] cvs trunk does not compile, ANSI, FindEncodingIdFromNameOrAl
845 Src: codepage_detect.cpp
848 PATCH: [ 1392347 ] Fix status after synching unique binary files
850 PATCH: [ 1394464 ] Find again code doesn't recognize dos/mac EOLs
851 Src/editlib: ccrystaltextview.cpp
852 BUG: [ 1394851 ] cvs trunk does not compile (DirScan.cpp, sRule)
856 PATCH: [ 1394247 ] Fix GuessEncoding recognition of codepages
857 BUG: [ 1394234 ] GuessEncodings fails to recognize CP-437
858 Src: codepage_detect.cpp
859 PATCH: [ 1393979 ] Delete unused DiffWrapper fnc cleanup_script
863 PATCH: [ 1391732 ] Do not offer to unify codepages in UNICODE build
864 Also introduces new error IDS_DIFFERENT_UNICODINGS and new
865 global function IsUnicodeBuild.
867 Doing language synchronizations for this patch.
869 Languages\Brazilian\MergeBrazilian.rc
870 Languages\Bulgarian\MergeBulgarian.rc
871 Languages\Catalan\MergeCatalan.rc
872 Languages\ChineseSimplified\MergeChineseSimplified.rc
873 Languages\ChineseTraditional\MergeChineseTraditional.rc
874 Languages\Czech\MergeCzech.rc
875 Languages\Danish\MergeDanish.rc
876 Languages\Dutch\MergeDutch.rc
877 Languages\German\MergeGerman.rc
878 Languages\Hungarian\MergeHungarian.rc
879 Languages\Italian\MergeItalian.rc
880 Languages\Japanese\MergeJapanese.rc
881 Languages\Korean\MergeKorean.rc
882 Languages\Norwegian\MergeNorwegian.rc
883 Languages\Polish\MergePolish.rc
884 Languages\Russian\MergeRussian.rc
885 Languages\Slovak\MergeSlovak.rc
886 Languages\Spanish\MergeSpanish.rc
887 Languages\Swedish\MergeSwedish.rc
888 Languages\Turkish\MergeTurkish.rc
889 PATCH: [ 1212368 ] Display correct paths in context patches
891 Revising patched code, removing unneeded dispname added when patch applied
893 diffutils\src: CONTEXT.C DIFF.H
894 PATCH: [ 1393239 ] Split functions out of RunFileDiff
895 Src: DiffWrapper.cpp DiffWrapper.h
896 PATCH: [ 1392229 ] Fix Column item handling
897 Src: DirView.h DirViewColHandler.cpp DirViewColItems.cpp
901 PATCH: [ 1390774 ] Rename CRegOptions to CRegOptionsMgr
902 Docs\Developers: Options.html
903 Src\Common: OptionsMgr.cpp OptionsMgr.h
904 Src: FileTransform.cpp MainFrm.cpp MainFrm.h SyntaxColors.cpp
905 SyntaxColors.h codepage.h
906 PATCH: [ 1392650 ] Fix locals of CDiffWrapper::RunFileDiff
907 Src: DiffWrapper.cpp DiffWrapper.h MergeDoc.cpp PatchTool.cpp
908 PATCH: [ 1392729 ] Cleanup variables in RunFileDiff
910 BUG: [ 1369646 ] Confusing half-commented lines in DiffFileData::prepAndCompa
912 BUG: [ 1392740 ] Clutter in debug output
914 PATCH: [ 1391766 ] Sync language resources to English
916 Languages\Brazilian\MergeBrazilian.rc
917 Languages\Bulgarian\MergeBulgarian.rc
918 Languages\Catalan\MergeCatalan.rc
919 Languages\ChineseSimplified\MergeChineseSimplified.rc
920 Languages\ChineseTraditional\MergeChineseTraditional.rc
921 Languages\Czech\MergeCzech.rc
922 Languages\Danish\MergeDanish.rc
923 Languages\Dutch\MergeDutch.rc
924 Languages\German\MergeGerman.rc
925 Languages\Hungarian\MergeHungarian.rc
926 Languages\Italian\MergeItalian.rc
927 Languages\Japanese\MergeJapanese.rc
928 Languages\Korean\MergeKorean.rc
929 Languages\Norwegian\MergeNorwegian.rc
930 Languages\Polish\MergePolish.rc
931 Languages\Russian\MergeRussian.rc
932 Languages\Slovak\MergeSlovak.rc
933 Languages\Spanish\MergeSpanish.rc
934 Languages\Swedish\MergeSwedish.rc
935 Languages\Turkish\MergeTurkish.rc
936 PATCH: [ 1212368 ] Display correct paths in context patches
937 Src: DiffWrapper.cpp DiffWrapper.h
938 diffutils\src: CONTEXT.C DIFF.H
939 PATCH: [ 1390454 ] new commandline arguments (prediffer, ignorews...)
940 Src: ConfigLog.cpp DirDoc.cpp DirDoc.h FileTransform.cpp
941 MainFrm.cpp MainFrm.h Merge.cpp Merge.dsp Merge.h
942 MergeEditView.cpp MergeEditView.h
943 PluginManager.cpp PluginManager.h Plugins.cpp Plugins.h
945 Src New files: MergeArgs.h MergeArgs.cpp
946 Src/Common: CmdArgs.cpp CmdArgs.h OptionsMgr.cpp OptionsMgr.h
949 PATCH: [ 1391732 ] Do not offer to unify codepages in UNICODE build
950 Also introduces new error IDS_DIFFERENT_UNICODINGS and new
951 global function IsUnicodeBuild.
952 Src: ConfigLog.cpp MainFrm.cpp Merge.rc resource.h StdAfx.cpp StdAfx.h
955 PATCH: [ 1390793 ] New global function GetOptionMgr
956 Src: DirActions.cpp DirDoc.cpp DirView.cpp DirViewColHandler.cpp
957 LocationView.cpp MainFrm.cpp MainFrm.h MergeDiffDetailView.cpp
958 MergeDoc.cpp MergeEditView.cpp OpenDlg.cpp
959 Src/Common: OptionsMgr.h
962 PATCH: [ 1382130 ] New line-based RCLocalizationHelper
966 PATCH: [ 1388704 ] Simplified Chinese language .rc file for RC1
967 Src/Languages/ChineseSimplified: MergeChineseSimplified.rc
968 Update language versions of resource.h
969 Src/Languages/*: resource.h
972 Update & synchronize translations: Danish Dutch French Hungarian Italian Japanese
975 Danish: MergeDanish.rc
977 French: MergeFrench.rc
978 Hungarian: MergeHungarian.rc
979 Italian: MergeItalian.rc
980 Japanese: MergeJapanese.rc
982 Src/Common: unicoder.cpp
983 Update & synchronize translations: Korean Norwegian Polish Russian
986 Korean: MergeKorean.rc
987 Norwegian: MergeNorwegian.rc
988 Polish: MergePolish.rc
989 Russian: MergeRussian.rc
992 PATCH: [ 1388456 ] Convert rest of folder compare bitmaps to icons
993 Icons from Tim (Thanks!)
994 Src: CompareStatisticsDlg.cpp DirView.cpp Merge.dsp Merge.rc resource.h
995 Src/res added files: binarydiff.ico equalbinary.ico equalfile.ico error.ico
996 fileskip.ico folderup.ico folderup_disable.ico lfile.ico notequalfile.ico
997 rfile.ico sigma.ico unknown.ico
998 Src/res removed files: binary.bmp binarydiff.bmp error.bmp fileskip.bmp
999 folderup.bmp folderup_disable.bmp lfile.bmp notequal.bmp rfile.bmp
1000 sigma.bmp unknown.bmp
1001 Src/Languages: *.rc resource.h
1003 2005-12-21 WinMerge experimental release 2.5.0.4 (cvs)
1006 BUG: [ 1385518 ] Batch file syntax highlighting weirdness
1008 Src/editlib: batch.cpp
1009 PATCH: [ 1387297 ] Swedish translation update for 2.5.0.3+
1010 Submitted by Hans Eriksson
1011 Src/Languages/Swedish: MergeSwedish.rc
1014 PATCH: [ 1386442 ] Local variable uses m_ prefix in CChildFrame
1018 PATCH: [ 1384646 ] Replace Question icons with warning icons in messageboxes
1019 Src: DirActions.cpp FileFiltersDlg.cpp MainFrm.cpp MergeDoc.cpp PatchDlg.cpp
1022 PATCH: [ 1383120 ] Fix background colors in WinMerge
1023 Src: SyntaxColors.cpp SyntaxColors.h
1024 Src/Common: OptionsMgr.cpp OptionsMgr.h
1025 PATCH: [ 1384181 ] Fix byte difference fencepost/infinite loop
1026 Src: CompareOptions.h ConfigLog.cpp DiffWrapper.cpp DiffWrapper.h
1027 Merge.dsp PatchDlg.cpp stringdiffs.cpp
1030 BUG: [ 1379277 ] typo fix for docs
1031 Docs/Developers: Plugins.html
1032 BUG: [ 1375661 ] Readme incomplete in WinMerge 2.5.0.3
1033 Docs/Users: ReadMe.txt
1034 PATCH: [ 1382966 ] Remove empty CMergeEditView::AddMod() and ResetMod()
1035 Src: MergeEditView.cpp MergeEditView.h
1038 PATCH: [ 1378771 ] Fix for BUG:[ 1376552 ] char offset not getting updated when...
1039 Src: ChildFrm.cpp MergeEditView.cpp
1042 PATCH: [ 1378795 ] The searched word is not highlighted correctly
1043 Src/editlib: ccrystaltextview.cpp
1046 PATCH: [ 1382955 ] Remove unused CompareStats.h include from DirFrame.cpp
1048 PATCH: [ 1376711 ] Change CFile::GetStatus to paths_DoesPathExist
1049 Src: files.cpp MainFrm.cpp MainFrm.h Merge.cpp MergeDoc.cpp OpenDlg.cpp
1051 Src/Common: coretools.cpp
1054 PATCH: [ 1381984 ] Folder compare progressdialog could be drawn off-screen
1055 Src: DirCompProgressDlg.cpp
1058 PATCH: [ 1380083 ] Fix EditBinaryFiles Plugin BuildTmp paths
1059 Plugins\src_VCPP\EditBinaryFiles: EditBinaryFiles.dsp
1062 PATCH: [ 1381975 ] Don't open Open-dialog outside screen
1063 Src: MainFrm.cpp OpenDlg.cpp
1064 Src removed file: multimon.h
1067 BUG: [ 1380019 ] Bulgarian translation has wrong language id
1068 Src/Languages/Bulgarian: MergeBulgarian.rc
1069 PATCH: [ 1382131 ] English rc file has numbers instead of symbols for language
1071 PATCH: [ 1379227 ] Fix ExpatLibs BuildTmp paths
1072 Src/ExpatLib: expat_static.dsp
1073 Src/ExpatMapLib: expat_maps_static.dsp
1074 PATCH: [ 1379228 ] Fix Merge7zInstaller BuildTmp paths
1075 Merge7zInstaller: Merge7zInstaller.dsp
1078 PATCH: [ 1381935 ] Simplify DirView icon loading
1082 BUG: [ 1382021 ] Merge7z432 missing?
1083 Merge7z new files: Merge7z431.dsp Merge7z432.dsp
1086 PATCH: [ 1188787 ] New Chinese translation rc file (from PATCH 1183476)
1087 Some more synchronizing from submitted patch
1088 Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
1089 PATCH: [ 1379226 ] Fix Display Plugins BuildTmp paths
1091 PATCH: [ 1188787 ] New Chinese translation rc file (from PATCH 1183476)
1092 Last updates from submitted patch
1093 Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
1094 BUG: [ 1381879 ] Unused variable in unicoder.cpp
1095 Src/common: unicoder.cpp
1098 Update & synchronize translations: ChineseTraditional Czech Danish Dutch
1100 ChineseTraditional: MergeChineseTraditional.rc
1101 Czech: MergeCzech.rc
1102 Danish: MergeDanish.rc
1103 Dutch: MergeDutch.rc
1104 Update & synchronize translations: French German Hungarian Italian Japanese
1106 French: MergeFrench.rc
1107 German: MergeGerman.rc
1108 Hungarian: MergeHungarian.rc
1109 Italian: MergeItalian.rc
1110 Japanese: MergeJapanese.rc
1113 PATCH: [ 1379894 ] Fix handling of unknown encoding
1115 Src/Common: unicoder.cpp
1116 Update & synchronize translations: Brazilian Bulgarian Catalan ChineseSimplified
1118 Brazilian: MergeBrazilian.rc
1119 Bulgarian: MergeBulgarian.rc
1120 Catalan: MergeCatalan.rc
1121 ChineseSimplified: MergeChineseSimplified.rc
1124 PATCH: [ 1378174 ] Share Src/res between translations
1126 Src/Languages/res: removed .bmp .cur and .ico files and WinMergeSplash.psd
1127 splash1.bmp and splash WinMergeSplash.psd not removed from Catalan
1130 PATCH: [ 1377545 ] Remove needless casts
1133 PATCH: [ 1372549 ] readme for Merge7z distributables
1137 PATCH: [ 1371994 ] Enable hi-color icons for folder compare
1138 Icons from Tim (Thanks!)
1139 Src: CompareStatisticsDlg.cpp DirView.cpp Merge.rc resource.h
1140 res new files: folder.ico folderskip.ico lfolder.ico rfolder.ico
1141 res deleted files: folder.bmp folderskip.bmp lfolder.bmp rfolder.bmp
1142 Src/Languages: *.rc resource.h
1143 Src/Languages/res: new and deleted files like in res above
1146 PATCH: [ 1371384 ] Move Expat maps into WinMerge src
1147 Plugins\src_VCPP\DisplayXMLFiles: DisplayXMLFiles.dsp
1148 Src\ExpatMapLib added
1149 Many files moved from DisplayXMLFiles to new ExpatMapLib
1150 PATCH: [ 1373020 ] Carry unicoding, codepage, & file path together
1151 & PATCH: [ 1377545 ] Remove needless casts
1152 Src: DiffWrapper.cpp DiffWrapper.h DirScan.cpp DirView.cpp
1153 MainFrm.cpp MainFrm.h Merge.dsp MergeDoc.cpp MergeDoc.h
1154 Src\Common: RegKey.cpp
1155 NEW Src\FileLocation.h
1158 PATCH: [ 1188787 ] New Chinese translation rc file (from PATCH 1183476)
1159 Remainder of dialogs
1160 Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
1161 BUG: [ 1376825 ] infinite loop bug in byte diffs
1162 Src: stringdiffs.cpp
1163 PATCH: [ 1188787 ] New Chinese translation rc file (from PATCH 1183476)
1164 A few string resources
1165 Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
1166 PATCH: [ 1249007 ] Short size column
1167 Src: DirViewColItems.cpp locality.cpp locality.h Merge.rc resource.h
1168 PATCH: [ 1377362 ] Fix coretools to MakeResDll compiles
1169 BUG: [ 1377361 ] MakeResDll broken b/c coretools broken
1170 Src/Common: coretools.cpp
1173 PATCH: [1374728 ] Fix filter dialog delete
1174 Src: FileFilterMgr.cpp
1177 PATCH: [ 1374782 ] fix for bug 1300957 Crash on save 'unique' file comparison
1178 Submitted by Oliver Mellet, some additional comment improvements by me.
1180 Takashi is now developer, Olivier Mellet submitted a patch
1181 Docs/Users: Contributors.txt
1184 PATCH: [ 1376457 ] Need clarification in platform test in ShellExtension
1185 ShellExtension: ShellExtension.cpp
1188 fix two-line-end-markers bug that was reported in:
1189 "PATCH: [ 1372716 ] patch for RFE:[ 922992 ] Word Wrap/split long lines"
1190 Src: stringdiffs.cpp
1193 PATCH: [ 1372716 ] patch for RFE:[ 922992 ] Word Wrap/split long lines
1194 Src: Merge.rc MergeDoc.cpp MergeEditView.cpp MergeEditView.h OptionsDef.h
1195 OptionsInit.cpp resource.h
1196 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h ccrystaltextview2.cpp
1197 crystalparser.cpp editcmd.h
1198 Src/Languages: *.rc resource.h
1201 PATCH [ 1374931 ] Bugfixes & upload binary for RCLocalizationHelper
1202 (RCLocalizationHelper plugin)
1205 PATCH [ 1372575 ] Fix link for DisplayXmlFiles plugin
1206 (DisplayXMLFiles plugin)
1207 TODO [ 1341058 ] ToDoDeleteThisValidateColumnOrdering()
1208 Src: DirView.cpp DirView.h DirViewColHandler.cpp
1210 2005-12-06 WinMerge experimental release 2.5.0.3 (cvs)
1213 PATCH: [ 1372589 ] Document tildas in config
1216 PATCH: [ 1373037 ] Fix filter dialog to correctly add new filters
1218 Src: FileFiltersDlg.cpp
1219 PATCH: [ 1370183 ] ShellExtension: better way to check for WinMerge executable
1220 ShellExtension: WinMergeShell.cpp
1221 Bump ShellExtension version to 1.7.0
1222 ShellExtension: ShellExtension.rc
1225 PATCH: [ 1372974 ] Make local function "GuessEncoding_from_bytes" static
1226 Src: codepage_detect.cpp
1227 PATCH: [ 1368762 ] Fix assignment in DirScan_GetItems
1228 Also add explanatory comment, for what variable does.
1232 CMarkdown::FileImage::GuessByteOrder(), GuessCodepageEncoding(): Fix UTF-8 signature detection
1233 CMarkdown::GetTagName(): Strip bogus trailing slash in name of empty tag
1234 Src: markdown.cpp codepage_detect.cpp
1237 PATCH: [ 1335128 ] Ignore uninstalled codepages
1238 Src: MergeDoc.cpp MergeDoc.h codepage.cpp codepage_detect.cpp
1239 Src/Common: unicoder.cpp
1242 PATCH: [ 1358408 ] Import and export for options
1243 Increase buffer size
1244 Src/Common: OptionsMgr.cpp
1247 PATCH: [ 1369660 ] Delete unused variables m_msgUpdateStatus
1249 Src: DirDoc.cpp DiffContext.cpp DiffContext.h DiffThread.cpp
1253 PATCH: [ 1369657 ] Delete unused variable DiffFuncStruct::msgStatusUpdate
1255 BUG: [ 1369856 ] Crashed when interface language is changed
1257 BUG: [ 1368755 ] Want comment on format line in 7ZCommon.cpp
1258 Cosmetic: adding explanatory comment to Merge7z::Proxy::operator->
1262 PATCH: [ 1369544 ] Catalan translation update
1263 Submitted by Jordi Vilar
1264 Docs/Users/Languages: ReadMe-Catalan.txt
1265 Src/Languages/Catalan: MergeCatalan.rc
1266 PATCH: [ 1265295 ] Swap file compare panes (use pointers for buffers)
1267 Forgot to update resource.h in language folders
1268 Src/Languages: resource.h
1271 Cosmetic: add comment to DiffThread giving value of msgID variable
1272 (to help debugging).
1276 BUG: [ 1368492 ] cvs ASSERT failing
1277 Fix reversion bug from Patch [ 1265295 ]
1280 PATCH: [ 1265295 ] Swap file compare panes (use pointers for buffers)
1281 Submitted by Takashi Sawanaka
1282 Src: ChildFrm.cpp DiffList.cpp DiffList.h DirDoc.cpp EditorFilepathBar.cpp
1283 EditorFilepathBar.h LocationView.cpp LocationView.h MainFrm.cpp Merge.rc
1284 MergeDiffDetailView.cpp MergeDiffDetailView.h MergeDoc.cpp MergeDoc.h
1285 MergeDocLineDiffs.cpp MergeEditView.cpp MergeEditView.h PathContext.cpp
1286 PathContext.h resource.h
1287 Src/Languages: *.rc resource.h
1290 PATCH: [ 1336598 ] Add extensions DisplayXMLFiles plugin
1291 Add several new extensions, bump version (1.0.2.0 -> 1.0.3.0)
1292 Plugins\src_VCPP\DisplayXMLFiles:
1293 DisplayXMLFiles.dsp DisplayXMLFiles.rc WinMergeScript.cpp
1298 PATCH: [ 1241935 ] Implement Line Diff coloring on byte diffs
1299 Src: MergeDoc.cpp MergeDoc.h MergeDocLineDiffs.cpp PropEditor.cpp
1301 2005-11-23 WinMerge experimental release 2.5.0.2 (cvs)
1304 PATCH: [ 1363114 ] Add '*.ctl;*.pag;*.dsr' to Visual Basic highlighter
1305 Src/editlib: ccrystaltextview.cpp
1308 PATCH: [ 1362882 ] Remove option for autoclosing compare statepane
1309 Src: Merge.rc OptionsDef.h OptionsInit.cpp PropGeneral.cpp PropGeneral.h resource.h
1310 Src/Languages: *.rc resource.h
1311 BUG: [ 1355884 ] 2.4.2 fails to open dvd files
1312 File/folder selection dialog couldn't open read-only folders
1316 PATCH: [ 1334277 ] Show asterisk in #diffs for QuickCompare results
1317 Src: DiffWrapper.cpp DiffWrapper.h DirViewColItems.cpp
1318 PATCH: [ 1334589 ] Encoding maps for Expat parser, for DisplayXmlFiles plugin
1319 Plugins/src_VCPP/DisplayXMLFiles
1320 BUG: [ 1277320 ] Plugins.txt not up-to-date
1321 Plugins/dll/IgnoreCommentsC
1324 Merge7z DllBuild 0017
1325 Merge7z: StdAfx.h Merge7zCommon.cpp Merge7zCommon.h revision.txt
1326 Merge7z new files: Merge7z430.dsp
1327 Merge7zInstaller: Files.rc2 Installer.cpp Merge7zInstaller.dsp
1330 PATCH: [ 1358408 ] Import and export for options
1331 Src: Merge.rc resource.h
1332 Src/Common: OptionsMgr.cpp OptionsMgr.h PreferencesDlg.cpp PreferencesDlg.h
1333 Src/Languages: *.rc resource.h
1336 PATCH: [ 1349645 ] Folder Compare Statistics dialog
1337 PATCH: [ 1347787 ] Use non-modal dialog for dir compare status
1338 Src: DirDoc.cpp DirDoc.h DirFrame.cpp DirFrame.h DirView.cpp DirView.h Merge.cpp Merge.dsp
1340 Src new files: CompareStatisticsDlg.cpp CompareStatisticsDlg.h DirCompProgressDlg.cpp
1341 DirCompProgressDlg.h
1342 Src deleted files: DirCompStateBar.cpp DirCompStateBar.h
1343 Src/res new file: sigma.bmp
1344 Src/Languages: *.rc resource.h
1347 PATCH: [ 1356783 ] Use OptionsMgr in SyntaxColors class
1348 Src: MainFrm.cpp SyntaxColors.cpp SyntaxColors.h
1351 PATCH: [ 1350638 ] Move options read/write code to options panels
1352 Src: MainFrm.cpp Merge.dsp PropArchive.cpp PropArchive.h PropCodepage.cpp PropCodepage.h
1353 PropColors.cpp PropColors.h PropCompare.cpp PropCompare.h PropEditor.cpp PropEditor.h
1354 PropGeneral.cpp PropGeneral.h PropRegistry.cpp PropRegistry.h PropVss.cpp PropVss.h
1355 Src new file: IOptionsPanel.h
1356 Src/Common: PreferencesDlg.cpp PreferencesDlg.h
1359 Merge Perry's fix for OpenDlg/SelectFile() to Merge.cpp/SelectFile() (PATCH #1348733)
1361 PATCH: [ 1350489 ] Use SelectFile() for external editor selection
1362 Src: PropRegistry.cpp
1365 PATCH: [ 1327413 ] Fix bug in CDirDoc::AllowUpwardDirectory()
1366 Change CDirView::AreItemsOpenable() to consider archive files as openable
1367 Src: DirActions.cpp DirDoc.cpp DirView.cpp
1370 PATCH: [ 1337905 ] Allow comparing binary files with binary unpacker
1372 PATCH: [ 1348733 ] Fix open dialog for cvs version 2.4
1376 PATCH: [ 1335072 ] Add text to Plugins.txt to cover DisplayXMLFiles
1377 Plugins/dlls: Plugins.txt
1379 2005-11-02 WinMerge experimental release 2.5.0.1 (cvs)
1382 BUG: [ 1341243 ] Current Find string is too fragile
1383 Was resetting find string after rescanning
1384 Src/editlib: ccrystaltextview.cpp
1385 PATCH: [ 1342550 ] Modernize file selection dialog
1386 PATCH: [ 1345110 ] Properly compare projectfile extension
1387 Src: Merge.cpp Merge.h OpenDlg.cpp
1388 Bump ShellExtension version to 1.6.2
1389 ShellExtension: ShellExtension.rc
1392 PATCH: [ 1345382 ] Translated Shell Extension to German
1393 ShellExtension/Languages: ShellExtensionGerman.rc
1396 RFE: [ 1324314 ] CTRL+W to close current diff
1399 PATCH: [ 1342871 ] Disable Copy Filenames for folders
1400 Src: DirView.cpp DirView.h
1401 PATCH: [ 1343059 ] Swedish translation update for 2.5.0.1 experimental
1402 Submitted by Hans Eriksson
1403 Src/Languages/Swedish: MergeSwedish.rc
1406 PATCH: [ 1341813 ] VSS project linking misdetects project files
1408 PATCH: [ 1310710 ] Fix bug #1309450
1410 Src: DiffContext.cpp DiffContext.h DiffFileInfo.cpp DiffFileInfo.h DirScan.cpp
1413 PATCH: [ 1341183 ] Fix VSS checkout canceling
1414 Src: DirActions.cpp MainFrm.cpp
1415 Open 2.4 manual (update link)
1419 PATCH: [ 1334444 ] Remove needless (& therefore confusing) cast
1420 Src: LocationView.cpp
1423 PATCH: [ 1334484 ] Skip location view paint if buffer not initialized
1424 Src: LocationView.cpp MergeDoc.cpp MergeDoc.h
1425 MergeEditView.cpp MergeEditView.h
1426 Cosmetic changes to GetFunctionsFromScript, to document
1427 arguments passed to GetTypeInfo.
1431 PATCH: [ 1333545 ] Small improvement to Open-dialog folder selection
1433 PATCH: [ 1333581 ] Increase quick compare limit and make it option
1434 Src: DiffContext.h DiffWrapper.cpp DirDoc.cpp OptionsDef.h OptionsInit.cpp
1437 PATCH: [ 1330179 ] Icon for 'Print'
1438 Src: MainFrm.cpp Merge.rc resource.h
1439 Src/res new file: print.bmp
1440 Src/Languages: *.rc resource.h
1441 Src/Languages/res new file: print.bmp
1444 PATCH: [ 1332365 ] Make some DirActions.cpp functions consts
1445 Src: DirActions.cpp DirView.h
1448 PATCH: [ 1329951 ] Readme.txt points to version 2.2 manual
1449 Docs/Users: ReadMe.txt
1450 Docs/Users/Languages: ReadMe-Catalan.txt ReadMe-Swedish.txt
1451 BUG: [ 1326621 ] Extention ".WinMerge" is omitted
1455 PATCH: [ 1330059 ] Translated 3 missing sentences to German
1456 Src/Languages/German: MergeGerman.rc
1459 PATCH: [ 1326813 ] Fix binary detection to allow archives
1463 PATCH: [ 1305541 ] Rational ClearCase support
1464 Submitted by Greg (rys1908)
1465 Src: CCPrompt.cpp CCprompt.h DirActions.cpp MainFrm.cpp MainFrm.h Merge.rc resource.h
1466 Src/Common: coretools.cpp
1467 Src/Languages: *.rc resource.h
1470 PATCH: [ 1323107 ] Patch for crash on save filenames with different cases
1471 From anonymous submitter
1473 PATCH: [ 1286629 ] print support
1474 Submitted by Markus Rollmann
1475 Src: MainFrm.cpp Merge.rc MergeEditView.cpp MergeEditView.h
1476 Src/Common: SplitterWndEx.cpp SplitterWndEx.h
1477 Src/editlib: ccrystaleditview.cpp
1479 Add Markus Rollmann to Contributors.txt
1480 Docs/Users/Contributors.txt
1483 PATCH: [ 1242008 ] Update status to binary if open fails because binary
1484 Follow on for 2nd case
1485 Src: DirView.cpp MergeDoc.cpp
1488 PATCH: [ 1302710 ] generating a report is slow
1489 Perry added comments explaining one code line
1490 Src: DirCmpReport.cpp
1493 PATCH: [ 1302710 ] generating a report is slow
1494 Submitted by Takashi Sawanaka
1495 Src: DirCmpReport.cpp
1496 PATCH: [ 1310214 ] Shell extension italian translation
1497 Submitted by Andrea Decorte
1498 ShellExtension/Languages: ShellExtensionItalian.rc
1501 PATCH: [ 1253949 ] cosmetic comment fix
1503 PATCH: [ 1253950 ] cosmetic--remove old code in InitInstance
1505 PATCH: [ 1253951 ] trivial cosmetic comment upgrade in arg parsing
1509 Merge7z DllBuild 0015
1510 Merge7z: Merge7zCommon.cpp Merge7zCommon.h revision.txt
1511 Merge7z new files: Merge7z427.dsp Merge7z428.dsp Merge7z429.dsp
1512 Merge7zInstaller update
1513 Merge7zInstaller: Files.rc2 Installer.cpp Installer.rc
1516 PATCH: [ 1309423 ] Small typo in MergeSwedish.rc
1517 Submitted by Hans Eriksson
1518 Src/Languages/Swedish: MergeSwedish.rc
1521 PATCH: [ 1229867 ] RFE [ 1205516 ], RFE [ 887948 ], and other issues
1522 Cosmetic, transcribing comment from patch discussion
1526 PATCH: [ 1302608 ] crash on generating a report
1527 Submitted by Takashi Sawanaka
1528 Src: DirCmpReport.cpp
1531 BUG: [ 1298687 ] The files marked as 'skipped' are compared
1532 Fix from Takashi Sawanaka, comment updates by me
1536 PATCH: [ 1301504 ] Danish ShellExtension translation
1537 Submitted by Christial List
1538 ShellExtension/Languages: ShellExtensionDanish.rc
1541 PATCH: [ 1297642 ] Japanese translation update
1542 Submitted by Takashi Sawanaka
1543 ShellExtension/Languages: ShellExtensionJapanese.rc
1544 Src/Languages/Japanese: MergeJapanese.rc
1547 PATCH: [ 1297406 ] updated hungarian translation
1548 Submitted by Márton Balázs
1549 Src/Languages/Hungarian: MergeHungarian.rc
1552 PATCH: [ 1295701 ] Scrolling for dir compare report filename
1555 PATCH: [ 1295758 ] Update URL for downloads page (archive options)
1556 Src: PropArchive.cpp
1559 PATCH: [ 1295767 ] German Translation for 'Highlight Line * Diff'
1560 Src/Languages/German: MergeGerman.rc
1563 PATCH: [ 1294514 ] Set file loading traces debug-only
1565 PATCH: [ 1295473 ] updated italian rc file for winmerge 2.3.6
1566 Submitted by Andrea Decorte
1567 Src/Languages/Italian: MergeItalian.rc
1570 PATCH: [ 1292120 ] More significant diff navigations fixes
1571 Src: DiffList.cpp DiffList.h MergeDoc.cpp MergeEditView.cpp
1572 BUG: [ 1290305 ] ShellExtensionU.dll info missing from config log
1576 PATCH: [ 1292279 ] Various Updates in German Translation
1577 Src/Languages/German: MergeGerman.rc
1580 PATCH: [ 1290477 ] Catalan translation update
1581 Submitted by Jordi Vilar
1582 Src/Languages/Catalan: MergeCatalan.rc
1585 PATCH: [ 1289037 ] Some (non)significant diff count fixes
1586 Src: DiffList.cpp DiffList.h MergeDoc.cpp MergeEditView.cpp
1589 PATCH: [ 1284150 ] Fix Shell Extension registering problem
1590 Also bump version to 1.6
1591 ShellExtension: ShellExtension.cpp ShellExtension.rc
1594 BUG: [ 1284304 ] StaticLink crashes after mouse over event
1595 Changed signature of CStaticLink::OnSetCursor to start with CWnd *
1596 Src\Common: StaticLink.cpp StaticLink.h
1599 PATCH: [ 1285404 ] Various Updates in German Translation
1600 Src/Languages/German: MergeGerman.rc
1603 PATCH: [ 1284890 ] Use Changes.txt instead of readme.txt for ChangeLog
1604 Added ChangeLogs folder to project, and put Changes.txt (this),
1605 readme.txt, and CHANGELO into new ChangeLogs folder.
1606 PATCH: [ 1283466 ] French translation
1607 New translation by Jean-F Jolin
1608 Src/Languages/French: MergeFrench.rc
1611 Previous change history is in file readme.txt