2 PATCH: [ 1255864 ] Different icons for Folder and File Comparison
4 Src: Merge.cpp Merge.rc resource.h
5 Src/res new file: MergeDir.ico
6 Src/Languages: *.rc resource.h
7 Src/Languages/res new file: MergeDir.ico
8 PATCH: [ 1258063 ] Fix cursor position after pane change
10 PATCH: [ 1258584 ] Catalan translation update
11 Submitted by Jordi Vilar
12 Src/Languages/Catalan: MergeCatalan.rc
13 ShellExtension/Languages/ShellExtensionCatalan.rc
16 PATCH: [ 1253326 ] Allow opening files to external editor from file compare
17 Src: Merge.rc MergeEditView.cpp MergeEditView.h resource.h
18 Src/Languages: *.rc resource.h
21 PATCH: [ 1244009 ] Add userflags to diffitem and remember hidden status
22 Src: DiffItem.h DiffItemList.cpp DiffItemList.h DirDoc.cpp DirDoc.h
23 DirView.cpp DirView.h Merge.rc resource.h
24 Src/Languages: *.rc resource.h
26 2005-08-10 WinMerge experimental release 2.3.5.2 (cvs)
29 BUG: [ 1254903 ] WinMerge 2.3.5.1: Not enough memory at File Comparison
33 2005-08-08 WinMerge experimental release 2.3.5.1 (cvs)
36 PATCH: [ 1248259 ] Preserve trivial diffs in diff chain
37 Src: DiffList.cpp DiffList.h DiffWrapper.cpp LocationView.cpp
38 LocationView.h MergeDiffDetailView.cpp MergeDiffDetailView.h
39 MergeDoc.cpp MergeEditView.cpp MergeEditView.h
42 PATCH: [ 1253100 ] Shorter paths in captions
43 Src: DirDoc.cpp MergeDoc.cpp paths.cpp paths.h
44 PATCH: [ 1253205 ] Remove dynamic dll loading from FilePathEdit
45 Src: FilePathEdit.cpp FilePathEdit.h
46 PATCH: [ 1253350 ] Use new-style folder browse dialog
50 PATCH: [ 1201945 ] Localization of ShellExtension.dll
51 Submitted by Takashi Sawanaka
52 ShellExtension: Register.bat ShellExtension.dsp ShellExtension.rc WinMergeShell.cpp
53 shellExtension new file: ShellExtensionU.def
54 ShellExtension new folder: Languages
57 PATCH: [ 1252076 ] Improve About-dialog (unicode info, better layout)
58 Src: Merge.cpp Merge.rc resource.h
59 Src/Languages: *.rc resource.h
60 PATCH: [ 1238168 ] Convert using BCMenu with pointers
61 Src: MainFrm.cpp MainFrm.h MergeEditView.cpp
64 BUG: [ 1247700 ] Cannot browse to parent folders of selected folders
69 PATCH: [ 1248180 ] fix moved block code
70 BUG: [ 1248172 ] Assert failure in CDiffWrapper::RunFileDiff
71 BUG: [ 1186199 ] Assert from moved block code
75 PATCH: [ 1247483 ] Create folder if one doesn't exist (for reports and patches)
76 BUG: [ 1248017 ] WinMerge\Src\DirCmpReport.cpp(80) : error C2065: 'IDS_FOLDER
77 Creating IDS_FOLDER_NOTEXIST as "Folder does not exist." and checking in to cvs trunk.
78 Src: Merge.rc resource.h
79 Src/Languages: resource.h Merge*.rc
80 Cosmetic: grammar fix in comment ("same...than" => "same...as")
84 PATCH: [ 1247375 ] Use Shell Edit command primarily to open files
86 PATCH: [ 1247483 ] Create folder if one doesn't exist (for reports and patches)
87 Src: DirCmpReport.cpp PatchTool.cpp
90 PATCH: [ 1245773 ] Scan full files in quick contents compare
94 PATCH: [ 1208493 ] Suggest change in title of codepage options
99 PATCH: [ 1242008 ] Update status to binary if open fails because binary
100 Src: DiffItem.h DiffItemList.cpp DiffItemList.h DirDoc.h DirView.cpp
101 MainFrm.cpp MainFrm.h MergeDoc.cpp MergeDoc.h
102 PATCH: [ 1208208 ] Move resizeable dialogs position in registry
103 Src: OpenDlg.cpp SaveClosingDlg.cpp
104 Src/Common: CMoveConstraint.cpp CMoveConstraint.h
107 PATCH: [ 1244804 ] Add hourglass for report creating
108 Src: DirCmpReport.cpp Merge.rc resource.h
109 Src/Languages: *.rc resource.h
110 Remove invalid ASSERT
111 Src: CompareStats.cpp
112 PATCH: [ 1238174 ] Fix diff counts in quick contents compare
113 Src: DiffWrapper.cpp DirScan.cpp
114 Handle empty filename for report
115 Src: DirCmpReportDlg.cpp
118 PATCH: [ 1241270 ] Fix paths.cpp GetDirName for root paths
120 PATCH: [ 1241275 ] New Shared or Private Filter dialog
121 Src: FileFilterHelper.cpp FileFilterHelper.h FileFiltersDlg.cpp
122 Merge.dsp Merge.rc paths.cpp paths.h resource.h
123 Src new files: SharedFilterDlg.cpp SharedFilterDlg.h
124 PATCH: [ 1241275 ] New Shared or Private Filter dialog
125 New shared filter dialog
126 Src/Languages: */Merge*.rc */resource.h
129 BUG: [ 1241766 ] Debug warning: Warning: no listbox item selected.
130 Src/Common: LanguageSelect.cpp LanguageSelect.h
131 PATCH: [ 1244808 ] Remove LanguageSelect include from Merge.h
132 Src: codepage.cpp DirActions.cpp Merge.cpp Merge.h
133 Src/Common: LanguageSelect.h
134 PATCH: [ 1241962 ] Record zero byte location info
135 Src/Common: UniFile.cpp UniFile.h
138 PATCH: [ 1243655 ] Directory compare reporting
139 Src: DirView.cpp DirView.h DirViewColItems.cpp Merge.dsp Merge.rc resource.h
140 Src new files: DirCmpReport.cpp DirCmpReport.h DirCmpReportDlg.cpp DirCmpReportdlg.h
141 Src/Common: coretools.h coretools.cpp
142 Languages: *.rc resource.h
143 BUG: [ 1244415 ] Bad T2A call in DirCmpReport::SaveToFile
144 Src: DirCmpReport.cpp
147 PATCH: [ 1242297 ] Fix CPatchDlg::OnOK for empty paths & greatly simplify
148 Src: Merge.rc PatchDlg.cpp resource.h
149 Src/Languages: */resource.h */Merge*.rc
152 PATCH: [ 1220485 ] Move Redisplay() from doc to view
153 Src: DirDoc.cpp DirDoc.h DirView.cpp DirView.h DirViewColHandler.cpp
156 PATCH: [ 1211574 ] Wrap GetTempPath and GetTempFileName for CString use
157 Src: DiffWrapper.cpp FileTransform.cpp PathContext.cpp VSSHelper.cpp
159 PATCH: [ 1241930 ] Rename stringdiffs_Get to sd_ComputeWordDiffs
160 (This is cosmetic function rename)
161 Src: MergeDocLineDiffs.cpp stringdiffs.cpp stringdiffs.h stringdiffsi.h
164 BUG: [ 1241289 ] Edit point or "anchor" not updated when navigating diffs
165 Src: MergeEditView.cpp
166 PATCH: [ 1243221 ] Cleanup CompareStats
167 Src: CompareStats.cpp CompareStats.h DiffThread.cpp DirCompStateBar.cpp
168 DirCompStateBar.h DirDoc.cpp
171 PATCH: [ 1242339 ] Fix CMergeDoc::Rescan to set bIdentical in all cases
172 Src: DiffWrapper.cpp DiffWrapper.h MergeDoc.cpp PatchTool.cpp
173 BUG: [ 1241990 ] Typo in MergeDoc.h: additionnal => additional
174 Fix spelling additionnal => additional
175 Src: MergeDoc.h MergeEditView.h
178 PATCH: [ 1226311 ] Record notes about why compare failed
179 Src: DiffItem.h DiffWrapper.cpp DiffWrapper.h
182 PATCH: [ 1241753 ] Fix DirViewColItems int64 cast warnings
183 Src: DirViewColItems.cpp
184 Cosmetic: Add function header comment to CMergeDoc::GetWordDiffArray
185 Src: MergeDocLineDiffs.cpp
188 PATCH: [ 1238194 ] Use proper member names in MergeDiffDetailView
189 Src: MergeDiffDetailView.cpp MergeDiffDetailView.h
190 PATCH: [ 1236623 ] Increase Quick contents compare buffer size
194 BUG: [ 1232382 ] Inconsistent language name casing in Spanish UI (v2.3.4.0)
195 Make all language names capitalized in Spanish, as in Catalan
196 Src/Languages/Spanish: MergeSpanish.rc
197 Cosmetic: add explanatory comments to comment inside of SetResourceVersions.wsf
198 Src: SetResourceVersions.wsf
201 BUG: [ 1239605 ] Cannot open diff due to 7zip error
205 PATCH: [ 1239275 ] Fixes for sd_ComputeByteDiff
209 PATCH: [ 1229867 ] RFE [ 1205516 ], RFE [ 887948 ], and other issues (w/o command line tool integration)
210 Src: 7zCommon.cpp 7zCommon.h DiffContext.cpp DiffItem.cpp DiffItem.h DiffThread.cpp DiffWrapper.cpp DirActions.cpp DirDoc.cpp
211 DirDoc.h DirScan.cpp DirScan.h DirView.cpp DirView.h DirViewColItems.cpp FileFilterHelper.h MainFrm.cpp MergeDoc.cpp
212 PATCH: [ 1225880 ] Project file parsing based on CMarkdown class
213 Src: markdown.cpp markdown.h ProjectFile.cpp
216 PATCH: [ 1236602 ] Add icon for messagebox about overwriting patch file
218 PATCH: [ 1236598 ] Add binary file check to quick contents compare
219 Src: ByteComparator.cpp ByteComparator.h DiffWrapper.cpp
222 PATCH: [ 1229024 ] Rename CPropFilter to CPropLineFilter
223 Remove PropFilter.cpp PropFilter.h
224 Add PropLineFilter.cpp PropLineFilter.h
225 Src: Merge.dsp MainFrm.cpp
226 PATCH: [ 1229024 ] Rename CPropFilter to CPropLineFilter
228 Src: PropLineFilter.cpp PropLineFilter.h
229 PATCH: [ 1234629 ] New Chinese(Simplified) translation .rc file
230 Src/Languages: MergeChineseSimplified.rc
233 PATCH: [ 1232760 ] Icon for 'Merge->Delete'
234 Src: MainFrm.cpp Merge.rc resource.h
235 Src/res new file: delete.bmp
236 Src/Languages: *.rc resource.h
237 Src/Languages/res new file: delete.bmp
240 PATCH: [ 1234390 ] Compare >2 MB files with quick contents
241 Src: DiffWrapper.cpp DiffWrapper.h DirScan.cpp
242 PATCH: [ 1234793 ] Patch generate: 11-line context doesn't work
246 PATCH: [ 1232499 ] Language dialog box Simplified Chinese's name correction
247 Submitted by xmpdhml at sourceforge.net
248 Src/Common: LanguageSelect.cpp
250 2005-06-30 WinMerge beta 2.3.4.0 released
253 PATCH: [ 1228647 ] MergeCatalan.rc v209 update
254 Submitted by Jordi Vilar
255 Src/Languages/Catalan: MergeCatalan.rc
256 PATCH: [ 1230344 ] MergeSwedish.rc for 2.3.4.0 beta
257 Submitted by Hans Eriksson
258 Src/Languages/Swedish: MergeSwedish.rc
259 PATCH: [ 1229867 ] RFE [ 1205516 ], RFE [ 887948 ], and other issues
260 Submitted by Jochen, apply some parts now:
261 DIFFITEM API cleanup, use const CString&
262 Src: DiffItem.cpp DiffItem.h
263 Add missing ProgressBar initialisation
264 Src: DirCompStateBar.cpp
265 Misc cleanups and optimizations
266 Src: DirDoc.cpp DirDoc.h DirView.cpp DirView.h
267 Cannot create valid (archive) temp paths without valid document pointer
269 PATCH: [ 1193262 ] Switch language on run-time not change all menus
270 Src/Common: LanguageSelect.cpp
273 PATCH: [ 1220421 ] warning in cvs trunk (probably a bool/BOOL mismatch)
277 PATCH: [ 1229315 ] Fix item number for non-recursive compare
279 PATCH: [ 1229297 ] Align filesize column text to right
280 Src: DirView.cpp DirView.h DirViewColHandler.cpp DirViewColItems.cpp DirViewColItems.h
281 PATCH: [ 1229164 ] Add dir compare progress info
282 Src: CompareStats.cpp CompareStats.h DiffThread.cpp DirCompStateBar.cpp
283 DirCompStateBar.h DirDoc.cpp DirScan.cpp DirView.cpp Merge.rc Resource.h
284 Src/Languages: *.rc resource.h
287 PATCH: [ 1219818 ] Plugin to display XML files
289 Src/ExpatLib - This is the expat xml parser version 1.95.8
290 Plugins/src_VCPP/DisplayXMLFiles - A plugin which uses the expat parser
293 PATCH: [ 1213781 ] Fill item location into statusbar in dirview
294 DirFrame.cpp DirFrame.h DirView.cpp DirView.h Merge.rc resource.h
295 Apply new strings to translated resource files
296 (IDS_DIRVIEW_STATUS_FMT_FOCUS & IDS_DIRVIEW_STATUS_FMT_NOFOCUS)
297 Src/Languages: *.rc resource.h
298 Docs/Users/Manual/Filters.xml
299 (First line in file filters description) Minor grammar fixes,
300 and rewrite of one incomprehensible line.
301 Add example user-specific filter paths to manual.
302 Add example paths to function header comment of FileFilterHelper::LoadFileFilterDirPattern
303 Docs/Users/Manual/Filters.xml
304 Src/FilterFilterHelper.cpp
305 BUG: [ 1228493 ] Copy Pathnames/Right doesn't work
309 BUG: [ 1225257 ] cvs: FileFilters broken?
310 Restore behavior in 2.3.3.5 and earlier for directory filtering
314 RFE: [ 1205833 ] You can unzip more than just zip #1: Treat .ear and .war like .zip
315 Merge7z: Merge7zCommon.cpp Merge7zCommon.h revision.txt
316 Change recommended version of 7-Zip to 4.20; remove noise from Merge7z Nagbox
318 PATCH: [ 1215162 ] Merge7zInstaller update
319 Merge7zInstaller: Files.rc2 Installer.cpp Installer.rc Merge7zInstaller.dsp
322 PATCH: [ 1225090 ] Fix bug that additional item gets selected in dircompare
326 Cosmetic: Fix grammar in comment (directory -> directories)
327 Src: FileFilterHelper.cpp
330 PATCH: [ 1223754 ] Improve dircompare stats system
331 Src: DiffContext.cpp DiffContext.h DiffThread.cpp DirCompareStateBar.cpp
332 DirCompareStateBar.h DirDoc.cpp DirDoc.h DirFrame.cpp DirFrame.h DirScan.cpp
333 DirScan.h DirView.cpp Merge.dsp
334 Src new files: CompareStats.cpp CompareStats.h
336 2005-06-21 WinMerge experimental release 2.3.3.6 (cvs)
339 PATCH: [ 1224249 ] Use constant for dirview special items
340 Src: DirActions.cpp DirView.cpp DirView.h
343 PATCH: [ 1221672 ] MergeSwedish. rc 1.207 update
344 Submitted by Hans Eriksson
345 Src/Languages/Swedish: MergeSwedish.rc
346 BUG: [ 1222705 ] DiffFileInfo copy constructor broken (current CVS)
347 Src: DiffFileInfo.cpp DiffFileInfo.h DiffItem.cpp DiffItem.h FileInfo.cpp FileInfo.h
348 PATCH: [ 1220492 ] Improve backup-fail message to show actual filename
349 Src: MainFrm.cpp Merge.rc
353 PATCH: [ 1220472 ] Don't lose selection when deleting items from dir compare
357 PATCH: [ 1220416 ] error C2065: '_stat' : undeclared identifier
361 PATCH: [ 1219333 ] Wrong confirmation message when deleting unique items
363 PATCH: [ 1218661 ] Rescan selected items
364 Src: DiffItem.h DiffThread.cpp DiffThread.h DirActions.cpp DirDoc.cpp DirDoc.h
365 DirScan.cpp DirScan.h DirView.cpp DirView.h Merge.rc resource.h
366 Src/Languages: *.rc resource.h
369 BUG: [ 1218133 ] German options dialog is too wide
370 Src/Languages/German: MergeGerman.rc
371 PATCH: [ 1213634 ] Don't store two path copies in PathContext
372 Src: PathContext.cpp PathContext.h
375 BUG: [ 1218096 ] Options: 'Line Diff Coloring' frame don't fit
380 PATCH: [ 1217850 ] French Translation R2_3_5
381 Updated French translation by Jean-F Jolin
382 Src/Languages/French: MergeFrench.rc
383 PATCH: [ 1213909 ] Updated Dutch translation
384 Dutch update by Jigal van Hemert
385 (for 2.2, but propagating many translations to trunk)
386 Src/Languages/Dutch: MergeDutch.rc
389 PATCH: [ 1213649 ] Add copyconstructor to (Diff)FileInfo
390 Src: DiffFileInfo.cpp DiffFileInfo.h FileInfo.cpp FileInfo.h
391 PATCH: [ 1205724 ] Two-phase directory compare
392 Src: 7zCommon.cpp 7zCommon.h DiffContext.cpp DiffContext.h DiffThread.cpp
393 DirActions.cpp DirDoc.h DirScan.cpp DirScan.h DirView.cpp DirView.h
394 DirViewColHandler.cpp Merge.dsp
395 Src new files: DiffItem.cpp DiffItem.h DiffItemList.cpp DiffItemList.h
398 PATCH: [ 1213238 ] noninteractive switch
399 Src: MainFrm.cpp MainFrm.h Merge.cpp Merge.dsp Merge.h
400 Src new files: CmdArgs.cpp CmdArgs.h
402 2005-06-08 WinMerge experimental release 2.3.3.5 (cvs)
405 PATCH: [ 1216706 ] Ignore case for project file file-extension
407 BUG: [ 1216821 ] Untitled buffers, Save doesn't work
411 Remove nonexistent stampver.inf from Merge.dsp
412 (No patch because sourceforge.net is unresponsive)
416 PATCH: [ 1216033 ] Options to enable/disable multiple compare documents
417 Src: DirDoc.cpp DirDoc.h DirView.cpp MainFrm.cpp MainFrm.h Merge.rc
418 OptionsDef.h OptionsInit.cpp PropGeneral.cpp PropGeneral.h resource.h
419 Src/Common: PreferencesDlg.cpp
420 Src/Languages: *.rc resource.h
423 PATCH: [ 1215235 ] Allow removing items from comboboxes
424 Src: OpenDlg.cpp OpenDlg.h
425 Src/Common: SuperComboBox.cpp
428 RFE: [ 1203923 ] New refresh icon
430 Src/Languages: Toolbar.bmp
433 PATCH: [ 1214575 ] Add 'Delete' item for dir compare main menu
434 Trying again applying languages..
435 Src/Languages: *.rc resource.h
439 Merge7z new files: Merge7z420.dsp
442 PATCH: [ 1214575 ] Add 'Delete' item for dir compare main menu
443 Src: DirActions.cpp DirView.cpp DirView.h Merge.rc resource.h
444 Src/Languages: *.rc resource.h
447 PATCH: [ 1213161 ] Set return code based on last diff result
448 Src: DirDoc.cpp Merge.cpp Merge.h MergeDoc.cpp
451 Add commenting & array bounds checking to CMergeApp::LoadProjectFile
455 PATCH: [ 1210059 ] Sanity check difference before merging it
456 Src: Merge.rc MergeDoc.cpp MergeDoc.h resource.h
457 Src/Languages: *.rc resource.h
460 PATCH: [ 1206727 ] decouple codepage module from options files
461 Src: codepage.cpp codepage.h MainFrm.cpp MainFrm.h
462 Src/Common: LanguageSelect.cpp
463 BUG: [ 1209386 ] Comparing by quick differences jams WinMerge
464 Src: ByteComparator.cpp
467 PATCH: [ 1209294 ] Remove running stampver-tool post-build
471 BUG: [ 1201463 ] Prediffer submenu looks broken
474 BUG: [ 1198263 ] MergeKorean translation credit wrong?
475 Src/Languages/Korean: MergeKorean.rc
476 BUG: [ 1208504 ] Newer right file marked identical comparing by modified date
480 PATCH: [ 1191245 ] Merge7z DllBuild 0011
481 Merge7z: Merge7z311.cpp Merge7z409.cpp Merge7zCommon.cpp Merge7zCommon.h revision.txt
482 Merge7z416.dsp Merge7z417.dsp Merge7z418.dsp Merge7z419.dsp
483 PATCH: [ 1191248 ] Merge7zInstaller update
484 Merge7zInstaller: Files.rc2 Installer.cpp Installer.rc Merge7zInstaller.dsp
487 PATCH: [ 1208537 ] Small cleanup for CDirView::OpenSelection()
489 PATCH: [ 1208801 ] SetFilter() must set default filter in error case
490 Src: FileFilterHelper.cpp FileFilterHelper.h MainFrm.cpp OpenDlg.cpp OptionsInit.cpp
493 PATCH: [ 1207820 ] Remove non-const GetPath() from PathContext
495 Remove unused strings from CDirView::GetItemFileNames()
499 PATCH: [ 1206753 ] Make SaveClosing dialog resizable
500 Src: Merge.rc SaveClosingDlg.cpp SaveClosingDlg.h
503 PATCH: [ 1206808 ] Store temp filename in variable in FileTransform_Unpacking
504 Src: FileTransform.cpp
505 PATCH: [ 1206757 ] Remove unneeded include from DiffViewBar.cpp
507 PATCH: [ 1206732 ] Remove unneeded include from VssPrompt.cpp
509 BUG: [ 1207417 ] Two GetDocument() functions in CDirView
510 Cosmetic: Added explanatory comment per discussion
512 PATCH: [ 1206755 ] Remove unneeded include from ColorButton.cpp
514 PATCH: [ 1206734 ] Remove unneeded include from FilepathEdit.cpp
515 Src: FilepathEdit.cpp
516 PATCH: [ 1206730 ] Remove meaningless comments on includes in Splash.cpp
518 PATCH: [ 1208198 ] Update CMoveConstraint with settable grip
519 Src/Common: CMoveConstraint.cpp CMoveConstraint.h
522 PATCH: [ 1206647 ] Add trailing slash to MRU paths
526 PATCH: [ 1206085 ] Translate new options dialog to German
527 Src/Languages/German: MergeGerman.rc
530 PATCH: [ 1187777 ] New LoadConfig function
531 Src/Common: OptionsMgr.cpp OptionsMgr.h
532 Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp MainFrm.h
535 2005-05-18 WinMerge experimental release 2.3.3.4 (cvs)
538 PATCH: [ 1203680 ] Fix tab adding spaces in unicode builds
539 Src/editlib: ccrystaltextview.cpp
540 PATCH: [ 1203615 ] Fix opening manual from new Options-dialog
541 Src/Common: PreferencesDlg.cpp PreferencesDlg.h
544 PATCH: [ 1197969 ] New script to update production version in translations
545 Src new files: SetResourceVersions.bat SetResourceVersions.wsf
546 Docs/Developers/readme-developers.html.
547 PATCH: [ 1201804 ] Fix anchor & caret in shift-f4 operation
548 Src: MergeDocLineDiffs.cpp
549 Src/editlib: ccrystaltextview.h
550 Update language count (19->21, three occurrences)
551 Docs/Developers/readme-developers.html.
552 Note that sourceforge tracker doesn't display tabs.
553 Docs/Developers/readme-developers.html.
556 PATCH: [ 1203707 ] tiny code rearrangement for debugging
560 PATCH: [ 1203079 ] Don't ask about saving files after options change
561 Src: MainFrm.cpp MergeEditView.cpp
562 PATCH: [ 1202813 ] Swedish translated ReadMe.txt
563 Submitted by Hans Eriksson
564 Docs/Users/Languages: ReadMe-Swedish.txt
565 PATCH: [ 1201834 ] Remove old readme-translations
566 Removed files: Docs/Users/Languages: *.rtf Contributors.txt Read me.txt
569 Add change to DirView.cpp I missed from patch #1184626 (single instance/multidoc)
573 PATCH: [ 1201961 ] Japanese translation update
574 (version 2, to translate syntax colors)
575 Src/Languages/Japanese: MergeJapanese.rc
576 PATCH: [ 1188787 ] New Chinese translation rc file (from PATCH 1183476)
577 More dialogs, and most of the strings
578 Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
579 PATCH: [ 1202060 ] Recognize .lang files as having versioninfo
583 PATCH: [ 1201703 ] Swedish MergeSwedish.rc update
584 Src/Languages/MergeSwedish.rc
585 (Copy update note from this readme to Docs/Users/Manual/readme.txt
587 PATCH: [ 1188787 ] New Chinese translation rc file (from PATCH 1183476)
588 Applied some dialog translations.
589 Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
590 PATCH: [ 1201961 ] Japanese translation update
591 Src/Languages/Japanese: MergeJapanese.rc
592 BUG: [ 1190652 ] warning in cvs code in DirScan.cpp
596 PATCH: [ 1201434 ] New ReadMe.txt
597 Innosetup: WinMerge Localized.iss
598 Innosetup removed file: Read Me.htm
599 Users/Docs new file: ReadMe.txt
600 Users/Docs removed files: Read me.txt Read Me.rtf
603 PATCH: [ 1201029 ] Catalan translation update
604 Src/Languages/Catalan: MergeCatalan.rc
605 BUG: [ 1197964 ] MergeBulgarian string versioninfo translated
606 Added English/1252 section to Bulgarian, as MergeCatalan has.
607 (Adding English/1251 section did not work on US Windows system.)
608 Src/Languages/Bulgarian: MergeBulgarian.rc
609 PATCH: [ 1201125 ] Add checking to AppendMenu calls in building prediffer subme
610 Src: MergeEditView.cpp
611 PATCH: [ 1201130 ] Fix prediffers menu for multiple menu brokenness
613 Cosmetic: Expand header comments on GetScriptsSubmenu & GetPrediffersSubmenu
615 Cosmetic: Fix synchro spelling in MergeFrench.rc (one currence LANGAGE => LANGUAGE)
616 Src/Languages/French: MergeFrench.rc
619 BUG: [ 1198435 ] Comma missing from ID_LOCBAR_GOTODIFF menuitem
622 PATCH: [ 1199889 ] Ask to save modified files before creating a patch
623 Src: MainFrm.cpp Merge.rc resource.h
624 Src/Languages: *.rc resource.h
627 PATCH: [ 1199600 ] Minor update to text encoding docs in manual
628 Docs/Users/Manual: Text_encoding.xml
631 PATCH: [ 1199194 ] Optimization for difflist
632 Src: DiffList.cpp DiffList.h
633 PATCH: [ 1198955 ] Discard all button on Save modified pane
634 Submitted by Ferenc Kubatovics
635 Src: Merge.rc MergeDoc.cpp resource.h SaveClosingDlg.cpp SaveClosingDlg.h
636 Src/Languages: *.rc resource.h
637 Update UpdateAll_resource_h.bat to update Turkish too
638 Src/Languages: UpdateAll_resource_h.bat
639 Update Contributors list
640 Docs/Users: Contributors.txt
643 BUG [ 1198622 ] Generated patch is broken when comparing UTF8 files
644 Bail out of OlecharToUTF8 if BOM not UCS-2 (to avoid scrambling text).m
645 Src/Common: multiformatText.cpp
646 Improve comments heading & in OlecharToUTF8
647 Src/Common: multiformatText.cpp
650 PATCH [ 1195486 ] Remember dircompare sort column
651 Fix to save options after editing, so columns don't revert.
654 2005-05-09 WinMerge experimental release 2.3.3.3 (cvs)
657 BUG: [ 1198235 ] Debug warnings under Unicode Debug
658 Fix memory leak from PropSyntaxColors.cpp
659 Src: PropSyntaxColors.cpp
662 PATCH: [ 1197727 ] New method ResMsgBox1 to simplify cookie-cutter code
663 Src: MainFrm.cpp PatchDlg.cpp StdAfx.cpp StdAfx.h
664 BUG: [ 1197972 ] current cvs doesn't compile
666 BUG [ 1193561 ] v2.2, version copyrights not all up-to-date
667 Adjusted all to say 1996-2005 just as English
668 Src/Languages: Merge*.rc
669 BUG: [ 1198258 ] Several lang dlls do not have versioninfo
670 Fixed hex-encoded codepage in string portion of versioninfo
671 Src/Languaegs: Merge*.rc
675 PATCH: [ 1196889 ] Move options initializations to own file
676 Src: MainFrm.cpp Merge.dsp
677 Src new file: OptionsInit.cpp
680 BUG: [ 1193163 ] "Gerenate Patch" deletes the original files if UTF-8/16
681 Added argument (areTempFiles) to method SetCompareFiles, and used in RunFileDiff.
682 (also BUG [ 1197527 ] Patch Generator browse button not defaulting correctly)
683 Src: DiffWrapper.cpp DiffWrapper.h MergeDoc.cpp PatchDlg.cpp PatchTool.cpp
686 BUG: [ 1197310 ] Turkish fails to compile, current CVS
687 BUG: [ 1197310 ] Turkish trunk translation is from v2.2
688 Src/Languages/Turkish: MergeTurkish.rc
689 BUG: [ 1193229 ] options/codepage dialog out-of-date
690 Added ",.xml" to message (replaced all non-1252 messages)
692 Src/Languages/*: *.rc
693 BUG: [ 1166574 ] IDS_SUGGEST_IGNORECODEPAGE is misleading
695 Src/Languages/*: *.rc
696 BUG: [ 1193562 ] v2.2 charset in MergeGerman wrong
698 Src/Languages/*: *.rc
699 BUG: [ 1197397 ] Turkish missing from BuildAll.bat
700 Src/Languages/BuildAll.bat
701 BUG: [ 1197310 ] Turkish trunk translation is from v2.2
702 Copy all dialogs & string tables from English
703 Also remove some obsolete keywords (PURE, DISCARDABLE, etc)
704 Src/Languages/Turkish: MergeTurkish.rc resource.h
707 BUG: [ 1193260 ] Problems with the current German translation
709 PATCH: [ 1196119 ] Select syntax highlight colors
710 Src: MainFrm.cpp MainFrm.h Merge.dsp Merge.rc MergeDiffDetail.cpp MergeDoc.cpp
711 MergeEditView.cpp resource.h
712 Src new files: PropSyntaxColors.cpp PropSyntaxColors.h Syntaxcolors.cpp SyntaxColors.h
713 Src/Common: PreferencesDlg.cpp PreferencesDlg.h
714 Src/editlib: asp.cpp basic.cpp batch.cpp ccrystaltextview.cpp ccrystaltextview.h
715 cplusplus.cpp csharp.cpp dcl.cpp fortran.cpp html.cpp ini.cpp innosetup.cpp is.cpp
716 java.cpp lisp.cpp nsis.cpp pascal.cpp perl.cpp php.cpp python.cpp rexx.cpp rsrc.cpp
717 sgml.cpp sh.cpp siod.cpp sql.cpp tcl.cpp tex.cpp xml.cpp
718 Src/Languages: *.rc resource.h
721 PATCH: [ 1188787 ] New Chinese translation rc file (from PATCH 1183476)
722 Most of the menu updates from patch; no other updates from patch
723 Src/Languages/ChineseTraditional: MergeChineseTraditional.rc resource.h
724 PATCH: [ 1188787 ] New Chinese translation rc file (from PATCH 1183476)
725 Some of the string table translations
726 Src/Languages/ChineseTraditional: MergeChineseTraditional.rc
729 PATCH: [ 1195486 ] Remember dircompare sort column
730 Src: DirView.cpp DirView.h DirViewColHandler.cpp MainFrm.cpp OptionsDef.h
733 PATCH: [ 1157486 ] New options for wordbreak characters
734 (Fixed patch to use existing OPT_WORDDIFF_HIGHLIGHT instead of new option)
735 Src: MainFrm.cpp Merge.rc MergeDoc.cpp MergeDoc.h MergeDocLineDiffs.cpp
736 OptionsDef.h PropEditor.cpp PropEditor.h resource.h stringdiffs.cpp
737 stringdiffs.h stringdiffsi.h
739 Add Turkish translation (direct copy from version 2.2)
740 Src/Languages/Turkish: * and res/*
743 BUG: [ 1193059 ] Problems with the mouse at file comparison
744 Don't refresh filecompare every time mouse is clicked
745 Src: MergeEditView.cpp
746 PATCH: [ 1193447 ] Optimise location pane update.
747 Src: LocationView.cpp
748 BUG: [ 1193260 ] Problems with the current German translation
749 Src/Languages/German: MergeGerman.rc
752 PATCH: [ 1193033 ] Clarify file saving failed messagebox
753 Src: Merge.rc MergeDoc.cpp
757 PATCH: [ 1192741 ] Fix panes resetting when right-clicking with mouse
758 Src: LocationView.cpp MergeEditView.cpp
759 BUG: [ 1189723 ] COpenDlg::RemoveTrailingSlash() is unused
760 Src: OpenDlg.cpp OpenDlg.h
763 PATCH: [ 1190544 ] Translated Read Me-German.rtf
764 Docs/Users/Languages: Read Me-German.rtf
766 2005-04-28 WinMerge experimental release 2.3.3.2 (cvs)
769 PATCH: [ 1189875 ] Small cleanup for line replace code
771 PATCH: [ 1189718 ] OpenDlg: add trailing slash to directory names
772 Src: OpenDlg.cpp paths.cpp paths.h
773 PATCH: [ 1189692 ] Cleanup Dircompare init
774 Src: DirDoc.cpp DirDoc.h MainFrm.cpp PathContext.cpp PathContext.h
775 BUG: [ 1181883 ] Inconsistent behavior: select font vs. Use default
776 Src: MainFrm.cpp MainFrm.h
777 PATCH: [ 1190173 ] Hungarian translation (based on 2.3.3.1)
778 Submitted by Márton Balázs
779 Src/Languages/Hungarian: MergeHungarian.rc
782 BUG: [ 1179790 ] ReadMe-Hungarian.rtf file is missing
783 docs/Users/Languages new file: Read Me-Hungarian.rtf
784 PATCH: [ 1183368 ] Add option to ignore less than 3 seconds time difference
788 PATCH: [ 1186884 ] Restrict access to DirDoc's DiffContext
789 Src: 7zCommon.cpp DiffContext.cpp DiffContext.h DirActions.cpp DirDoc.cpc
790 DirDoc.h DirView.cpp DirView.h DirViewColHandler.cpp DirViewColItems.cpp
791 MainFrm.cpp MergeDoc.cpp
792 BUG: [ 1183031 ] Shared file give "parameter not correct error"
793 Additional fix from Perry
794 Src/Common: UniFile.cpp
795 PATCH: [ 1183368 ] Add option to ignore less than 3 seconds time difference
796 Src: DiffContext.cpp DiffContext.h DirDoc.cpp DirScan.cpp MainFrm.cpp Merge.rc
797 OptionsDef.h PropRegistry.cpp PropRegistry.h resource.h stdafx.h
798 Src/Common: PreferencesDlg.cpp
801 PATCH: [ 1184626 ] Allow only single instance to run. (2)
802 BUG: [ 1188363 ] Cannot open include file: 'sinstance.h': No such file or dir
803 Src/common new files: sinstance.h sinstance.cpp
806 BUG: [ 1187714 ] Cannot save my newly created text file (add missing line)
808 PATCH: [ 1184626 ] Allow only single instance to run. (2)
809 Submitted by Takashi Sawanaka
810 Src: ChildFrm.cpp DirDoc.cpp DirDoc.h DirView.cpp MainFrm.cpp MainFrm.h Merge.cpp
811 Merge.dsp Merge.h Merge.rc OptionsDef.h PropGeneral.cpp PropGeneral.h resource.h
812 Src/Common: PreferencesDlg.cpp
813 Src/Languages: resource.h *.rc
814 BUG: [ 1183031 ] Shared file give "parameter not correct error"
815 Fix from Robin Sandlin and Perry
816 Src/Common: UniFile.cpp
819 BUG: [ 1188063 ] UTF-8 file saving problem, the file header BOM missing.
820 Src/Common: UniFile.cpp
823 BUG: [ 1187714 ] Cannot save my newly created text file
824 Src: MergeDoc.cpp PathContext.h
825 Correct Polish translator name in Contributors list
826 Docs/Users: Contributors.txt
829 PATCH: [ 1185489 ] Tempfile path context
830 Src: MergeDoc.cpp MergeDoc.h PathContext.cpp PathContext.h
831 PATCH: [ 1184023 ] Syntax highlighting for Inno Setup files
834 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
835 Src/editlib new file: innosetup.cpp
838 PATCH: [ 1183772 ] Update Italian translation + readme
839 Submitted by Andrea Decorte
840 Src/Languages/Italian: MergeItalian.rc
841 Docs/users/Languages: Read Me-Italian.rtf
844 PATCH: [ 1183481 ] Updated Polish translation
846 Src/Languages/Polish: MergePolish.rc
847 Docs/users/Languages: Read Me-Polish.rtf
848 InnoSetup/Languages: Pölish.isl
849 PATCH: [ 1183669 ] Updated ReadMe-ChineseTraditional.rtf
851 Docs/users/Languages: Read Me-Chinese_Traditional.rtf
852 PATCH: [ 1181092 ] Path context class
853 Src: DiffContext.cpp DiffContext.h DirDoc.cpp DirDoc.h MainFrm.cpp Merge.dsp
854 MergeDoc.cpp MergeDoc.h
855 Src new files: PathContext.cpp PathContext.h
858 (Cosmetic) Add HTML entity escapes for Chinese simplified
859 Src/Common: LanguageSelect.cpp
863 PATCH: [ 1182416 ] Fix Compare by date hang
864 Src: DiffContext.cpp DiffContext.h DiffWrapper.cpp DiffWrapper.h DirScan.cpp
867 BUG: [ 1181906 ] Comment in LoadFromDirectory maybe wrong?
869 Src: FileFilterMgr.cpp
872 (Cosmetic) Add HTML entity escapes for several language names
873 Src/Common: LanguageSelect.cpp
874 PATCH: [ 1162668 ] Serialize font settings
875 Src: MainFrm.cpp Merge.dsp
876 Src new files: AppSerialize.cpp AppSerialize.h
878 2005-04-12 WinMerge experimental release 2.3.3.1 (cvs)
881 PATCH: [ 1179941 ] Syntax highlighting for NSIS files
884 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
885 Src/editlib new file: nsis.cpp
886 PATCH: [ 1181157 ] Swedish translation update
887 Submitted by Hans Eriksson
888 Src/Languages/Swedish: MergeSwedish.rc
889 Fix Russian lang file compile error
890 Src/Languages/Russian: MergeRussian.rc
893 PATCH: [ 1180768 ] Russian translation update
894 Submitted by Dmitriy Aleshkowskiy
895 Src/Languages/Russian: MergeRussian.rc
898 PATCH: [ 1178885 ] Merge diffs inside selection (with normal merge item)
899 Src: Merge.rc MergeEditView.cpp MergeEditView.h resource.h
900 Src/Languages: *.rc resource.h
903 PATCH: [ 1175731 ] Own menus for file- and directory compare
904 Src: MainFrm.cpp MainFrm.h Merge.cpp Merge.rc resource.h
905 Src/Languages: *.rc resource.h
908 PATCH: [ 1176040 ] French translation 2.3 branch
909 Submitted by Jean-F Jolin
910 Src/Languages/French: MergeFrench.rc
911 PATCH: [ 1176574 ] catalan translation update (setup)
912 Submitted by Jordi Vilar
913 InnoSetup: WinMerge Localized.iss
914 InnoSetup/Languages: Catalan.isl
915 Docs/Users/Languages: Read Me-Catalan.rtf
916 PATCH [ 1176741 ] Swedish ReadMe-Swedish.rtf file
917 Submitted by Hans Eriksson
918 Docs/Users/Languages: Read Me-Swedish.rtf
919 Update contributors file (Add Dutch and French translators)
920 Docs/Users: Contributors.txt
921 PATCH: [ 1176600 ] Drag location pane indicator with mouse
922 Src: LocationView.cpp LocationView.h
923 PATCH: [ 1168568 ] Cleanup some VSSHelper code
924 Src: VSSHelper.cpp VSSHelper.h
927 PATCH: [ 1175319 ] Dutch translation update
928 Submitted by Michel Coene
929 Src/Languages/Dutch: MergeDutch.rc
932 PATCH: [ 1175065 ] Use view lines when scrolling from location pane
933 Src: LocationView.cpp LocationView.h MergeEditView.cpp
936 PATCH: [ 1174935 ] Russian translation update
937 Submitted by Dmitriy Aleshkowskiy
938 Src/Languages/Russian: MergeRussian.rc
941 PATCH: [ 1173072 ] hungarian translation for current beta (2.3.2.0)
942 Submitted by Márton Balázs
943 Src/Languages: Hungarian/MergeHungarian.rc
946 PATCH: [ 1171805 ] Update italian translation
947 Submitted by Andrea Decorte
948 InnoSetup/Languages: Italian.isl
949 PATCH: [ 1172427 ] Norwegian translation for 2.2.2 / CVS head
950 Submitted by Hans Fr. Nordhaug
951 Src/Languages/Norwegian: MergeNorwegian.rc
954 BUG: [ 1172080 ] Unable to translate IDD_MERGE7ZMISMATCH string
956 Src/Languages: Merge*.rc
957 Widen Merge7z plugin download button in catalan translation
958 Src/Languages/Catalan: MergeCatalan.rc
959 Fix typo in MergeGerman.rc
960 Src/Languages/German: MergeGerman.rc
963 PATCH: [ 1169997 ] catalan translation update
964 Submitted by Jordi Vilar
965 Src/Languages/Catalan: MergeCatalan.rc
968 PATCH: [ 1168733 ] Doc for options
969 Docs/Developers new file: Options.html
972 BUG: [ 1162037 ] Missing localization (German)
973 Translation update from Tim Gerundt
974 Src/Languages/German/MergeGerman.rc
975 PATCH: [ 1162644 ] Tree-style options-dialog
976 Src: MainFrm.cpp Merge.dsp Merge.rc resource.h
977 Src/Common new files PreferencesDlg.cpp PreferencesDlg.h PropertyPageHost.cpp
978 PropertyPageHost.h wclassdefines.h WinClasses.cpp WinClasses.h
979 Src/Languages: Merge*.rc resource.h
982 PATCH: [ 1165515 ] Improve drawing location pane moved block lines
983 Src: LocationView.cpp LocationView.h
986 Update IDD_MERGE7ZMISMATCH resource in localized RC files
987 Src/Languages: Merge*.rc
990 PATCH: [ 1157769 ] Move GuessEncoding functions into one file
991 Src: DiffContext.cpp DiffContext.cpp MainFrm.cpp Merge.dsp
992 Src/Common: UniFile.cpp UniFile.h
993 Src new: codepage_detect.cpp codepage_detect.h
996 PATCH: [ 1155977 ] Log scriptlet plugin errors
998 PATCH: [ 1162571 ] Simplify SplitFilename
999 Src/Common: coretools.cpp
1000 Cosmetic (new comments)
1001 Src/Common: LanguageSelect.cpp
1004 PATCH: [ 1161709 ] Virtual InitOption() and SaveOption() for COptionsMgr
1005 Src/Common: OptionsMgr.h
1008 Widen controls to display Merge7z plugin names (unicode names got chopped off)
1010 BUG: [ 1154551 ] Merge7zInstaller download link focus issue
1014 Add Merge7z415(U).dll to Merge7zInstaller
1015 Merge7zInstaller: Files.rc2
1016 Merge7zInstaller - Initialize filename in Open dialog to "*.exe"
1017 Merge7zInstaller: Installer.cpp
1018 Fix typo in IDD_MERGE7ZMISMATCH dialog
1021 2005-03-15 WinMerge beta 2.3.2.0 released
1024 Add include I missed from fix to bug #1154153
1026 Remove version numbers accidentally applied earlier
1030 BUG: [ 1154153 ] Poor font choice for default font
1031 Fix submitted by Takashi Sawanaka
1035 BUG: [ 1162374 ] Recent WinMerge doesn't support NT4
1036 Src/Common: UniFile.cpp
1039 BUG: [ 1162369 ] short path name problem
1040 Fix paths_GetLongPath(), which erroneously added trailing backslash when passing in short path.
1044 PATCH: [ 1161671 ] Convert couple of VCS options to COptionsMgr
1045 Src: MainFrm.cpp MainFrm.h OptionsDef.h
1046 BUG: [ 1160919 ] Bad layout in the OpenDialog
1047 Fix submitted by Tim
1048 Languages/German: MergeGerman.rc
1051 PATCH: [ 1160923 ] Remove CMainFrame::m_nCompMethod (ugly hack)
1052 Src: DirDoc.cpp MainFrm.cpp MainFrm.h
1055 PATCH: [ 1160064 ] Undo for Copy All
1056 Src: MergeDoc.cpp MergeDoc.h
1057 Fix invalid compare for VSS dialog returnvalue
1061 PATCH: [ 1157359 ] Minor change for FILEFILTER_INFOLIST
1062 Src: FileFilterHelper.h
1063 PATCH: [ 1159465 ] Add Jesus (Mack) to contributors/Spanish
1064 Add [Jesús M. Delgado 'MacK'] to Spanish contributors.
1065 Alphabetize Swedish contributors.
1066 Users/Docs: Contributors.txt
1069 Cosmetic: Added & doxygen'd comments, and prefixed members with m_.
1070 Src: FilepathEdit.cpp FilepathEdit.h
1071 BUG: [ 1143619 ] Unicode chars in filename display as '_'
1072 Remove ES_OEMCONVERT from edit boxes in IDD_EDITOR_HEADERBAR.
1074 Src/Languages: Merge*.rc
1076 2005-03-08 WinMerge experimental release 2.3.1.6 (cvs)
1079 PATCH: [ 1158456 ] Fix setting font for headerbar editcontrols
1080 Src: EditorFilepathBar.cpp EditorFilepathBar.h
1081 PATCH: [ 1158484 ] Fix assert from headerbar-setactive() when closing views
1082 Src: EditorFilepathBar.cpp EditorFilepathBar.h
1083 PATCH: [ 1159112 ] Swedish translation revision
1084 Submitted by Hans Eriksson
1085 Languages/Swedish: MergeSwedish.rc
1086 PATCH: [ 1158136 ] Spanish translation revised
1087 Submitted by Jesus M. Delgado 'Mack'
1088 Languages/Spanish: MergeSpanish.rc
1091 PATCH: [ 1157859 ] Add LVS_SHOWSELALWAYS style to dirview
1092 Postlude: Alter WindowStyle_Add to call CWnd::ModifyStyle.
1093 Src/Common: WindowStyle.cpp
1096 PATCH: [ 1156198 ] Non-standard html in developer docs
1097 Docs/Developers: readme-developers-*.html
1100 PATCH: [ 1157524 ] Fix view line length
1101 editlib: ccrystaltextview.cpp ccrystaltextview.h
1102 PATCH: [ 964676 ] rc file lacks bytes after DIALOGEX defs
1103 Add 0,0,0x1 to any FONT line lacking it, for all DIALOGEX dialogs
1105 Languages: Merge*.rc
1106 PATCH: [ 968285 ] DBCS fixes from Sawanaka
1107 (continuing editlib portions)
1108 Src/editlib: batch.cpp crystaleditview.cpp crystaltextview2.cpp cplusplus.cpp
1109 cregexp.cpp csharp.cpp dcl.cpp filesup.cpp fortran.cpp html.cpp js.cpp
1110 java.cpp list.cpp pascal.cpp perl.cpp php.cpp python.cpp rexx.cpp rsrc.cpp
1111 sgml.cpp sh.cpp siod.cpp sql.cpp tcl.cpp tex.cpp xml.cpp
1112 PATCH: [ 1157859 ] Add LVS_SHOWSELALWAYS style to dirview
1113 Src: DirView.cpp Merge.dsp
1114 Common new files: WindowStyle.cpp WindowStyle.h
1118 Rename CDirFrame::SetFilter to CDirFrame::SetFilterStatusDisplay for easier greps.
1119 Src: DirDoc.cpp DirFrame.cpp DirFrame.h
1120 More filter clarifying renames
1121 Src: DirDoc.cpp FileFilterHelper.cpp FileFilterHelper.h MainFrm.cpp OpenDlg.cpp
1122 Rename FilterHelper's GetUseMask to IsUsingMask.
1123 Src: FileFilterHelper.cpp FileFilterHelper.h MainFrm.cpp OpenDlg.cpp
1124 BUG: [ 1153184 ] DiffWrapper.cpp missing NEW redefinition
1125 Added boilerplate new redefintion for DEBUG builds to DiffWrapper.cpp
1126 Src: DiffWrapper.cpp
1127 PATCH: [ 1157015 ] Spanish translation update
1128 Lots of updates to Spanish translation by Jesus M. Delgado 'Mack'
1129 Src/Languages/Spanish: MergeSpanish.rc
1130 PATCH: [ 1157145 ] FileFilterHelper doesn't have boilerplate new redefinition
1131 Src: FileFilterHelper.cpp
1132 PATCH: [ 968285 ] DBCS fixes from Sawanaka
1133 Applied asp & basic portions (there are many more)
1134 editlib: asp.cpp basic.cpp
1137 PATCH: [ 1147039 ] experimental patch for colored word diff
1138 Merge all the easy new Japanese string translations
1139 (Omit major changes to IDD_PROPPAGE_EDITOR & IDD_MERGE7ZMISMATCH.
1140 Languages: Japanese/MergeJapanese.rc
1141 PATCH: [ 1112871 ] new byte_compare function to bypass diffutils
1142 Src: DiffContext.h DiffWrapper.cpp DiffWrapper.h DirDoc.cpp DirScan.cpp Merge.dsp
1143 Src new files: ByteComparator.cpp ByteComparator.h
1146 PATCH: [ 1155319 ] Select font for dir compare view
1147 We must allow selecting file compare font even if no open views
1149 PATCH: [ 1155436 ] Remove non-const GetDiffAt() from CDiffContext
1150 Src: DiffContext.cpp DiffContext.h DirDoc.cpp DirView.h DirViewColHandler.cpp
1151 PATCH: [ 1156188 ] Updated readme-innosetup
1152 Docs/Developers: readme-developers-InnoSetup.html
1153 PATCH: [ 1147039 ] experimental patch for colored word diff
1154 Submitted by Takashi Sawanaka
1155 Src: MainFrm.cpp Merge.rc MergeDiffDetailView.cpp MergeDiffDetailView.h MergeDoc.h
1156 MergeDocLineDiffs.cpp MergeEditView.cpp MergeEditView.h OptionsDef.h
1157 PropColors.cpp PropColors.h resource.h
1158 Src/editlib: asp.cpp basic.cpp batch.cpp ccrystaltextview.cpp ccrystaltextview.h
1159 cplusplus.cpp csharp.cpp dcl.cpp fortran.cpp html.cpp ini.cpp is.cpp java.cpp
1160 lisp.cpp pascal.cpp perl.cpp php.cpp python.cpp rexx.cpp rsrc.cpp sgml.cpp sh.cpp
1161 siod.cpp sql.cpp tcl.cpp tex.cpp xml.cpp
1162 Src/Languages: *.rc resource.h
1165 PATCH: [ 1156253 ] Fix filter helper handling of new filters
1166 BUG: [ 1153018 ] Create new filter, now cannot find it
1167 Src: FileFilterHelper.cpp FileFilterHelper.h FileFiltersDlg.cpp Merge.cpp
1168 Merge.h paths.cpp paths.h
1171 PATCH: [ 1155319 ] Select font for dir compare view
1172 Src: DirView.cpp DirView.h MainFrm.cpp MainFrm.h Merge.rc OptionsDef.h
1174 PATCH: [ 1154667 ] Make CDiffContext paths private members
1175 Src: DiffContext.cpp DiffContext.h DirActions.cpp DirDoc.cpp DirScan.cpp DirView.cpp
1178 PATCH: [ 1154259 ] Non blurred 'error.bmp'
1179 New clearer error bitmap from Tim Gerundt
1180 Languages: res/error.bmp
1183 PATCH: [ 1151951 ] Alter getRightFilepath for root paths
1184 re: BUG: [ 1105933 ] Problem accessing files in network shares and removables
1185 Src: DiffContext.cpp
1188 BUG: [ 975226 ] Editor: Always refresh with Del-Key
1189 Fix submitted by Takashi Sawanaka
1190 Src: MergeEditView.cpp
1193 PATCH: [ 1154259 ] Non blurred 'error.bmp'
1194 New clearer error bitmap from Tim Gerundt
1196 PATCH: [ 1153127 ] Rename Filepath to FilepathWithEncoding
1197 Src: DiffWrapper.cpp DiffWrapper.h
1198 PATCH: [ 967230 ] Initialize default language from locale
1199 Src/Common: LanguageSelect.cpp LanguageSelect.h
1202 2005-03-01 WinMerge experimental release 2.3.1.5 (cvs)
1205 PATCH: [ 1153870 ] Disable redrawing dir compare view while adding items
1209 PATCH: [ 1152341 ] Merge7z update (DllBuild_Merge7z_10)
1210 Merge7z: Merge7z.h Merge7z311.cpp Merge7z311.dsp Merge7z312.dsp Merge7z313.dsp Merge7z407.dsp Merge7z408.dsp
1211 Merge7z409.cpp Merge7z409.dsp Merge7z410.dsp Merge7z411.dsp Merge7z412.dsp Merge7z413.dsp Merge7z414.dsp
1212 Merge7z415.dsp Merge7zCommon.cpp Merge7zCommon.h revision.txt tools.cpp tools.h
1213 PATCH: [ 1152469 ] Add Merge7zInstaller download link
1214 Src: 7zCommon.cpp 7zCommon.h dllpstub.cpp dllpstub.h markdown.cpp markdown.h Merge.dsp Merge.rc
1217 BUG: [ 895732 ] paths_GetLongPath usually ignores 2nd parameter
1218 Remove 2nd parameter entirely from paths_GetLongPath, and improve documentation.
1219 Src: Merge.cpp OpenDlg.cpp paths.cpp paths.h readme.txt
1222 PATCH: [ 1153091 ] Fix selecting default font from View menu
1223 Src: MainFrm.cpp MainFrm.h OptionsDef.h
1224 PATCH: [ 1144545 ] Project Handling Patch3 (remember last valid project path)
1225 Submitted by Andreas Morsing
1226 Src: MainFrm.cpp OpenDlg.cpp OptionsDef.h
1229 BUG: [ 1039158 ] Confusing EOL differences messagebox
1231 Languages: Merge*.rc
1234 PATCH: [ 1112636 ] Suggest cosmetic change in DiffFileData::OpenFiles
1235 (new method DiffFileData::Filepath::AssignPath)
1236 Src: DiffWrapper.cpp DiffWrapper.h
1237 BUG [ 1144425 ] German: Options/codepage dlg needs adjust
1238 (Fix by Tim Gerundt)
1239 Languages: MergeGerman.rc
1240 PATCH: [ 925085 ] Propose failing files 2gigs+ in size
1241 Src/Common: UniFile.cpp
1244 BUG: [ 1153017 ] FileFilterHelper::SetFilter ASSERTS on empty string
1245 Src: FileFilterHelper.cpp
1248 BUG: [ 1152913 ] LocationView type bugs?
1249 (Fixed 17 type conversion warnings in MSVC.NET 2003, mostly by explicit casts)
1250 Src: LocationView.cpp
1251 PATCH: [ 1152967 ] Fix re_match_2 declaration warnings
1252 Src/diffutils/lib: REGEX.C
1253 BUG: [ 1038897 ] Weird comment in DiffWrapper.cpp
1254 cosmetic: removing obsolete comment, improving existing comments
1255 Src: DiffWrapper.cpp
1256 Cosmetic: Add more explanation to function header of
1257 FileFilterHelper::LoadFileFilterDirPattern.
1258 Src: FileFilterHelper.cpp
1259 BUG: [ 1152911 ] CListCtrlEx::Dump is an infinite loop.
1260 Src/Common: listvwex.h
1263 PATCH: [ 1152256 ] UniFile may fail to read last line
1264 Src/Common: UniFile.cpp
1265 Attempt to fix bug [1152375] 'Help -> Archive Support disabled' broken
1269 PATCH: [ 1151949 ] Fix CDirDoc::FindItemFromPaths for root
1273 PATCH: [ 1145016 ] i18n the version control strings
1274 Src: Merge.rc PropVss.cpp PropVss.h resource.h
1275 Languages: resource.h Merge*.rc
1277 2005-02-23 WinMerge experimental release 2.3.1.4 (cvs)
1280 PATCH: [ 1149081 ] Invalid string compare in CChildFrm.cpp
1282 PATCH: [ 1149365 ] Check linenumber to goto for upper limit
1283 Src: MergeEditView.cpp
1284 PATCH: [ 1149388 ] Check for previous compare text before find again
1285 Src/editlib: ccrystaltextview.cpp
1286 Add compiler-selecting ifdef to Unifile.cpp to make it compile with MSVC6 and MSVC7
1287 Src/Common: UniFile.cpp
1290 PATCH: [ 1145522 ] fix crash on search
1291 Submitted by Takashi Sawanaka
1292 Src/editlib: ccrystaltextview.cpp
1293 BUG: [ 1144580 ] markdown.cpp compile error with VS 2003
1298 Update Docbook instructions in devel doc (path changed in sf.net)
1299 Docs/Developers: readme-developers.html
1302 BUG [ 1144978 ] No languages available in development
1303 Fix CopyAll.bat, and cosmetic changes to LanguageSelect.*
1304 Src/Common: LanguageSelect.cpp LanguageSelect.h
1305 Languages: CopyAll.bat
1308 Fix 'cliboard' typo in rc files.
1312 BUG: [ 1144917 ] cvs source does not compile: '_stati64' : undeclared identif
1313 Fix ANSI compilation of stati64
1314 Src/Common: UniFile.cpp
1317 PATCH: [ 1144588 ] Remove show bak files setting from configlog
1318 Src: ConfigLog.cpp ConfigLog.h
1321 PATCH: [ 1144059 ] Allow getting filestatus from open file in UniXXXFile
1322 Common: UniFile.cpp UniFile.h
1323 Fix compile error in MainFrm.cpp
1325 Add typecast for VC6
1329 PATCH: [ 1124475 ] Update of the swedish translation
1330 Submitted by Hans Eriksson
1331 Src/Languages/Swedish: MergeSwedish.rc
1334 PATCH: [ 1124380 ] Use _tstati64() in UniLocalFile::DoGetFileStatus()
1335 Common: UniFile.cpp UniFile.h
1338 PATCH: [ 1123539 ] Small improvement for code creating backup copy
1342 PATCH: [ 1118261 ] Allow creating and deleting filefilters from UI
1343 Src: FileFilterHelper.cpp FileFilterHelper.h FileFilterMgr.cpp FileFilterMgr.cpp
1344 FileFiltersDlg.cpp FileFiltersDlg.h Merge.cpp Merge.rc Plugins.cpp Plugins.h resource.h
1345 Filters new file: FileFilter.tmpl
1348 PATCH: [ 1116778 ] Project Handling patch
1349 Submitted by Andreas Morsing
1350 Src: MainFrm.cpp MainFrm.h Merge.rc OpenDlg.cpp OpenDlg.h ProjectFile.cpp ProjectFile.h resource.h
1351 Languages: *.rc resource.h
1352 Docs/Users: Contributors.txt
1355 PATCH: [ 1117375 ] Rememer status/toolbar visible status
1356 Src: MainFrm.cpp MainFrm.h OptionsDef.h
1359 PATCH: [ 1107467 ] Detect 7-Zip version from 7zip_pad.xml (2)
1360 Src: 7zCommon.cpp 7zCommon.h ConfigLog.cpp Merge.dsp Merge.rc paths.cpp paths.h
1361 Src new files: charsets.c charsets.h language.c language.h markdown.cpp markdown.h
1362 Src/Common: version.cpp version.h
1365 PATCH: [ 1114360 ] Non-blocking file filter editing
1366 Src: DiffFileInfo.cpp DiffFileInfo.h DirDoc.cpp DirViewColItems.cpp FileFilterHelper.cpp
1367 FileFilterHelper.h FileFilterMgr.cpp FileFilterMgr.h MainFrm.cpp Merge.dsp
1368 Src new files: FileInfo.cpp FileInfo.h
1371 BUG: [ 1039592 ] No differences shown after changing EOL options when loading
1372 Src: MergeDoc.cpp MergeEditView.cpp MergeEditView.h
1375 Backout fix for bug [ 1110826 ] Regex $ breaks linefilter
1379 BUG: [ 1110826 ] Regex $ breaks linefilter
1381 PATCH: [ 1112111 ] Confusing message for identical scratchpads
1385 PATCH: [ 1108716 ] Load lang files from 'Languages' subdirectory
1386 Src/Common: LanguageSelect.cpp
1389 Src/Common: unicoder.cpp
1390 cosmetic: add comments to get_unicode_char
1393 PATCH: [ 946600 ] Copy lines with linenumbers
1394 Src: Merge.rc MergeEditView.cpp MergeEditView.h resource.h
1395 Languages: *.rc resource.h
1397 2005-01-24 WinMerge experimental release 2.3.1.3 (cvs)
1400 PATCH: [ 1062082 ] Fix bug [1057997] (long lines issue)
1401 (Applied UniFile.cpp portion of this patch)
1402 Src/Common: UniFile.cpp UniFile.h
1404 BUG: [ 1029643 ] (Catalan) Options/codepage too crowded
1405 Moved codepage edit box over 20 units, widened label 10 units
1406 Languages/Catalan: MergeCatalan.rc
1407 PATCH: [ 1062082 ] Fix bug [1057997] (long lines issue)
1408 (Applied UniFile.cpp portion of this patch)
1409 Minor adjustment (remove "sline(1024)" which broken VS.NET compilation).
1413 PATCH: [ 1107508 ] Add dirview statusbar panel showing current filter name
1414 Src: DirDoc.cpp DirFrame.cpp DirFrame.h resource.h
1415 Languages: resource.h
1416 Update MASM filter file
1417 Submitted by Matt Bossard (to forum)
1418 Filters file: MASM.flt
1419 Fix bug that left path was shown twice in caption
1423 PATCH: [ 1107516 ] Suggest code simplification for DiffFileInfo ctr
1425 PATCH: [ 1103530 ] Include codepages in "force unification" question
1426 Src: MainFrm.cpp Merge.rc
1428 Minor grammar fixes & wording changes
1429 Docs/Developers/readme-developers.html
1430 Add section on "Forcing compiler version with MakeResDll"
1431 Docs/Developers/readme-developers.html
1432 PATCH: [ 1107686 ] Fix LANGAGE to LANGUAGE in Merge.rc
1435 PATCH: [ 1103530 ] Include codepages in "force unification" question
1436 Placeholder in Japanese text.
1437 Languages/Japanese: MergeJapanese.rc
1438 PATCH: [ 1039228 ] add codepage info strings
1439 Src: codepage.cpp codepage.h Merge.rc resource.h
1440 Src/Languages: Merge*.rc, resource.h
1441 BUG: [ 1162653 ] CMainFrame::ShowVSSError doesn't always log error
1443 BUG: [ 1157554 ] MergeKorean IDD_FILEFILTERS not DIALOGEX
1444 Src/Languages/Korean: MergeKorean.rc
1447 PATCH: [ 1107484 ] Fix broken version columns
1448 Src: DiffContext.cpp DiffContext.h DiffFileInfo.cpp DiffFileInfo.h
1452 PATCH: [ 1103266 ] Merge7z update (DllBuild_Merge7z_9)
1453 Merge7z: Merge7z.h Merge7z311.cpp Merge7z311.dsp Merge7z312.dsp Merge7z313.dsp Merge7z407.dsp Merge7z408.dsp
1454 Merge7z409.cpp Merge7z409.dsp Merge7z410.dsp Merge7z411.dsp Merge7z412.dsp Merge7z413.dsp Merge7z414.dsp
1455 Merge7zCommon.cpp Merge7zCommon.h revision.txt
1456 PATCH: [ 1103274 ] Merge7z interface plugin installer
1457 Merge7zInstaller: Files.rc2 Installer.cpp Installer.rc Merge7zInstaller.dsp resource.h
1460 PATCH: [ 1103542 ] Declare _MBCS in ANSI builds
1464 BUG: [ 1002327 ] "Untitled left" not translated when language switches
1466 PATCH: [ 1106330 ] Change position in locationpane with single mouseclick
1467 Src: LocationView.cpp LocationView.h
1468 PATCH: [ 1106383 ] Show few chars of 'context' when horizontal scrolling lines
1469 Src/editlib: ccrystaltextview.cpp
1472 PATCH: [ 1105640 ] Properly update locationpane visible area indicator
1473 Src: LocationView.cpp LocationView.h MergeEditView.cpp MergeEditView.h
1474 Add new MASM filter file
1475 Submitted by Matt Bossard (to forum)
1476 Filters new file: MASM.flt
1479 PATCH: [ 1062082 ] Fix bug [1057997] (long lines issue)
1480 View scrolling optimisation from Takashi Sawanaka
1481 Src/editlib: ccrystaltextview.cpp
1484 PATCH: [ 1001341 ] Update edit view status bar on language change
1486 Src: ChildFrm.cpp ChildFrm.h DirDoc.cpp DirFrame.cpp DirView.cpp
1487 MainFrm.cpp MergeDoc.cpp MergeDoc.h MergeEditView.cpp
1490 PATCH: [ 1100462 ] Center find result in file compare
1491 Src/editlib: ccrystaltextview.cpp
1493 2005-01-11 WinMerge experimental release 2.3.1.2 (cvs)
1496 PATCH: [ 1100176 ] small fix in DirDoc RefreshOptions
1497 Submitted by Jim Fougeron
1499 Update contributors.txt (Jim Fougeron)
1500 Doc/Users: Contributors.txt
1503 Add Hungarian to resource.h updates in UpdateAll_resource_h.bat
1504 Src/Languages: UpdateAll_resource_h.bat
1505 PATCH: [ 1099011 ] Added "Hide files" to right click menu (onthefly filter)
1506 Submitted by Jim Fougeron
1507 Src: DirView.cpp DirView.h Merge.rc resource.h
1508 Src/Languages: *.rc resource.h
1511 PATCH: [ 1019445 ] IDS_WINMERGE_THIS_DIRECTORY is unused
1512 Src: Merge.rc resource.h
1513 Src/Languages: *.rc resource.h
1516 PATCH: [ 1098340 ] crash rarely when starting many winmerge continuously
1517 Anonymous submission
1518 Src: FileFilterMgr.cpp
1521 PATCH: [ 1096609 ] Show tooltips for filefilter dialog list
1522 Src: FileFiltersDlg.cpp FileFiltersDlg.h
1525 PATCH: [ 1094534 ] Add description field for file filters
1526 Src: FileFilterHelper.cpp FileFilterHelper.h FileFilterMgr.cpp FileFilterMgr.h
1527 FileFiltersDlg.cpp FileFiltersDlg.h MainFrm.cpp Merge.rc resource.h
1528 Src/Languages: *.rc resource.h
1529 Filters: ADAMulti.flt Merge_GnuC_loose.flt Merge_VB_loose.flt Merge_VC_loose.flt
1531 PATCH: [ 1094467 ] Update contributors: Tim is now developer
1532 Docs/Users: Contributors.txt
1535 PATCH: [ 1094474 ] Visible area indicator for location pane
1536 Src: LocationView.cpp LocationView.h MergeEditView.h
1539 PATCH: [ 1088049 ] Ask about saving when Window/Close is selected
1540 Src: MergeEditView.cpp MergeEditView.h
1543 BUG: [ 1064942 ] Copyright notice????
1544 Bumped copyright year to continue through 2005
1546 BUG: [ 859995 ] convertToBuffer assumes ISO-8895-1 codepage
1547 Add comment about flawed code in actual code
1548 Src/Common: unicoder.cpp
1549 BUG: [ 859995 ] convertToBuffer assumes ISO-8895-1 codepage
1550 Removed flawed and unused method convertToBuffer.
1551 Src/Common: unicoder.cpp unicoder.h
1554 PATCH: [ 1086601 ] Dircompare statepane miscounting skipped items
1555 Src: DirCompStateBar.cpp
1556 PATCH: [ 1086745 ] Find- and Replace-dialogs to remember strings too
1557 Src/editlib: ccrystaltextview.cpp ceditreplacedlg.cpp ceditreplacedlg.h
1558 cfindtextdlg.cpp cfindtextdlg.h
1561 RFE: [ 1085099 ] 'fileskip.bmp' looks to similar to 'equal.bmp'
1562 Src/res: fileskip.bmp
1563 Languages: fileskip.bmp
1565 2004-12-05 WinMerge experimental release 2.3.1.1 (cvs)
1568 PATCH: [ 1078505 ] Use DOS eol as filename/pathname clipboard separator
1570 PATCH: [ 981218 ] Show filenames/paths in caption
1571 Src: DirDoc.cpp DirDoc.h DirView.cpp DirView.h MainFrm.cpp MergeDoc.cpp MergeDoc.h
1574 PATCH: [ 1068011 ] Partial French translation
1575 Submitted by Matthieu Pupat
1576 Src/Languages/French: MergeFrench.rc
1577 Docs/Users: Contributors.txt
1580 PATCH: [ 1075591 ] Disable file filter edit button for no filter selection
1581 Src: FileFiltersDlg.cpp FileFiltersDlg.h
1582 PATCH: [ 1062082 ] Fix bug [1057997] (long lines issue)
1583 Additional optimisation from Takashi Sawanaka
1584 Src/editlib: ccrystaltextview.cpp
1587 Remove unneeded system.cpp (no longer present in 7z411+) from Merge7z DSPs
1588 Merge7z: Merge7z311.dsp Merge7z312.dsp Merge7z313.dsp
1589 Merge7z407.dsp Merge7z408.dsp Merge7z409.dsp Merge7z410.dsp Merge7z411.dsp Merge7z412.dsp
1592 PATCH: [ 1058142 ] update coloring of batch file
1593 Submitted by Andre Arpin
1594 Src/editlib: batch.cpp
1597 PATCH: [ 1067374 ] Norwegian translation for 2.2.0
1598 Submitted by Hans Fr. Nordhaug
1599 Src/Languages/Norwegian: MergeNorwegian.rc
1602 PATCH: [ 1065462 ] Show all skipped items when selected so
1606 PATCH: [ 1057062 ] Separate Skipped flags from compare result flags
1607 Src: DiffContext.h DirCompStateBar.cpp DirDoc.cpp DirScan.cpp
1608 DirView.cpp DirViewColItems.cpp
1611 PATCH: [ 1063342 ] Fix problem in XML syntax highlight and backslash
1612 Src/editlib: xml.cpp
1613 BUG: [ 1063100 ] Files with a space not handled (Clearcase integration)
1615 PATCH: [ 1059785 ] Simplify dir compare item update after copy etc
1616 Src: DiffContext.cpp DiffContext.h DiffFileInfo.cpp DiffFileInfo.h
1617 DirActions.cpp DirDoc.cpp DirDoc.h
1620 PATCH: [ 1062082 ] Fix bug [1057997] (long lines issue)
1621 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
1622 PATCH: [ 1059604 ] Fix bug [1048997] archive popup interferes with Help menu
1626 PATCH: [ 1050329 ] readme-developers-InnoSetup.html
1627 Docs/Developers: readme-developers-InnoSetup.html
1630 BUG: [ 828065 ] More overlapping letters in Dansk/Norsk
1632 Src/Languages/Danish: MergeDanish.rc
1635 PATCH: [ 1053475 ] Exponentially grow long lines when reading
1636 Src/Common: UniFile.cpp UniFile.h
1637 Src: Merge.dsp MergeDoc.cpp
1638 Fix UniFile.cpp for UNICODE build (PATCH: [ 1053475 ]).
1641 PATCH: [ 1061155 ] Updated danish translation
1642 Submitted by Christian
1643 Src/Languages/Danish: MergeDanish.rc
1646 PATCH: [ 1058992 ] More flexible whitespaces for file filter files
1647 Src: FileFilterMgr.cpp
1648 BUG: [ 1058947 ] Filter files sensitive to spaces
1649 Add new file filter for ADAMulti (from jpizzi)
1650 Filters new file: ADAMulti.flt
1651 PATCH: [ 1053282 ] Korean translation
1652 Submitted by Sukjoon, Hwang
1653 Src/Languages/Korean: MergeKorean.rc
1656 PATCH: [ 1058293 ] The finished german language file
1657 Submitted by Tim Gerundt
1658 Src/Languages/German: MergeGerman.rc
1659 BUG: [ 1057699 ] GetModTime() in DirDoc.cpp is unused
1663 PATCH: [ 1057719 ] Add Hungarian translator to Contributors list
1664 Docs/Users: Contributors.txt
1667 PATCH: [ 1036683 ] unicoder.cpp always use GetACP codepage (remove dead variable)
1668 Src/Common: unicoder.cpp
1671 PATCH: [ 1055624 ] The finished hungarian language file
1672 (translation credit in versioninfo)
1673 Src/Languages: Hungarian/MergeHungarian.rc
1677 Merge7z: Merge7z410.dsp
1680 PATCH: [ 1055681 ] Add Bool type for options and convert existing options
1681 Src: DirActions.cpp DirDoc.cpp DirView.cpp MainFrm.cpp MergeDiffDetailView.cpp
1682 MergeDoc.cpp MergeEditView.cpp OpenDlg.cpp
1683 Src/Common: OptionsMgr.cpp OptionsMgr.h varprop.h
1686 PATCH: [ 1055551 ] Move cursor to begin of previous line when deleting diff
1687 Src: MergeDoc.cpp MergeDoc.h MergeEditView.cpp
1688 PATCH: [ 1053234 ] Suggested expansions for Organization.txt
1690 Docs/Developers: Organisation.txt
1693 PATCH: [ 1055067 ] Add Hungarian support
1694 Src/Common: LanguageSelect.cpp
1695 PATCH: [ 1055624 ] The finished hungarian language file
1696 Src/Languages: Hungarian/*
1697 PATCH: [ 1053421 ] Changing warning level to 3 in release targets
1701 PATCH: [ 1003457 ] Move difflist to new class DiffList
1702 Fix warnings for signed/unsigned comparison
1706 PATCH: [ 1003457 ] Move difflist to new class DiffList
1707 Last minute updates to files I forgot to add (thanks Perry!)
1708 Src: DiffList.cpp DiffList.h
1711 PATCH: [ 1003457 ] Move difflist to new class DiffList
1712 Src: DiffList.cpp DiffList.h
1715 PATCH: [ 1003457 ] Move difflist to new class DiffList
1716 Src: DiffWrapper.cpp DiffWrapper.h LocationView.h Merge.dsp
1717 MergeDiffDetailView.cpp MergeDoc.cpp MergeDoc.h MergeEditView.cpp
1718 BUG: [ 1052762 ] WinMerge VERY slow to startup
1721 2004-10-24 WinMerge experimental release 2.1.7.16 (cvs) (Perry)
1724 PATCH: [ 1053282 ] Korean translation
1725 Src/Languages/Korean: MergeKorean.rc
1728 PATCH: [ 1048288 ] Fixes to Organization.txt
1730 Docs/Developers/Organisation.txt
1733 BUG: [ 1048439 ] UNICODE build calling IsDBCSLeadByte (shouldn't)
1734 Src: stringdiffs.cpp
1735 Src/editlib: ccrystaltextview.cpp
1738 BUG: [ 1052283 ] after edit, asks TWICE for rewriting the original file (-e switch)
1740 Clarify comment about closing app in CMainFrame::PreTranslateMessage()
1744 PATCH: [ 966908 ] find byte difference in line
1745 Src: Merge.rc MergeDiffDetailView.cpp MergeDiffDetailView.h
1746 MergeDoc.h MergeDocLineDiffs.cpp MergeEditView.cpp
1747 MergeEditView.h resource.h stringdiffs.cpp stringdiffs.h
1750 PATCH: [ 1049688 ] Fix caret handling of displayable whitespace
1751 Src/editlib: ccrystaltextview.cpp
1754 PATCH: [ 1048838 ] German translation updated for RC
1755 Submitted by Tim Gerundt
1756 Src/Languages/German: MergeGerman.rc
1759 PATCH: [ 1048412 ] Log font info in configuration
1760 Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
1761 PATCH: [ 1036683 ] unicoder.cpp always use GetACP codepage
1762 Src/Common: unicoder.cpp
1765 PATCH: [ 1048405 ] Delete old, commented out line in ConfigLog.cpp
1769 PATCH: [ 1043909 ] Add support for 7-Zip 4.09, plus DSPs for 4.07 and 4.08
1770 Leave decision whether to recurse into folders to enumerator
1771 Fix leading zero in 7-Zip minor version numbers shown in "archive support disabled" message
1772 Merge7z: Merge7z.def Merge7z.h Merge7z311.cpp Merge7z407.dsp Merge7z408.dsp Merge7z409.cpp
1773 Merge7z409.dsp Merge7zCommon.cpp Merge7zCommon.h revision.txt StdAfx.h
1774 Src: 7zCommon.cpp 7zCommon.h
1777 PATCH: [ 1046546 ] Open new manual locally
1781 PATCH: [ 1046583 ] Improved 48x48 icon
1782 Submitted by Tim Gerundt
1784 Src/Languages/*/res: Merge.ico
1785 PATCH: [ 1047670 ] Catalan translation update
1786 Submitted by Jordi Vilar
1787 Src/Languages/Catalan: MergeCatalan.rc
1788 BUG: [ 1047812 ] number of differences not recalculated (merging whole files)
1791 2004-10-15 WinMerge experimental release 2.1.7.15 (cvs) (Perry)
1794 PATCH: [ 942447 ] CVS organisation doc
1795 Docs/Developers new file: Organisation.txt
1798 PATCH: [ 1045473 ] Disable Ctrl+Arrow merging in Mergemode
1799 Src: MergeEditView.cpp
1800 Additional change for patch [ 1045473 ]
1801 Src: MergeEditView.cpp
1804 PATCH: [ 1043819 ] Fix recent compiler warnings in src/util.c
1805 diffutils: src/util.c
1808 PATCH: [ 1040016 ] patch for BUG[1039615] caret splitting wide characters
1809 Src/editlib: ccrystaltextview.cpp
1812 BUG: [ 1035227 ] Selected font change won't be applied... when not needed
1814 PATCH: [ 1043246 ] Fix problem selecting <none> as filefilter
1815 Src: FileFilterHelper.cpp FileFiltersDlg.cpp
1816 PATCH: [ 1043367 ] Change brace indentation automation for C/C++
1817 Src/editlib: ccrystaltextview.cpp
1820 PATCH: [ 1040041 ] [ 1039640 ] reproducible tooltip ASSERT in debug
1821 Submitted by Takashi Sawanaka
1822 Src: MergeEditView.cpp
1825 PATCH: [ 1039552 ] Italian translation updated for RC
1826 Submitted by Andrea Decorte
1827 Src/Languages/Italian: MergeItalian.rc
1828 PATCH: [ 1034854 ] Use "Terminal" font instead of "Courier" as default font.
1829 Submitted by Takashi Sawanaka
1833 BUG: [ 1037587 ] XML Syntax highlighting: Problems with numbers
1834 Src/editLib: xml.cpp
1835 PATCH: [ 1039552 ] Italian translation updated for RC
1836 Submitted by Andrea Decorte
1837 Src/Languages/Italian: MergeItalian.rc
1838 PATCH: [ 1039495 ] Trap diffutils errors with SEH
1839 Src: DiffWrapper.cpp DiffWrapper.h
1840 Src/diffutils/src: UTIL.C
1841 PATCH: [ 1003107 ] Remove unused CMergeDoc::CountPrevBlanks()
1842 Src: MergeDoc.cpp MergeDoc.h
1845 PATCH: [ 1039300 ] Factor listviewex code so it can be used with a CListCtrlEx.
1846 Src/Common: listvwex.cpp listvwex.h
1849 PATCH:[ 1037449 ] Fix char width computation for displayable whitespace
1850 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
1853 PATCH: [ 1039096 ] Save ignore EOL option when changed during file loading
1855 PATCH: [ 1039372 ] Save mixed EOL option when changed during file loading
1857 PATCH: [ 1039552 ] Italian translation updated for RC
1858 Submitted by Andrea Decorte
1859 Src/Languages/Italian: MergeItalian.rc
1862 PATCH: [ 1039001 ] Swedish translation update
1863 Submitted by Hans Eriksson
1864 Src/Languages/Swedish: MergeSwedish.rc
1867 PATCH: [ 1038749 ] Fix whitespace display
1868 Src/editlib: ccrystaltextview.cpp
1869 PATCH: [ 1036558 ] Cosmetic cleanup in CMergeApp::DoMessageBox
1873 PATCH: [ 1038091 ] Various Updates in German Translation
1874 Submitted by Tim Gerundt
1875 Src/Languages/German: MergeGerman.rc
1876 PATCH: [ 1038361 ] Left/Right read-only cmdline arguments wrong way around
1877 Submitted by markanthony
1880 2004-09-30 2.2RC (2.1.8.0) released
1883 Fix bracketing mistake in PATCH: [ 1034810 ]
1884 Src/editlib: ccrystaltextview.cpp
1885 PATCH: [ 1034754 ] Fix demoGuessEncoding's default
1886 Src: codepage.cpp codepage.h DiffWrapper.cpp
1887 PATCH: [ 1037418 ] Fix whitespace for Unicode non-1252
1888 PATCH: [ 1037424 ] fix non-unicode initialization loop in ViewableWhitespace
1889 Src: ViewableWhitespace.cpp
1892 PATCH: [ 1034810 ] fix whitespace for other encodings
1893 Src: Merge.dsp ViewableWhitespace.cpp ViewableWhitespace.h
1894 Src/editlib: ccrystaltextview.cpp
1897 PATCH: [ 1036134 ] Show error about invalid linefilter regexps
1898 Src: MainFrm.cpp MainFrm.h Merge.rc resource.h
1899 Src/diffutils/lib: REGEX.C REGEX.H
1900 Src/Languages: *.rc resource.h
1903 PATCH: [ 1034719 ] IDS_SUGGEST_IGNORECODEPAGE change?
1906 Src/Languages: *.rc (except MergeCatalan.rc, MergeItalian.rc & MergeSwedish.rc)
1907 PATCH: [ 1002247 ] Remove unneeded CDirView::OnCustomDraw()
1908 Src: DirView.cpp DirView.h
1911 Add links to DocBook DSSL customisation
1912 Docs/Developers: readme-developers.html
1915 PATCH: [ 968285 ] DBCS fixes from Sawanaka
1916 The crystaltextview.cpp portion of patch, with a new method (GetCharWidthFromChar) to reduce ifdefs.
1917 Src/EditLib: ccrystaltextview.cpp
1920 PATCH: [ 1034550 ] Catalan translation update
1921 Submitted by Jordi Vilar
1922 Src/Languages/Catalan: MergeCatalan.rc
1923 PATCH: [ 1034557 ] Swedish translation update
1924 Submitted by Hans Eriksson
1925 Src/Languages/Swedish: MergeSwedish.rc
1926 PATCH: [ 1034642 ] Updated Japanese Translation
1927 Submitted by Takashi Sawanaka
1928 Src/Languages/Japanese: MergeJapanese.rc
1931 PATCH: [ 1033678 ] Better description for 'Reset messageboxes'
1934 Open WinMerge manual from http://winmerge.org/2.2/manual/index.html
1936 BUG: [ 1034019 ] Italian: language list unsorted
1937 Src/Languages/Italian: MergeItalian.rc
1940 PATCH: [ 1032841 ] Add 'DiffEngine' filegroup to project file
1944 BUG: [ 1029646 ] (Norwegian) Options/Editor text chopped off
1948 BUG: [ 1029637 ] (Italian) Options/Codepage detect codepage label cut-off
1954 Widen space for text in language change dialog
1959 PATCH: [ 1030752 ] Set focus to file view when goto line in location pane
1960 Src: LocationView.cpp
1961 BUG: [ 1026833 ] WinMergeU.exe build to dir MergeUnicodeReleaseMinsize
1962 Build WinMergeU.exe to Build\MergeUnicodeRelease\
1966 PATCH: [ 1030490 ] Updated Swedish Translation
1967 Submitted by Hans Eriksson
1968 Src/Languages/Swedish: MergeSwedish.rc
1969 BUG: [ 1029644 ] (English) Options/System wording fix
1971 More space for texts in Options/System
1976 PATCH: [ 1029538 ] Reverse 'Ignore carriage return differences' when resetting
1977 Src: PropCompare.cpp
1978 BUG: [ 1029647 ] (English) Options/General text cut-off
1979 Fixed other languages also
1981 Src/Languages: *.rc (except MergeCatalan.rc)
1984 Fix Italian editor property page (tabs section) & widen corresponding English controls
1986 Src/Languages: Italian/MergeItalian.rc
1988 2004-09-15 WinMerge experimental release 2.1.7.14 (cvs)
1991 PATCH: [ 1027936 ] Fix statusbar display for ghost lines
1992 Src: MergeEditView.cpp
1993 PATCH: [ 1027994 ] Use current filename and path as defaults for SaveAs dialog
1995 BUG: [ 1027605 ] Esc (as indicated by File Exit) doesn't quit app
1996 Remove ESC from menuitem. Also fix merge-mode shortcut to F9.
1999 PATCH: [ 1026619 ] Fix bug [ 1017264 ] Location pane contextmenu items...
2000 Submitted by Jochen (jtuc)
2001 Src: LocationView.cpp
2004 PATCH: [ 1027118 ] Separate items for Copy Path in dircompare context menu
2005 Src: DirView.cpp DirView.h Merge.rc resource.h
2006 Src/Languages: *.rc resource.h
2007 PATCH: [ 1027382 ] Customised Save As dialog captions
2008 Src: Merge.rc MergeDoc.cpp resource.h
2009 Src/Languages: *.rc resource.h
2010 Add Lee Jae-Hong as Korean translator contributor
2011 Docs/Users: Contributors.txt
2012 Remove declaration of non-existent function DeleteFileOrError()
2014 Remove declaration of non-existent function CleanupFileBufs()
2016 Don't hide rescan result for binary file compare
2020 PATCH: [ 1026894 ] More space for translations in Goto-dialog
2023 PATCH: [ 1027086 ] Catalan translation Update
2024 Submitted by Jordi Vilar
2025 Src/Languages/Catalan: MergeCatalan.rc
2026 Add note about changed commandline when using docbook2html in SF.net
2027 Docs/Developers: readme-developers.html
2028 PATCH: [ 1027183 ] Swedish Translation Update
2029 Submitted by Hans Eriksson
2030 Src/Languages/Swedish: MergeSwedish.rc
2031 Fix couple of lang names in Swedish translation
2032 Submitted by Hans Eriksson
2033 Src/Languages/Swedish: MergeSwedish.rc
2036 Fix Italian lang file build error and remove unneeded \n
2037 Src/Languages/Italian: MergeItalian.rc
2040 PATCH: [ 1025411 ] Cleanup PropVSS.cpp
2042 PATCH: [ 1025443 ] Add '1 Difference Found' text
2043 Src: Merge.rc MergeDoc.cpp resource.h
2044 Src/Languages: *.rc resource.h
2045 Add instructions for compiling lang files (using MakeResDll.exe)
2046 Docs/Developers: readme-developers.html
2049 PATCH: [ 1025052 ] Italian translation updated for latest experimental version
2050 Submitted by Andrea Decorte
2051 Src/Languages/Italian: MergeItalian.rc
2052 PATCH: [ 1023074 ] Fix and cleanup version control options dialog
2057 PATCH: [ 1023917 ] Don't close dirview when mergedocs closed by reusing code
2058 Fixes bug #1023412 Crash in WinMerge.exe 2.1.7.13
2059 Src: DirDoc.cpp DirDoc.h
2061 2004-09-03 WinMerge experimental release 2.1.7.13 (cvs)
2064 PATCH: [ 1021153 ] Fix ansi files EOL detection in unicode builds
2065 Src/Common: UniFile.cpp
2066 BUG: [ 986708 ] Wrong EOL character
2067 DOS EOL was inserted when editing unix or mac files
2068 Src/editlib: ccrystaleditview.cpp
2069 PATCH: [ 1021478 ] Korean Resource file update
2070 Submitted by Lee Jae-Hong
2071 Src/Languages/Korean: MergeKorean.rc
2074 PATCH: [ 1020403 ] Allow WinMerge to open files write-locked by another app
2075 Src/Common: UniFile.cpp
2076 Fix for patch #1019108: update rescan info also after saving
2078 BUG: [ 1021003 ] Unicode builds do not read ansi files properly (UniFile.cpp)
2079 Fix what seems to be invalid #ifdef'ing for unicode build
2080 Src/Common: UniFile.cpp
2081 PATCH: [ 1014455 ] more explicit error message if archive support not available
2083 Src: 7zCommon.cpp 7zCommon.h MainFrm.cpp MainFrm.h Merge.rc resource.h
2084 Src/Languages: *.rc resource.h
2087 PATCH: [ 1019759 ] Allow D&D projectfile to main window
2089 PATCH: [ 1019945 ] Don't fail configlog writing silently
2090 Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
2091 PATCH: [ 1019393 ] Inform user about missing archive support (Zip* menuitems)
2092 Src: 7zCommon.cpp 7zCommon.h DirView.cpp Merge.rc resource.h
2093 Src/Languages: *.rc resource.h
2096 PATCH: [ 1019108 ] Warn if file changed on disk between rescans
2097 Src: Merge.rc MergeDoc.cpp MergeDoc.h resource.h
2098 Src/Languages: *.rc resource.h
2099 Add note about overwriting WinMerge executable path for ShellExtension
2100 Docs/Developers: readme-developers.html
2102 2004-08-27 WinMerge experimental release 2.1.7.12 (cvs)
2105 PATCH: [ 1017294 ] When closing file compare close also empty directory compare
2109 BUG: [ 1016056 ] Panes don't remember settings when new file is opened
2111 PATCH: [ 1016282 ] Add GetDefault() to COptionsMgr
2113 Src/Common: OptionsMgr.cpp OptionsMgr.h
2114 Convert Compare options dialog for GetDefault()
2115 Src: PropCompare.cpp
2118 PATCH: [ 1008755 ] avoid flickering when diff view opens
2119 Don't update desktop icon (from Takashi Sawanaka)
2121 PATCH: [ 1015330 ] Better file saving error message
2122 Src: Merge.rc MergeDoc.cpp MergeDoc.h
2123 Src/Common: UniFile.cpp
2125 PATCH: [ 1015393 ] Strip whitespaces from paths in Open-dialog
2126 Src: OpenDlg.cpp OpenDlg.h
2129 PATCH: [ 1013715 ] Catalan translation update
2130 Submitted by Jordi Vilar
2131 Src/Languages/Catalan: MergeCatalan.rc
2132 Check path length in VSS integration
2134 PATCH: [ 1012328 ] Simpler Zip* menuitems
2135 Src: DirView.cpp Merge.rc
2139 PATCH: [ 1012291 ] Open Find-dialog for F3 if no previous find
2140 Src/editlib: ccrystaltextview.cpp
2141 PATCH: [ 1012192 ] Show selected items count in dir compare statusbar
2142 Src: DirView.cpp DirView.h Merge.rc resource.h
2143 Src/Languages: resource.h *.rc
2146 PATCH: [ 982140 ] Merge7z : compress folders
2148 Merge7z: Merge7z311.cpp Merge7z311.dsp Merge7z312.dsp Merge7z313.dsp
2149 PATCH: [ 981788 ] modify UI to compress folders
2152 RFE: [ 953630 ] Ctrl+Shift+Z for Redo in file comparison
2157 RFE: [ 952959 ] split Are you sure you want to copy into more lines
2160 PATCH: [ 1011066 ] Better error message for failed file loading
2161 Src: MergeDoc.cpp MergeDoc.h
2162 Src/Common: UniFile.cpp
2163 PATCH: [ 1002432 ] codepage UI version 2
2164 Patch by Perry and Laoran
2165 Src: ConfigLog.cpp ConfigLog.h DirDoc.cpp DirScan.cpp MainFrm.cpp Merge.dsp
2166 Merge.rc OptionsDef.h PropGeneral.cpp PropGeneral.h resource.h
2167 Src new files: codepage.cpp codepage.h PropCodepage.cpp PropCodepage.h
2168 Src/Common: LanguageSelect.cpp multiformatText.cpp unicoder.cpp unicoder.h unifile.cpp
2169 Src/Languages: resource.h *.rc
2171 2004-08-17 WinMerge experimental release 2.1.7.11 (cvs)
2174 PATCH: [ 1010387 ] Updated MergeSwedish.rc file
2175 Submitted by Hans Eriksson
2176 Src/Languages/Swedish: MergeSwedish.rc
2177 PATCH: [ 975840 ] Cleanup VCS/VSS code part 2
2178 Src: MainFrm.cpp MainFrm.h Merge.dsp
2179 Src new files: VSSHelper.cpp VSSHelper.h
2182 BUG: [ 1002035 ] Crash with locked files (WM v2.1.7.10)
2184 BUG: [ 1002035 ] Crash with locked files (WM v2.1.7.10)
2186 BUG: [ 1009918 ] Binary files not detected (unicode builds)
2187 Src/Common: UniFile.cpp
2190 PATCH: [ 1008755 ] avoid flickering when diff view opens
2191 Submitted by Takashi Sawanaka
2192 Src: ChildFrm.cpp DiffViewBar.cpp
2193 Don't post ID_FORCE_REDRAW in CCrystalTextView::OnSize()
2194 Suggested by Takashi Sawanaka in patch item #1008755
2195 Src/editlib: ccrystaltextview.cpp
2198 BUG: [ 1007320 ] VB Syntax highlighting: Wrong masking from "
2199 Src/editlib: basic.cpp
2202 PATCH: [ 1007212 ] Make extension matching in Open-dialog case insensitive
2203 Src: FileFilterHelper.cpp
2204 PATCH: [ 1007216 ] Allow '*.' to match files without extension in Open-dialog
2205 Src: FileFilterHelper.cpp
2206 PATCH: [ 1007627 ] Filter selection fixes
2207 Src: FileFilterHelper.cpp FileFilterHelper.h MainFrm.cpp OpenDlg.cpp
2208 OpenDlg.h OptionsDef.h
2211 PATCH: [ 1006475 ] Don't save editor settings to different key in registry
2212 Src/editlib: editreg.h
2213 PATCH: [ 1006870 ] Don't add '\' to filenames for regexp filtering
2214 Src: FileFilterHelper.cpp
2215 Backout PATCH: [ 999738 ] Gray out moved block menuitems when moved blocks disabled
2216 Those menuitems didn't work like I expected
2217 Src: LocationView.cpp
2220 BUG: [ 1006164 ] accelerator conflict
2222 PATCH: [ 1003181 ] Move filter options to OptionsManager
2223 Src: MainFrm.cpp MainFrm.h OptionsDef.h
2226 PATCH: [ 1001981 ] Italian translation updated
2227 Submitted by Andrea Decorte
2228 Src/Languages/Italian: MergeItalian.rc
2229 PATCH: [ 1002585 ] Update dir compare statepane counts when reopening
2231 PATCH: [ 1002887 ] Enable Change Pane menuitem for Diff Pane
2232 Src: MergeDiffDetailView.cpp MergeDoffDetailView.h
2233 PATCH: [ 1000020 ] Simple project files (no GUI)
2234 Src: MainFrm.cpp MainFrm.h Merge.cpp Merge.dsp Merge.h OpenDlg.cpp OpenDlg.h
2235 Src new files: ProjectFile.cpp ProjectFile.h
2236 Option OPT_HIDE_BACKUP didn't get removed when UI was removed, remove it now
2237 Src: ConfigLog.cpp ConfigLog.h DirDoc.cpp MainFrm.cpp OptionsDef.h
2238 Backout previous 'Option OPT_HIDE_BACKUP didn't get removed..' checkin.
2239 It caused build with VC6 to crash in dir compare -- really weird why
2240 Src: ConfigLog.cpp ConfigLog.h DirDoc.cpp MainFrm.cpp OptionsDef.h
2244 PATCH: [ 1002333 ] Set default filter to *.* when starting WinMerge
2246 PATCH: [ 1002280 ] Don't show dircompare statepane if no dircompare results
2248 Remove GPL licence from coretools.cpp/h - that code is mostly freeware, not GPL
2249 Src/Common: coretools.cpp coretools.h
2250 PATCH: [ 1001974 ] Allow ESC to stop dir compare
2251 Src: DirCompStateBar.cpp
2252 PATCH: [ 1000423 ] Try to fix invisible find result
2254 Src/editlib: ccrystaltextview.cpp
2257 PATCH: [ 1001111 ] Warn if user selected binary files for patch creating
2258 Src: MainFrm.cpp Merge.rc PatchTool.cpp resource.h
2259 Src/Languages: *.rc resource.h
2260 PATCH: [ 999804 ] Fix setting recursive for Open-dialog
2261 New patch fixing bug #1001301 recursive not getting remembered
2262 Src: MainFrm.cpp MainFrm.h Merge.cpp
2265 PATCH: [ 967405 ] Add Japanese satellite dll to MakePatchDirs
2266 MakePatchDirs: MakePatchDirs.dsp MakePatchDirs.rc
2267 MakePatchDirsApp.cpp MakePatchDirsDlg.cpp MakePatchDirsDlg.h
2269 PATCH: [ 967405 ] Add Japanese satellite dll to MakePatchDirs
2270 (Adding new files forgotten at first check-in)
2271 MakePatchDirs: MakePatchDirs_ja.dsp MakePatchDirs_ja.rc
2272 MakePatchDirs_sat.cpp Satellites.cpp Satellites.h
2275 PATCH: [ 989288 ] Inno Setup Localization: Italian
2276 InnoSetup\Languages: Italian.isl
2277 PATCH: [ 963429 ] Fix language in floating status bar
2278 Src: DirCompStateBar.cpp DirCompStateBar.h DirDoc.cpp DirFrame.cpp DirFrame.h
2282 PATCH: [ 1000714 ] Don't create difflist or patch file for binary files
2283 Src: DiffWrapper.cpp
2284 PATCH: [ 1000772 ] Fix focus in SaveClosing dialog
2285 Src: SaveClosingDlg.cpp
2288 PATCH: [ 999738 ] Gray out moved block menuitems when moved blocks disabled
2289 Src: LocationView.cpp
2290 PATCH: [ 1000117 ] Hide only skipped subfolders in non-recursive compare
2291 Fixes bug #922718 'show different files' off : subdirs not displayed
2292 Src: DirDoc.cpp DirDoc.h
2293 PATCH: [ 1000308 ] Add GotoLine() to CMergeEditView and use it
2294 Src: LocationView.cpp LocationView.h MergeEditView.cpp MergeEditView.h
2295 Add icons to Find and Replace result messageboxes.
2296 Src/editlib: ceditreplacedlg.cpp cfindtextdlg.cpp
2297 PATCH: [ 1000423 ] Try to fix invisible find result
2298 Bug: #951584 Find: word found not visible or badly placed
2299 Src: MergeDocLineDiffs.cpp
2300 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
2303 PATCH: [ 999681 ] Accept filter name from commandline
2304 Src: FilterHelper.cpp FilterHelper.h Merge.cpp Merge.rc
2306 PATCH: [ 999804 ] Fix setting recursive for Open-dialog
2307 Src: MainFrm.cpp OpenDlg.cpp OpenDlg.h
2310 Remove suppressing checkbox from commandline help messagebox
2314 PATCH: [ 988505 ] updated email address for catalan translator
2315 Update email address for Jordi Vilar (Catalan translator)
2316 Web\developer\l10n: status.xml
2317 PATCH: [ 988503 ] Inno Setup Localization: Catalan
2318 InnoSetup\Languages: Catalan.isl
2320 2004-07-23 WinMerge experimental release 2.7.1.10 (cvs)
2323 BUG: [ 993402 ] Need review of native language names
2324 Removed asterisks from Nederlands & Svenska (thanks to A. Decorte).
2325 Src/Common: LanguageSelect.cpp
2328 BUG: [ 969933 ] 'discriminated' language names
2329 Capitalized native language names to make consistent in language selection box
2330 Src/Common: LanguageSelect.cpp
2333 PATCH: [ 992218 ] Add -f commandline switch for filemask
2334 Usage: WinMerge -f "*.ext1 *.ext2" (like in Open-dialog)
2335 Src: FileFilterHelper.cpp FileFilterHelper.h MainFrm.cpp Merge.cpp
2336 Merge.rc OpenDlg.cpp OpenDlg.h
2340 PATCH: [ 990976 ] FileFilterHelper (filter code cleanup)
2341 Src: DiffContext.cpp DiffContext.h DirDoc.cpp DirDoc.h DirScan.cpp
2342 FileFiltersDlg.cpp FileFilterDlg.h MainFrm.cpp Merge.cpp Merge.dsp
2344 Src new files: FileFilterHelper.cpp FileFilterHelper.h
2345 PATCH: [ 986393 ] Lose '(debug)' from 'Reload plugins'
2348 PATCH: [ 941621 ] widen find/replace dialog
2352 PATCH: [ 941621 ] widen find/replace dialog
2356 PATCH: [ 990901 ] Add Move to DirView Context menu commands.
2357 Submitted by Vladimir Lukianov
2358 Src: DirActions.cpp DirView.cpp DirView.h Merge.rc resource.h
2359 Src/Languages: *.rc resource.h
2362 PATCH: [ 991181 ] Disable 'Goto Line' outside reduced locationpane bars
2363 Src: LocationView.cpp
2364 PATCH: [ 990365 ] Dialog to ask about saving modified files
2365 Src: Merge.dsp Merge.rc MergeDoc.cpp resource.h
2366 Src new files: SaveClosingDlg.cpp SaveClosingDlg.h
2367 Src/Languages: *.rc resource.h
2370 PATCH: [ 988494 ] Catalan translation update
2371 Submitted by Jordi Vilar
2372 Src/Languages/Catalan: MergeCatalan.rc
2373 Src/Languages/Catalan/res: splash1.bmp
2376 PATCH: [ 987122 ] Horizontal scroll for dirview columns dialog listboxes
2377 Src: DirColsDlg.cpp DirColsDlg.h Merge.dsp Merge.rc
2378 Src/Common new files: HScrollListBox.cpp HScrollListBox.h
2382 PATCH: [ 986794 ] Hide 'Apply' button from filters dialog
2384 PATCH: [ 986785 ] Improve location pane with short files
2385 Src: LocationView.cpp LocationView.h
2386 PATCH: [ 986873 ] Allow recursive compares for archive files
2390 PATCH: [ 983265 ] Italian translation updated for latest experimental version
2391 Src/Languages/Italian: MergeItalian.rc
2393 2004-07-04 WinMerge experimental release 2.1.7.9 (cvs)
2396 Add lost piece of PATCH: [ 982960 ] Rescan when saving to update dir compare status
2400 PATCH: [ 984520 ] Don't add '...' items as fileaction targets
2404 PATCH: [ 982960 ] Rescan when saving to update dir compare status
2405 Src: DiffContext.cpp DiffContext.h DirDoc.cpp DirDoc.h MergeDoc.cpp
2406 MergeDoc.h MergeEditView.cpp
2407 PATCH: [ 983410 ] Warn that New clears dircompare results
2408 Src: MainFrm.cpp Merge.rc resource.h
2409 Src/Languages: *.rc resource.h
2410 PATCH: [ 983721 ] Remove 'don't show again' checkbox from saving messages
2412 PATCH: [ 984059 ] Disable merge actions for '...' item in dir compare
2416 PATCH: [ 982683 ] Clear results only after user chooses new files or folders
2418 PATCH: [ 982703 ] Open manual when user presses F1
2419 Src: MainFrm.cpp MainFrm.h Merge.cpp Merge.h Merge.rc
2423 BUG: [ 981796 ] Dir compare : rescan clears "auto-prediffer"
2425 PATCH: [ 981529 ] remove hide .BAK from menu
2426 Filters: Merge_GnuC_loose.flt Merge_VB_loose.flt Merge_VC_loose.flt
2427 Src: MainFrm.cpp MainFrm.h Merge.rc resource.h
2428 Src/Languages: *.rc resource.h
2431 PATCH: [ 981468 ] Properly handle different commentstyles for Pascal
2432 Src/editlib: pascal.cpp
2433 PATCH: [ 981526 ] Don't ignore one-char lines in syntax highlight
2434 Src/editlib: asp.cpp basic.cpp batch.cpp cplusplus.cpp csharp.cpp dcl.cpp
2435 fortran.cpp html.cpp ini.cpp is.cpp java.cpp lisp.cpp pascal.cpp perl.cpp
2436 php.cpp python.cpp rexx.cpp rsrc.cpp siod.cpp sql.cpp tex.cpp xml.cpp
2439 PATCH: [ 981290 ] Updated Swedish MergeSwedish.rc file
2440 Submitted by Hans Eriksson
2441 Src/Languages/Swedish: MergeSwedish.rc
2444 PATCH: [ 980851 ] Don't save VSS password
2446 PATCH: [ 978987 ] [RFE 976364] Expand Environment Strings in paths
2447 Submitted by Jordi Vilar - minor tweak by Kimmo
2450 2004-06-23 WinMerge experimental release 2.1.7.8 (cvs)
2453 PATCH: [ 977587 ] Fix fileattrib handling and show all attribs in dir compare
2454 Src: DiffFileInfo.cpp DiffFileInfo.h DirScan.cpp DirView.cpp
2455 PATCH: [ 977796 ] Make dir compare column cust. dialog usable from keyboard
2456 Src: DirColsDlg.cpp DirColsDlg.h
2457 BUG: [ 936525 ] RO not removed in refresh
2458 Don't set files/dirs with RO fileflag RO in UI - this was bad idea!
2459 Src: DirView.cpp MainFrm.cpp
2460 BUG: [ 978062 ] VSS support broken
2462 PATCH: [ 978393 ] Better VSS errormessages
2463 Src: MainFrm.cpp MainFrm.h Merge.rc resource.h
2464 Src/Languages: *.rc resource.h
2467 PATCH: [ 977475 ] Log DeleteFile() failure in FileTransform.cpp
2468 Src: FileTransform.cpp
2469 PATCH: [ 977479 ] Delete non-functional line in CPatchDlg::SaveSettings()
2473 BUG: [ 974662 ] Inconsistent menutexts for dircompare column dialog
2474 Scr: DirView.cpp Merge.rc resource.h
2475 Src/Languages: *.rc resource.h
2478 PATCH: [ 975187 ] getDefaultCodepage, use UI language only when UI not english
2479 Src/common: unicoder.cpp
2482 PATCH: [ 972500 ] Italian translation updated
2483 Submitted by Andrea Decorte
2484 Src/Languages/Italian: MergeItalian.rc
2485 PATCH: [ 975025 ] Fix column number in file compare statusbar
2486 Src: MergeEditView.cpp
2487 RFE: [ 891123 ] Short format for line info in file compare
2490 PATCH: [ 976255 ] Add total columns and current char to lineinfo
2491 Src: ChildFrm.cpp ChildFrm.h Merge.rc MergeEditStatus.h MergeEditView.cpp
2495 PATCH: [ 975432 ] Add codepage detection option to configlog
2496 Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
2499 PATCH: [ 974714 ] detect codepage when open documents directly, small update
2501 PATCH: [ 974714 ] detect codepage when open documents directly
2502 Src: DiffContext.cpp MainFrm.cpp MainFrm.h
2503 Src/Common: UniFile.cpp UniFile.h
2504 PATCH: [ 975213 ] warn when codepages differ
2505 Src: MainFrm.cpp Merge.rc resource.h
2506 Src/Languages: *.rc resource.h
2509 BUG: [ 930574 ] Remove old and unused undo-code
2510 Src: MergeDoc.h MergeDoc.cpp
2513 Remove commented out functions ExpandTabs() and Tabify()
2514 Src: MergeDoc.h MergeDoc.cpp
2517 PATCH: [ 972108 ] use getDefaultCodepage for document with no codepage
2519 Src/Common: UniFile.cpp unicoder.cpp unicoder.h
2520 PATCH: [ 973029 ] Scroll when more than 65536 characters
2521 Src/Common: SplitterWndEx.cpp
2522 Src/editlib: ccrystaltextview.cpp
2523 widen labels in colors dialog
2528 PATCH: [ 972575 ] Goto real line from location pane
2529 Src: LocationView.cpp LocationView.h
2530 Add instructions for generating HTML documentation using SF.net shell server
2531 Docs/Developers: readme-developers.html
2534 PATCH: [ 972188 ] Add More Pascal comments styles to syntax highlight
2535 Src/editlib: pascal.cpp
2538 PATCH: [ 972290 ] In LoadFromFile, free the handle before deleting temp files
2540 PATCH: [ 972296 ] GetLineCount in MergeDoc must test validity of buffers
2541 Src: LocationView.cpp MergeDoc.cpp MergeDoc.h
2542 declare GetLeftView()/GetRightView()/GetLeftDetailView()/GetRightDetailView() as const
2546 PATCH: [ 972007 ] Japanese translation update(2) ; submitted by Takashi Sawanaka
2547 Src/Languages: UpdateAll_resource_h.bat
2548 Src/Languages/Japanese: MergeJapanese.rc
2549 PATCH: [ 971862 ] Various Updates in German Translation ; submitter : Tim Gerundt
2550 Src/Languages/German: MergeGerman.rc
2552 2004-06-12 WinMerge experimental release 2.1.7.7 (cvs)
2555 BUG: [ 970936 ] Cannot merge last diff
2556 Src: MergeDiffDetailView.cpp
2557 PATCH: [ 970991 ] Force redraw after changing moved block option
2558 Src: LocationView.cpp
2559 PATCH: [ 970221 ] Keep overlay mode after Rescan
2560 Src/editlib: ccrystaltextview.cpp
2563 BUG: [ 969922 ] inconsistent 'options' dialog behavior
2564 Fix enabling/disabling 'Apply to unrecognized side' checkbox in Editor options
2566 BUG: [ 970940 ] Location pane bars not shown if syntax highlight disabled
2567 Src: LocationView.cpp
2568 BUG: [ 969922 ] inconsistent 'options' dialog behavior
2569 Fix enabling/disabling 'Enable advanced menu' checkbox in System options
2570 Src: PropRegistry.cpp PropRegistry.h
2573 BUG: [ 969922 ] inconsistent 'options' dialog behavior
2574 Remove 'Apply' button from options-dialog
2576 BUG: [ 826560 ] CVssPrompt::OnInitDialog neglects to notice failure in open
2577 Also inform user if VSS databases not found
2578 Src: Merge.rc resource.h VssPrompt.cpp
2579 Src/Languages: *.rc resource.h
2580 PATCH: [ 970478 ] Cleanup VCS/VSS code part 1
2581 Src: MainFrm.cpp MainFrm.h Merge.rc resource.h
2582 Src/Languages: *.rc resource.h
2585 PATCH: [ 968887 ] UI for codepage detection
2586 Src: DiffContext.cpp DiffContext.h DiffWrapper.cpp DiffWrapper.h DirDoc.cpp
2587 MainFrm.cpp Merge.rc OptionsDef.h PropGeneral.cpp PropGeneral.h resource.h
2588 Src/Languages: *.rc resource.h
2591 PATCH: [ 969277 ] Color options for moved blocks
2592 Src: MainFrm.cpp Merge.rc MergeEditView.cpp MergeEditView.h OptionsDef.h
2593 PropColors.cpp PropColors.h resource.h
2594 Src/Languages: *.rc resource.h
2597 PATCH: [ 968504 ] Add Goto Line to location pane context menu
2598 Src: LocationView.cpp LocationView.h Merge.rc resource.h
2599 Src/Languages: *.rc resource.h
2600 PATCH: [ 968960 ] Add moved blocks setting to configlog
2601 Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
2604 [ 967406 ] Add .clw to filtered out files in MakePatchDirs
2605 Filter out also clw files in MSVC filter. Bump version to 1.2.2.0.
2606 MakePatchDirs: MakePatchDirs.rc MakePatchDirsDlg.cpp
2607 [ 967315 ] Remove needless cast in unicoder.cpp:CrossConvert
2608 Src/Common: unicoder.cpp
2611 BUG: [ 967899 ] Ignore carriage return differences logic backwards
2613 PATCH: [ 968255 ] Rename EOL sensitive in configlog
2615 PATCH: [ 967700 ] Add Goto-items to location pane context menu
2616 Src: LocationView.cpp Merge.rc MergeEditView.h resource.h
2617 Src/Languages: *.rc resource.h
2620 PATCH: [ 966693 ] set scroll width in diffpane for widest view
2621 Src: MergeDiffDetailView.cpp MergeDiffDetailView.h
2622 Src\editlib: ccrystaltextview.h
2623 PATCH: [ 963124 ] better name for variable for Undo/deleteText
2624 Src: GhostTextBuffer.cpp GhostTextBuffer.h
2627 Updated Catalan translation from Jordi Vilar
2628 Src/Languages: Catalan/MergeCatalan.rc
2631 BUG: [ 959729 ] View menu show-items disabled in mergeview
2632 Second try, renumber items in editlib/editcmd.h
2633 Src/editlib/editcmd.h
2636 update for MergeSwedish.rc ; contribution from Hans Eriksson
2637 Language/Swedish: MergeSwedish.rc
2639 2004-06-04 WinMerge experimental release 2.1.7.6 (cvs)
2642 PATCH: [ 965950 ] Simplify and fix Open-dialog extension parser
2646 BUG: [ 964242 ] WinMerge getting slower loading and showing files
2647 Src/Common: unicoder.cpp
2650 PATCH: [ 963814 ] Cosmetic: fix call in OpenDlg to LoadPosition
2655 PATCH: [ 964665 ] And another unneeded include in DirDoc.h
2659 PATCH: [ 964497 ] fix display of moved block in detail pane
2660 Src: MergeDiffDetailView.cpp
2663 BUG: [ 964885 ] ColExtGet() returns extension converted to lowercase
2664 Src: DirViewColItems.cpp
2667 PATCH: [ 964678 ] New MergeJapanese.rc file
2668 Src/Languages: Japanese/MergeJapanese.rc etc
2669 Update "18 languages" to "19 languages"
2670 Docs\Developers: readme-developers.html
2671 PATCH: [ 964661 ] Remove unneeded include from DirDoc.h
2672 Src: 7Common.cpp DirDoc.h
2673 PATCH: [ 964664 ] Remove another unneeded include from DirDoc.h
2674 Src: 7Common.h DirDoc.h
2677 BUG: [ 963820 ] Cutting off trailing chars in opendlg
2679 Src/Common: CoreTools.cpp
2682 PATCH: [ 948368 ] display moved blocks in location bar
2683 Src: DiffWrapper.cpp DiffWrapper.h LocationView.cpp LocationView.h MainFrm.cpp
2684 Merge.rc MergeDoc.cpp MergeDoc.h OptionsDef.h resource.h
2685 Src/Languages: *.rc resource.h
2686 PATCH: [ 960455 ] Clip text in DrawLineHelperImpl
2687 Src/editlib: crystaltextview.cpp
2690 PATCH: [ 963804 ] Report also thread codepage in config
2694 Backout patch for BUG: [ 959729 ] View menu show-items disabled in mergeview
2695 It caused bug #963299 Can't execute 2.1.7.5 under Windows 98
2696 Src/editlib/editcmd.h
2699 PATCH: [ 963092 ] Cannot compile LanguageSelect.cpp using MSVC Japanese Ver.
2700 Src/Common: LanguageSelect.cpp
2701 Src/editlib: crystaltextview.cpp cs2cs.cpp
2702 PATCH: [ 962460 ] Add codepage & locale info to config log
2704 PATCH: [ 962538 ] In Rescan, set status to binary if caller said so
2706 PATCH: [ 963438 ] Fix selection of language in dialog
2707 Src/Common: LanguageSelect.cpp
2710 PATCH: [ 963019 ] keyboard shortcuts in replace dialog
2711 Submitted by Takashi Sawanaka
2714 PATCH: [ 913743 ] Icons for menuitems (RFE 873697) - 16-color icons, 3 new icons
2715 Submitted by Tim Gerundt
2716 Src: MainFrm.cpp Merge.rc
2717 Src/res: cascade.bmp change_pane.bmp close.bmp error.bmp exit.bmp
2718 go_to.bmp horizontally.bmp language.bmp replace.bmp select_font.bmp
2719 unknown.bmp vertically.bmp
2720 Src/res new files: customize_columns.bmp filters.bmp select_all.bmp
2721 Src/languages: *.rc resource.h
2722 Src/languages/res: same changes than in Src/res
2723 PATCH: [ 962509 ] Copy pathnames and filenames from directory compare
2724 Src: DirView.cpp DirView.h Merge.rc resource.h
2725 Src/languages: *.rc resource.h
2726 BUG: [ 962449 ] Zip* items in dircompare context menu don't have help text
2731 BUG: [ 909779 ] Uninitialised variable in CGhostTextBuffer::DeleteText() ; fix the fix !
2732 Src: GhostTextBuffer.cpp
2733 PATCH: [ 963118 ] variable name fix in CGhostTextBuffer::Undo
2734 Src: GhostTextBuffer.cpp
2737 PATCH: [ 962558 ] Some MBCS fixes from sawanaka
2738 Src: paths.cpp paths.h StdAfx.cpp StdAfx.h
2739 Src/Common: coretools.cpp
2740 PATCH: [ 962539 ] Add ResetInit which handles partly full buffers
2742 Src/editlib: ccrystaltextbuffer.h
2745 PATCH: [ 961810 ] Store path for ShellExtension
2746 ShellExtension: resource.h ShellExtension.cpp ShellExtension.rc
2747 WinMergeShell.cpp WinMergeShell.h
2748 PATCH: [ 961780 ] ShellExtension advanced menu - UI
2749 Src: Merge.rc PropRegistry.cpp PropRegistry.h resource.h
2750 Src/Languages: *.rc resource.h
2751 PATCH: [ 962348 ] Center OpenDialog to MainFrame
2752 Src: OpenDlg.cpp OpenDlg.h
2755 Updated WinMerge Localized.iss from seier (manifest & plugins.txt changes)
2756 InnoSetup: WinMerge Localized.iss
2757 PATCH: [ 945759 ] Move to location when double-click location view
2758 Src/Common: LocationView.cpp LocationView.h
2759 BUG: [ 961901 ] Possible overflow bug in SplitFilename
2760 Src/Common: coretools.cpp
2761 New InnoSetup/Languages/Japanese.isl from sawanaka
2762 From url posted in discussion in BUG [ 958805 ] 2 bytes display error
2763 (I removed the entry for English before checking it in, as there is no English satellite DLL)
2764 InnoSetup: Languages/Japanese.isl
2766 2004-05-29 WinMerge experimental release 2.1.7.5 (cvs)
2769 BUG: [ 959729 ] View menu show-items disabled in mergeview
2770 Src/editlib: editcmd.h
2773 PATCH: [ 960771 ] disable .. in dirview if upward move is not reversible
2774 Src: DirView.cpp DirView.h Merge.rc resource.h
2775 Src/res Add: folderup.bmp folderup_disable.bmp
2776 Src/Languages: *.rc resource.h
2777 Src/Languages/res Add: folderup.bmp folderup_disable.bmp
2778 PATCH: [ 961304 ] WinDiff-compatible (F7/F8) keybindings for next/prev diff
2779 submitted by Krzysztof Kowalczyk
2784 PATCH: [ 960996 ] 'backspace' key in dirview for parent directory
2785 Src: DirView.cpp DirView.h
2788 PATCH: [ 959843 ] Fix codepage initialization to thread default
2789 Src: DiffWrapper.cpp DiffWrapper.h DirScan.cpp DirScan.h Merge.cpp
2790 Src/Common: unicoder.cpp
2791 Localized some language names into Catalan
2792 Src/Languages: MergeCatalan.rc
2795 Added a few more native or ASCII language names (Albanian, Arabic, Armenian
2796 Belarusian, Croatian, Estonian, Farsi, Georgian, Greek, Urdu)
2797 Src/Common: LanguageSelect.cpp
2800 PATCH: [ 960265 ] Don't show size for folder or non-existing file
2801 Src: DiffFileInfo.cpp DiffFileInfo.h DirScan.cpp DirViewColItems.cpp
2804 PATCH: [ 959468 ] A patch for "Bug [ 958805 ] 2 bytes display error".
2806 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
2809 (cosmetic) Update edit dates in file headers
2810 Src/Common: unicoder.cpp unicoder.h
2811 Localized language names into Russian
2812 Src/Languages: MergeRussian.rc
2813 Localized language names into Bulgarian
2814 Src/Languages: MergeBulgarian.rc
2817 PATCH: [ 959627 ] Fix crash when opening context menu for '..' item in dirview
2818 Src: DirActions.cpp DirView.cpp
2819 BUG: [ 880104 ] CCCPrompt--does it work at all?
2820 Disable "Save as..." button since its not used
2823 RFE [ 950290 ] Use MS Shell Dlg font in dialogs
2824 Convert Chinese and Korean translations too
2825 Src/Languages: MergeChineseSimplified.rc MergeChineseTraditional.rc MergeKorean.rc
2826 PATCH: [ 959503 ] Enable word deletion function(Ctrl+Del)
2827 Submitted by Takashi Sawanaka
2828 Src/editlib: editcmd.h editres.rc
2831 PATCH: [ 950243 ] 2 minor updates to developers docs
2832 Docs/Developers: readme-developers.html
2833 Localized language names into Italian
2834 Src/Languages: MergeItalian.rc
2837 PATCH: [ 958973 ] CDiffTextBuffer::LoadFromFile wrong return
2841 PATCH: [ 959111 ] Optionally don't disable Open-dialog OK-button
2842 Src: MainFrm.cpp Merge.rc OpenDlg.cpp OptionsDef.h PropGeneral.cpp
2843 PropGeneral.h resource.h
2844 Src/Languages: *.rc resource.h
2847 Fix compilation (trailing comma in CCrystalTextView::m_SourceDefs)
2848 Src/editlib: ccrystaltextview.cpp
2851 PATCH: [ 958938 ] Better way to close WinMerge with ESC (-e switch)
2852 Src: MainFrm.cpp MainFrm.h Merge.cpp Merge.h
2853 PATCH: [ 959035 ] Registry value for enabling logging
2854 Src: MainFrm.cpp OptionsDef.h
2855 Add note about logging (patch #959035]
2856 Docs/Developers: readme-developers.html
2857 RFE: [ 934419 ] Syntax highlighting *.cls with Visual Basic (basic.cpp)
2858 Submitted by Tim Gerundt
2859 Src/editlib: ccrystaltextview.cpp
2862 PATCH: [ 893202 ] Bug fixed for DBCS text edit (Attach again)
2863 Src\editlib: ccrystaleditview.cpp ccrystaltextview.cpp
2865 2004-05-23 WinMerge experimental release 2.1.7.4 (cvs)
2868 PATCH: [ 957317 ] Broken menu in Winmerge 2.1.7.3
2870 Src/Common: LanguageSelect.cpp
2871 typo in russian language : APTION -> CAPTION
2872 Src/Languages/Russian: MergeRussian.rc
2875 PATCH: [ 958478 ] Allow ESC close WinMerge if no open docs
2876 Src: MainFrm.cpp MainFrm.h
2879 Localized language names into Portuguese
2880 Src/Languages: MergeBrazilian.rc
2883 PATCH: [ 958122 ] Add C# syntax highlight
2885 Src/editlib: crystaltextview.cpp crystaltextview.h
2886 Src/editlib new file: csharp.cpp
2887 RFE: [ 950290 ] Use MS Shell Dlg font in dialogs
2889 Src/Languages: *.rc, except MergeChineseSimplified.rc
2890 Merge ChineseTraditional.rc, MergeKorean.rc
2893 Localized language names into French
2894 Src/Languages: MergeFrench.rc
2895 Updates to Spanish localized language names
2896 Src/Languages: MergeSpanish.rc
2897 BUG: [ 898924 ] Lang order in Language selection dialog?
2898 RFE: [ 953015 ] sort language names
2899 Mark listbox in language dialog as sorted
2901 Src/Languages: Merge*.rc
2904 Fix PATCH [ 957740] - declare CMergeDoc::CompareBinaries
2906 Updated WinMerge Localized.iss from seier (add Swedish Readme after install)
2907 InnoSetup: WinMerge Localized.iss
2908 Updated Swedish ReadMe from seier
2909 Docs/Users/Languages: Read Me-Swedish.rtf
2910 Updated all non-localized language versions of Read Me*.rtf to current Read Me.rtf
2911 Docs\Users\Languages: Read Me*.rtf (except Swedish)
2912 Remove all localization Contributors*.rtf
2913 Docs\Users\Languages: removed Contributors*.rtf
2916 PATCH: [ 957740 ] Tell if two binary files are different/identical
2917 Src: DiffWrapper.cpp DiffWrapper.h Merge.rc MergeDoc.cpp resource.h
2918 Src/Languages: *.rc resource.h
2921 PATCH: [ 947680 ] Organize resource strings, part 2 (IDD and IDB)
2923 Src/Languages: resource.h
2926 PrivateBuild in version resource must be empty string in CVS.
2931 Localized language names into Korean
2932 Src/Languages: MergeKorean.rc
2935 PATCH: [ 956893 ] Fix toolbar problem with XP themes and VC6
2936 Src: MainFrm.cpp Merge.cpp
2937 PATCH: [ 954991 ] Add directory compare column descriptions
2938 Src: DirColsDlg.cpp DirColsDlg.h DirView.h DirViewColHandler.cpp
2939 DirViewColItems.cpp Merge.rc resource.h
2940 Src/Languages: *.rc resource.h
2943 PATCH: [ 955408 ] Select first item in dir compare
2945 PATCH: [ 956044 ] Don't select '..' and don't skip unique folders in dirview
2949 PATCH: [ 955573 ] Swedish localization of Read Me.rtf
2950 Docs/User/Languages: Read Me-Swedish.rtf
2952 2004-05-18 WinMerge experimental release 2.1.7.3 (cvs)
2955 PATCH: (continued) [ 942021 ] Propose translation of language names
2956 Src/Languages: MergeBrazilian.rc MergeBulgarian.rc MergeCatalan.rc
2957 MergeChineseSimplified.rc MergeChineseTraditional.rc
2958 MergeKorean.rc MergeRussian.rc
2959 BUG: [ 955550 ] Slovak rc file broken (typo)
2960 Src/Languages: MergeSlovak.rc
2961 BUG: [ 955553 ] Russian rc file broken
2962 Src/Languages: MergeRussian.rc
2963 BUG: [ 955557 ] Chinese traditional rc file broken (cvs)
2964 Src/Languages: MergeChineseTraditional.rc
2967 PATCH: [ 955411 ] Remove non-functional firstdiff selection
2968 Src: DirView.h MainFrm.cpp
2971 Fix build error, VC6 doesn't like CList::GetSize()
2973 PATCH: [ 952877 ] Return better results from Rescan()
2974 Src: MergeDoc.cpp MergeDoc.h
2977 PATCH: [ 952825 ] Cleanup VSS dialog layout
2980 PATCH: [ 952586 ] Improve readonly file and folder handling
2981 Src: DirActions.cpp MainFrm.cpp MainFrm.h Merge.rc MergeDoc.cpp resource.h
2982 Src/Languages: *.rc resource.h
2983 PATCH: [ 948592 ] Open and select filefilter from Open-dialog
2984 Src: FileFiltersDlg.cpp MainFrm.cpp MainFrm.h Merge.cpp Merge.h
2985 Merge.rc OpenDlg.cpp OpenDlg.h resource.h
2986 Src/Languages: *.rc resource.h
2989 Backout last change to Merge.rc - restore version 1.187
2991 BUG: [ 953232 ] Some lang-files broken
2992 Backout last changes to lang files (see bug item for details)
2993 Src/Languages: MergeBulgarian.rc MergeChineseSimplified.rc
2994 MergeChineseTraditional.rc MergeKorean.rc MergeRussian.rc
2995 PATCH: [ 953056 ] Rename 'Sensitive to EOL' option
2998 PATCH: [ 953515 ] Improve LocationPane drawing code
2999 Src: LocationView.cpp
3002 PATCH: [ 950530 ] Remove unneeded cast in DirView.cpp
3004 PATCH: [ 945722 ] Two functions are never called
3005 Src: DiffContext.cpp DiffContext.h
3006 PATCH: [ 945152 ] Installer: My last revisions
3007 InnoSetup: WinMerge Localized.iss
3008 InnoSetup/Languages: *.isl (except Swedish.isl)
3009 PATCH: [ 950236 ] Set DIFFCODE::BOTH correctly
3011 PATCH: [ 942021 ] Propose translation of language names
3013 Src/Common: LanguageSelect.cpp LanguageSelect.h
3015 PATCH: [ 950212 ] wrong language shown in LanguageSelect
3016 Src/Common: LanguageSelect.cpp
3017 BUG: [ 876539 ] Wrong textinclude language def in ChineseTraditional
3018 Src/Languages: ChineseTraditional.rc
3019 Translate language names into Dutch (follow-up to PATCH#942021)
3020 Src/Languages: MergeDutch.rc
3021 Add a few more native language names
3022 Src/Common: LanguageSelect.cpp
3025 PATCH: [ 948448 ] Remove WinMerge.exe path from system options
3026 Src: Merge.rc PropRegistry.cpp PropRegistry.h resource.h
3029 PATCH: [ 948528 ] Build BCMenu after select language
3030 Src: MainFrm.cpp MainFrm.h Merge.cpp
3031 Src\Common: LanguageSelect.cpp
3034 Fix MakePatchDirs to ignore BuildTmp.
3035 MakePatchDirs: ChangeLog.txt MakePatchDirs.rc MakePatchDirsDlg.cpp
3038 PATCH: [ 951404 ] Add statusmessage for dircompare copy/delete ops
3039 Src: DirActions.cpp Merge.rc resource.h
3040 Src/Languages: *.rc resource.h
3042 2004-05-10 Christian
3043 PATCH: [ 945467 ] Remove ReleaseMinsize and UnicodeReleaseMinsize
3045 Src/Languages: CopyAll.bat
3048 PATCH: [ 951234 ] Use resourceIDs in dircompare statebar bitmpaps
3053 apply again modifications to IDS_QUICKHELP, lost during PATCH: [ 947680 ]
3055 Src\Languages\Swedish: MergeSwedish.rc
3058 PATCH: [ 947680 ] Organize resource strings
3059 Src: CCPrompt.cpp DiffWrapper.cpp DirFrame.cpp MainFrm.cpp Merge.rc MergeDoc.cpp
3060 PropGeneral.cpp VssPrompt.cpp resource.h
3061 Src\editlib: ccrystaltextview.cpp ccrystaltextview.h editcmd.h
3062 Src\Common: LanguageSelect.h
3063 Src\Languages: *.rc resource.h
3065 2004-05-08 WinMerge experimental release 2.1.7.2 (cvs)
3068 update for MergeSwedish.rc ; contribution from Hans Eriksson
3069 Language/Swedish: MergeSwedish.rc
3072 PATCH: [ 949428 ] Show VSS dialogs only once
3073 Src: DirActions.cpp MainFrm.cpp MainFrm.h Merge.rc resource.h
3074 Languages: *.rc resource.h
3075 BUG: [ 947121 ] ShellExtension does not compile with Visual Studio 2003
3076 ShellExtension: ShellExtension.dsp
3077 BUG: [ 941335 ] RC file missing strings and errors
3082 PATCH: [ 948366 ] clear moved blocks before Rescan
3083 Src: DiffWrapper.cpp DiffWrapper.h MergeDoc.cpp
3086 PATCH: [ 948634 ] Commandline switch to open left/right side as readonly
3087 Src: Merge.cpp Merge.rc
3091 PATCH: [ 947232 ] Add primary path to WinMerge.exe for ShellExtension
3092 ShellExtension: ShellExtension.rc WinMergeShell.cpp
3095 PATCH: [ 947599 ] Remove EditFile.cpp EditFile.h
3096 Src remove: EditFile.cpp EditFile.h
3097 Src: Merge.dsp Merge.rc resource.h
3098 Languages: *.rc resource.h
3101 PATCH: [ 942565 ] Option for closing windows with ESC
3102 Src: DirDoc.cpp DirView.cpp DirView.h MainFrm.cpp Merge.rc MergeEditView.cpp
3103 MergeEditView.h OptionsDef.h PropGeneral.cpp PropGeneral.h resource.h
3104 Languages: *.rc resource.h
3105 PATCH: [ 946550 ] [MergeMode] Don't try to merge if diff not selected
3106 Src: MergeEditView.cpp
3109 PATCH: [ 946091 ] Fix for GetLineActualLength
3110 Src/editlib: ccrystaltextview.cpp
3113 PATCH: [ 936842 ] Custom message when same file in both panels
3114 Src: Merge.rc MergeDoc.cpp resource.h
3115 Languages: *.rc resource.h
3118 PATCH: [ 833180 ] Filters dialog
3119 Src new files: FileFiltersDlg.cpp FileFiltersDlg.h
3120 Src: MainFrm.cpp MainFrm.h Merge.dsp Merge.rc
3121 PropFilter.cpp PropFilter.h resource.h
3122 Languages: *.rc resource.h
3125 PATCH: addon to [ 941623 ] Propose moving IDC_COMPARISON_STOP to block with ...CLOSE
3130 PATCH: [ 941979 ] Add cast to suppress VS.NET 2002 warning
3132 PATCH: [ 927929 ] Reload language menus after resources hooked
3134 PATCH: [ 941623 ] Propose moving IDC_COMPARISON_STOP to block with ...CLOSE
3137 Languages: MergeBrazilian.rc MergeBulgarian.rc MergeCatalan.rc
3138 MergeChineseSimplified.rc MergeChineseTraditional.rc MergeCzech.rc
3139 MergeDanish.rc MergeDutch.rc MergeFrench.rc MergeGerman.rc MergeItalian.rc
3140 MergeKorean.rc MergeNorwegian.rc MergePolish.rc MergeRussian.rc
3141 MergeSlovak.rc MergeSpanish.rc MergeSwedish.rc
3142 PATCH: [ 909761 ] Misplaced return in CDirView::ValidateColumnOrdering()?
3143 Src: DirViewColHandler.cpp
3145 2004-04-30 Christian
3146 PATCH: [ 941982 ] Fix VS6 compilation
3147 Src/Common: MessageBoxDialog.cpp MessageBoxDialog.h
3150 PATCH: [ 943149 ] Contributors fix
3151 Src: Merge.cpp Merge.rc
3153 Docs/Users/Contributors.txt
3154 Removed: Docs/Users/Contributors.rtf
3155 BUG: [ 944290 ] Crash when deleting files
3159 PATCH: [ 937947 ] Open-dialog improvements (no codepage controls)
3160 Src: Merge.rc OpenDlg.cpp OpenDlg.h resource.h
3161 Languages: *.rc resource.h
3164 RFE: [ 942591 ] Loose filter for Visual Basic
3165 Submitted by Tim Gerundt
3166 Filters new file: Merge_VB_loose.flt
3167 PATCH: [ 930482 ] Add comments to filter: Merge_GnuC_loose.flt
3168 Submitted by Tim Gerundt
3169 Filters: Merge_GnuC_loose.flt
3172 BUG: [ 940709 ] Dircompare column widths saved only when WinMerge closed
3174 Src: DirViewColHandler.cpp
3177 PATCH: [ 941986 ] Remove blank lines in popup dirview menu in Merge.rc
3180 2004-04-25 WinMerge experimental release 2.1.7.1 (cvs)
3183 More removing obsolete keywords to sync languages to English
3184 Languages: MergeDutch.rc MergeFrench.rc MergeGerman.rc
3185 MergeItalian.rc MergeKorean.rc MergeNorwegian.rc
3188 PATCH: [ 941524 ] Reset dircompare column widths
3189 Src: DirColsDlg.cpp DirColsDlg.h DirView.cpp DirView.h DirViewColHandler.cpp
3190 PATCH: [ 941545 ] Fix Shift-Arrow to select text in merge mode
3191 Src: MergeEditView.cpp
3194 More removing obsolete keywords to sync languages to English
3195 Languages: MergeCatalan.rc MergeChineseSimplified.rc
3196 MergeChineseTraditional.rc MergeCzech.rc MergeDanish.rc
3197 MergeFrench.rc MergePolish.rc
3200 More removing obsolete keywords to sync languages to English
3202 Languages: MergeBrazilian.rc MergeSpanish.rc MergeSwedish.rc
3203 More removing obsolete keywords to sync languages to English
3205 Languages: MergeRussian.rc MergeSlovak.rc MergeSpanish.rc
3207 More removing obsolete keywords to sync languages to English
3208 Languages: MergeBrazilian.rc MergeSlovak.rc MergeSpanish.rc
3212 BUG: [ 939245 ] Location Bar don't show diff in first line
3213 Src: LocationView.cpp
3214 PATCH: [ 938822 ] Enable merge items in file compare context menu
3219 PATCH: [ 941014 ] Various Updates in German Translation (Tim Gerundt)
3220 (Except I didn't remove the synchro comments)
3221 Languages: MergeGerman.rc
3222 Added synchro comments to Merge.rc. Synchronized various languages to English.
3224 Languages: MergeBrazilian.rc MergeBulgarian.rc MergeCatalan.rc
3225 MergeChineseSimplified.rc MergeChineseTraditional.rc
3226 MergeCzech.rc MergeDanish.rc MergeFrench.rc MergeGerman.rc
3230 PATCH: [ 940713 ] Fix for resetting dirview columns
3231 Src: DirViewColHandler.cpp
3232 Remove deprecated keywords from RC file I added in when applying #936682.
3234 PATCH: [ 940089 ] Add Binary column and shorten short result
3235 Src: DirViewColHandler.cpp DirViewColItems.cpp Merge.rc resource.h
3236 Languages: *.rc resource.h
3237 PATCH: [ 940036 ] Add missing dirview column table indexes
3238 Src DirViewColHandler.cpp
3241 PATCH: [ 936682 ] Highlight syntax in unrecognized side
3242 Src: MainFrm.cpp Merge.rc MergeDoc.cpp OptionsDef.h PropEditor.cpp
3243 PropEditor.h resource.h
3244 Languages: *.rc resource.h
3247 PATCH: [ 938609 ] Merge mode (simplified)
3248 Src: MainFrm.cpp Merge.rc MergeDoc.cpp MergeDoc.h MergeEdiView.cpp
3249 MergeEditView.h OptionsDef.h resource.h
3250 Languages: *.rc resource.h
3251 BUG: [ 939548 ] Location bar crash if diff at end missing last line EOL
3252 Src: LocationView.cpp
3254 2004-04-20 WinMerge experimental release 2.1.7.0 (cvs)
3257 Syntax correction for Unicode
3261 BUG:[ 938373 ] Filtering broken - infinite loop when file filtered
3265 updated swedish translation
3266 Submitted by Hans Eriksson <hans.ericson@bredband.net>
3267 Languages/Swedish: MergeSwedish.rc
3270 PATCH: [ 929210 ] GUI for prediffer (compare two files)
3271 Src: DiffWrapper.cpp DirView.cpp MainFrm.cpp MainFrm.h Merge.rc MergeDoc.cpp MergeEditView.cpp
3272 MergeEditView.h resource.h
3273 Languages: *.rc resource.h
3276 Fix English typos in Localization Instructions.txt
3277 InnoSetup/Languages/Localization Instructions.txt
3280 PATCH [ 937535 ] Updated syntax highlighting for resources files (*.rc)
3281 Submitted by Tim Gerundt
3282 Src/editlib: rsrc.cpp
3285 BUG: [ 937435 ] cvs doesn't compile -- typo in CMergeDoc::ShowRescanError(
3287 PATCH: [ 937441 ] CMergeEditView:Avoid calling SelectDiff when no current diff
3288 Src: MergeEditView.cpp
3289 BUG: [ 936079 ] castellano options
3290 Src/Languages/Spanish: MergeSpanish.rc
3293 PATCH: [ 934738 ] CopyLeftTo/CopyRightTo Including Common Subdirectories
3294 Submitted by Ben (?) - some modifications by Kimmo
3296 PATCH: [ 930456 ] Allow Copy Left/Right to copy folders too
3298 PATCH: [ 934370 ] Log temp file errors and own errormessage
3299 Src: Merge.rc MergeDoc.cpp MergeDoc.h resource.h
3300 Languages: *.rc resource.h
3303 PATCH: [ 910557 ] Location Bar
3304 Submitted by Vincent Osele
3305 Src: ChildFrm.cpp ChildFrm.h MainFrm.cpp Merge.dsp Merge.rc
3306 MergeDoc.cpp MergeDoc.h MergeEditView.h resource.h
3307 Src new files: LocationBar.cpp LocationBar.h LocationView.h LocationView.cpp
3308 Languages: *.rc resource.h
3311 PATCH: [ 929001 ] Delete commented out "diff_dirs2"
3315 BUG: [ 936824 ] Prediffer not initialized when generate patch
3319 BUG: [ 936524 ] Cannot compare/Cancel,Retry,Continue
3323 Fix for unicode build after patch #935048 -- add _T() around string
3327 PATCH: [ 935048 ] Plugin manager and per-file plugin settings V2
3328 Src: DiffContext.cpp DiffContext.h DiffWrapper.cpp DiffWrapper.h DirActions.cpp DirDoc.cpp DirDoc.h
3329 DirScan.cpp DirView.cpp DirView.h MainFrm.cpp Merge.dsp Merge.rc MergeDoc.cpp MergeDoc.h resource.h
3330 Src Add: PluginManager.cpp PluginManager.h
3333 updated swedish translation
3334 Submitted by Hans Eriksson <hans.ericson@bredband.net>
3335 Languages/Swedish: MergeSwedish.rc
3338 RFE: [ 934446 ] Syntax highlighting for XML files
3339 Submitted by Tim Gerundt
3341 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
3342 Src/editlib new file: xml.cpp
3345 BUG: [ 926578 ] Division by zero exception
3346 Fix tabsize limits in options dialog
3348 PATCH: [ 934344 ] Reset dircompare columns
3349 Src: DirColsDlg.cpp DirColsDlg.h DirViewColHandler.cpp Merge.rc resource.h
3350 Languages: *.rc resource.h
3353 PATCH: [ 889357 ] Attempt to improve DirScan speed -- updated patch from 2004-03-18
3354 Src: 7zCommon.cpp 7zCommon.h DiffContext.cpp DiffContext.h DiffFileInfo.h
3355 DiffWrapper.cpp DiffWrapper.h DirDoc.cpp DirScan.cpp DirViewColHandler.cpp DirViewColItems.cpp DirViewColItems.h
3357 Merge7z: Merge7z.def Merge7z.h Merge7z311.cpp Merge7zCommon.cpp Merge7z311.dsp Merge7z312.dsp Merge7z313.dsp
3360 PATCH: [ 932086 ] Syntax highlighting of HTML not complete (Bug 930930)
3361 Submitted by Tim Gerundt
3362 Src/editlib: ccrystaltextview.cpp html.cpp php.cpp
3363 Fix typo causing wrong icon for error items in dir compare
3367 BUG: [ 930995 ] Cursor help text ... ; part two : inversion in menu
3372 PATCH: [ 930495 ] Log delete file errors from FileTransform.cpp
3373 Src: FileTransform.cpp
3374 PATCH: [ 930512 ] Log delete file errors from multiformatText.cpp
3375 Src/Common: multiformatText.cpp
3378 BUG: [ 930995 ] Cursor help text ...
3379 Src/Languages/German: MergeGerman.rc
3382 PATCH: [ 929155 ] Add identical folders to dircompare statepane
3383 Src: DirCompStateBar.cpp DirCompStateBar.h DirView.cpp Merge.dsp
3385 Src/res new file: error.bmp
3386 Languages: Merge.rc resource.h res/error.bmp
3387 PATCH: [ 929584 ] Reset scratchpad names
3388 Don't show "Untitled Left/Right" for docs opened after scratchpads
3392 PATCH: [ 928976 ] Handle when selected language not in list
3393 Src/Common: LanguageSelect.cpp
3396 PATCH: [ 914513 ] Move message ids to stdafx.h
3400 Move enum ACT_TYPE, struct action, and typedef DeletedItemList inside of
3401 struct ActionList, of which they are part. Add header comment for ActionList.
3402 Src: DirActions.cpp DirView.h
3405 PATCH: [ 923044 ] Partial compare large files
3406 Plugins: list of sources.txt
3407 Plugins\src_VCPP_WatchBeginningOfLog add: all files
3408 Plugins\src_VCPP_WatchEndOfLog add: all files
3411 PATCH [ 925172 ] Check for presence of Windows Script
3412 Src: ConfigLog.cpp ConfigLog.h Merge.rc MergeEditView.cpp Plugins.cpp Plugins.h resource.h
3415 Change plugins event title 'CONTEXT_MENU' -> 'EDITOR_SCRIPT'
3416 Src: FileTransform.cpp FileTransform.h MergeEditView.cpp Plugins.cpp Plugins.h
3417 Plugins/dlls: editor addin.sct insert datetime.sct list.txt
3418 Plugins: list of sources.txt readme.txt syntax.txt
3419 Plugins/src_VB/ToUpper: WinMergeScript.cls
3422 Remove most of obsolete keywords in rc file (a la Merge.rc 1.149, which didn't have them)
3424 PATCH: [ 927000 ] Russian translation update (based on 1.32)
3425 (Not applied exactly, but updated to match current English Merge.rc (mostly removing obsolete keywords).
3426 Languages: Russian/MergeRussian.rc
3427 Merge Portuguese Brazilian to current English Merge.rc (mostly removing obsolete keywords).
3428 Languages: Brazilian/MergeBrazilian.rc
3431 PATCH: [ 924521 ] Add context menu for file compare
3432 Src: DirView.cpp FilePathEdit.cpp Merge.rc MergeEditView.cpp resource.h
3433 Languages: resource.h *.rc
3436 Fixed Swedish Language had a description of Spanish in the installer.
3437 Fixed Swedish was installing along with Spanish rather than the Swedish component description in the installer.
3438 Src: InnoSetup/WinMerge.iss
3439 Release Notes Table template created in response to the table located at http://sourceforge.net/project/shownotes.php?release_id=226701.
3440 Src: Docs/Users/Release Notes Template.htm
3441 Migration of /UsersGuide --> /Docs/Users/UsersGuide --> /Docs/Users/Guide Documented
3442 Src: Docs/Developers/File Migration Log.htm
3445 PATCH: [ 922724 ] "Don't display again" option for messageboxes
3446 Src: DirActions.cpp DirView.cpp MainFrm.cpp Merge.cpp Merge.dsp Merge.rc
3447 MergeDoc.cpp PatchDlg.cpp PatchTool.cpp PropGeneral.cpp PropGeneral.h StdAfx.h resource.h
3448 Src/editlib: ceditreplacedlg.cpp
3449 Src/common add: MessageBoxDialog.cpp MessageBoxDialog.h
3450 Languages: *.rc resource.h
3453 PATCH: [ 925179 ] Remove is_*file() functions from coretools.h/cpp
3454 Common: coretools.cpp coretools.h
3457 BUG [ 925202 ] broken feature: after save error, save with another filename
3461 PATCH: [ 913743 ] Icons for menuitems (RFE 873697)
3462 File/Exit and Help/Contents icons from Tim Gerundt
3463 Src: MainFrm.cpp Merge.rc resource.h
3464 Src/res new files: exit.bmp help_contents.bmp
3465 Languages: *.rc resource.h
3466 Languages/res: exit.bmp help_contents.bmp
3469 PATCH [ 921788 ] scripts submenu in the main menu
3470 Src: FileTransform.cpp FileTransform.h MainFrm.cpp MainFrm.h Merge.rc
3471 MergeEditView.cpp MergeEditView.h Plugins.cpp Plugins.h resource.h
3472 Src/Languages: *.rc resource.h
3474 2003-03-27 WinMerge beta 2.1.6.0 released
3477 Src/Languages: Bulgarian/MergeBulgarian.rc
3478 Many cosmetic changes to make MergeBulgarian.rc match Merge.rc (mostly dropping obsolete keywords).
3481 [ 847155 ] Utf8len_of_string is wrong for 8-bit
3482 Src/Common: unicoder.cpp unicoder.h
3485 Docs/Users: Contributors.rtf
3486 Add Bulgarian credit to contributors.rtf. Move Portuguese to alphabetically Portuguese.
3489 Fixed Swedish Language had a description of Spanish in the installer.
3490 Fixed Swedish was installing along with Spanish rather than the Swedish component description in the installer.
3491 Src: InnoSetup/WinMerge.iss
3494 Add new Bulgarian translation
3495 Src/Languages/Bulgarian
3498 BUG: [ 918760 ] doxygen.cfg moved
3499 Update paths for new location of doxygen.cfg in docs/developers
3500 docs/developers: doxygen.cfg
3503 HideFirstLetter plugin : fix : open input and output file as binary
3504 Plugins/HideFirstLetter: WinMergeScript.cpp
3506 2004-03-24 WinMerge experimental release 2.1.5.16 (cvs)
3509 BUG: [ 922716 ] "delete both" broken
3513 Add simple comments in action list code
3517 PATCH: [ 921440 ] UI option for detecting moved blocks
3518 Src: DirDoc.cpp MainFrm.cpp Merge.rc MergeDoc.cpp OptionsDef.h
3519 PropCompare.cpp PropCompare.h resource.h
3520 Languages: *.rc resource.h
3523 I added /InnoSetup/desktop.ini file to be used as a template for making C:\Program Files\WinMerge, or wherever that might be, have a customized (WinMerge) folder icon.
3524 InnoSetup: desktop.ini
3525 The DocBook version of the manual was revised to reference GIF versions of all previously referenced BMP images. Thiw provides better compression and browser compatiblity.
3526 Docs: Users/Manual/screenshots/*.bmp --> *.gif
3527 Docs: Users/Manual/Compare_dirs.xml
3528 Docs: Users/Manual/Compare_files.xml
3531 PATCH: [ 920530 ] Remember Patch-dialog settings
3532 Src: Merge.rc PatchDlg.cpp PatchDlg.h resource.h
3533 Languages: *.rc resource.h
3534 BUG: [ 920965 ] Merging moved block messes up linecolors
3536 BUG: [ 902915 ] Directory compare statepane button text blinks
3537 Fix submitted by Jochen in Patch #889357 Attempt to improve DirScan speed.
3538 Src: DirCompStateBar.cpp
3539 Change directory compare statepane button to defaultbutton
3540 Allows stopping directory compare with Enter-key
3545 PATCH: [ 909672 ] Undo makes marker messy
3546 Src: MergeEditView.cpp
3547 Src/editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h
3550 Installer now also installs WinMerge as the merging application in addition being the differencing application.
3551 Installer updated to use \ShellExtension\ShellExtension.dll as the new location for that file
3552 Installer will now remove the ComCtlupd.exe at the end of the installation.
3553 Patch: [ 919134 ] I added the OleAut32.dll necessary for others to compile the WinMerge.iss script.
3554 Src: /InnoSetup/WinMerge.iss
3555 I compressed Splash1.bmp using RLE (Run Length Encoding [Lossless compression]) and named it as Splash2.bmp. I only modified the English version. Please test it out and send me an e-mail if it works and I'll create the RLE versions of all the other images. PS: the file size went from 163 --> 111KB.
3556 Src: /Src/Res/Splash2.bmp
3559 PATCH: [ 918545 ] New Splash Screen
3560 Submitted and graphics by Dean Grimm
3561 Src: Splash.cpp Splash.h
3562 Src/res: splash1.bmp
3564 2004-03-19 Christian
3565 PATCH: [ 919134 ] Paths fixed in installer
3566 InnoSetup: WinMerge.iss
3569 BUG: [ 919090 ] Memory leak in DiffFileData
3570 Src: DiffWrapper.cpp
3573 BUG: [ 919160 ] Cannot execute notepad.exe
3574 Fix OpenFileToExternalEditor to prepend space before quoted filename.
3576 PATCH: [ 891498 ] moved block detection
3577 Src: Diff.cpp DiffWrapper.cpp DiffWrapper.h MergeDoc.cpp MergeDoc.h
3578 MergeEditView.cpp MergeEditView.h
3579 Src\diffutils\src: analyze.c DIFF.H
3582 Modified \ShellExtension\Register.bat to also UnRegister via a /U (case-insensitive) parameter.
3583 I also added an UnRegister.bat which does nothing more than call Register.bat with the /u switch.
3584 If you're wondering where a particular file or folder went and why please see \Docs\Developers\File Migration Log.htm.
3585 Everyone can use this file from now on.
3588 PATCH: [ 913743 ] Icons for menuitems (RFE 873697)
3589 More nice icons from Tim Gerundt (Edit/Goto, Edit/Replace, View/Language, View/Font, Window/Change Pane)
3590 Src: MainFrm.cpp Merge.rc resource.h
3591 Src/res new files: change_pane.bmp go_to.bmp language.bmp replace.bmp select_font.bmp
3592 Languages: *.rc resource.h
3593 Languages/res new files: change_pane.bmp go_to.bmp language.bmp replace.bmp select_font.bmp
3594 PATCH: [ 915790 ] Open Contributors.rtf from About dialog
3595 Handle errors if wordpad or associated app couldn't be run.
3599 [Patch 917142] for Installer:
3600 -Now detects whether or not the user requires an updated ComCtl32.dll and if needed updates it.
3601 -Corrupt Shell Extension folder association removed from the registry (no more errors in Windows Explorer)
3602 -Explorer "WinMerge" context menu support added
3603 -The View Start Menu folder option at the end of the install no longer appears if the user chose not to create a start menu group
3604 -Portugese is now listed amongst the other selectable languages in alpahbetic order
3605 -Catalan, Norwegian, Polish, Russian, and Swedish translations have been added to the installer for a total of 17 languages! Way to go
3606 Translators! Eventually we'll all just get lazy and speak Mergish :).
3607 -WinMerge's "User's Guide" and "Read Me" files installed and added to the user's start menu
3608 Program Files\Docs\ created containing:
3612 -The Read Me.rtf was divided into two files: Read Me.rtf and Contributors.rtf
3613 (since this information is non-technical ands considerable bloat to the main Read Me file)
3614 -Obsolete registry settings LeftMax and DirViewMax are now deleted rather than reset
3615 (note: all registry deletions in Inno Setup must have Type set to "None")
3616 -Whether or not TortoiseCVS is installed support for it is added to the registry. That way if a user ever installs it our application with start working with it automatically :) (don't worry this only causes two possibly unecessary registry values and one key to be created)
3617 -Since all three of the core WinMerge application files WinMerge*.exe, Merge7z*.dll, and ShellExtension.dll all use Ole Automation, I've included the necessary runtime: OleAut32.dll (VS6 Service Pack 5)
3620 RFE [ 917196 ] Directory Comparison Results baloon annoyance
3621 Don't show infotip for filename when whole filename is already shown
3623 PATCH: [ 915790 ] Open Contributors.rtf from About dialog
3624 Src: Merge.cpp Merge.rc resource.h
3627 Fix Bulgarian (Cyrillic) spelling of Bulgarian.
3628 Src/Common: LanguageSelect.cpp
3631 RFE: [ 874366 ] Add goto line-number
3632 Scroll line searched to center of view, as suggested by harry mckame
3633 Src: MergeEditView.cpp
3634 Change URLs to point http://winmerge.org
3635 (As discussed in BUG #916674 Hardcoded url to help and website from help-menu)
3636 MainFrm.cpp Merge.cpp
3639 RFE [ 897975 ] Syntax highlighting for INI files
3641 Src/editlib: ini.cpp
3642 Apply icon change (2004-03-13 Seier) to languages
3643 Languages/res: Merge.ico
3644 PATCH: [ 913743 ] Icons for menuitems (RFE 873697)
3645 Submitted by Tim Gerundt
3646 Src: MainFrm.cpp Merge.rc resource.h
3647 Src/res: Toolbar.bmp
3648 Src/res new files: close.bmp
3649 Languages: *.rc resource.h
3651 BUG: [ 916028 ] Deleting unique file does not remove it from view
3655 Add 48*48 icon version (256 & 16 color)
3659 Add User Manual draft to CVS
3660 Docs/Users/Manual: *.*
3661 PATCH: [ 915145 ] Delay automatic close of compare pane
3664 2004-03-13 WinMerge experimental release 2.1.5.15 (cvs)
3667 PATCH: [ 902191 ] Uninline CDiffTextBuffer functions
3668 Src: GhostTextBuffer.cpp MergeDoc.cpp MergeDoc.h
3669 BUG: [ 906467 ] Link error with Visual Studio 2003
3670 Fix submitted by hberni
3673 PATCH: [ 911442 ] Sort folders first when sorting by name
3674 Also fixing grouping doxygen comments for functions
3675 Src: DirViewColItems.cpp
3677 2004-03-11 WinMerge experimental release 2.1.5.14 (installer test)
3680 PATCH: [ 913792 ] Cache color options for MergeView
3681 Src: MergeDoc.cpp MergeEditView.cpp MergeEditView.h
3682 BUG: [ 872882 ] Some selected menu items looks to small
3683 Adds missing handler functions BCMenu needs
3684 Also added code to implement document menus (commented out for now)
3685 Src: MainFrm.cpp MainFrm.h Merge.rc
3686 PATCH: [ 913743 ] Icons for menuitems (RFE 873697)
3687 Submitted by Tim Gerundt
3688 Src: MainFrm.cpp Merge.rc resource.h
3689 Src/res new files: cascade.bmp cut.bmp cut.bmp horizontally.bmp
3690 paste.bmp search.bmp vertically.bmp
3691 Languages: *.rc resource.h
3695 Fix for OptionsMgr bugs when loading string options from registry
3696 UNICODE strings were not handled correctly, incorrect buffer lengths
3697 Src/Common: OptionsMgr.cpp OptionsMgr.h
3698 PATCH: [ 912754 ] Close open MergeDoc before opening new from DirDoc
3699 Src: DirDoc.cpp DirDoc.h DirView.cpp
3700 RFE: [ 874366 ] Add goto line-number
3701 Show few lines of context above line scrolled to
3702 Src: MergeEditView.cpp
3703 PATCH: [ 913073 ] Option to automatically close compare pane
3704 Src: DirView.cpp DirView.h MainFrm.cpp Merge.rc OptionsDef.h
3705 PropGeneral.cpp PropGeneral.cpp resource.h
3706 Languages: *.rc resource.h
3709 PATCH: [ 912297 ] Splashscreen and syntax highlight options
3710 Src: MainFrm.cpp Merge.cpp Merge.h MergeDiffDetailView.cpp
3711 MergeEditView.cpp OptionsDef.h
3712 Fix compile of CShellFileOp with Visual Studio 2003
3713 Fix from original author Michael Dunn
3714 Common: CShellFileOp.cpp
3717 PATCH: [ 911350 ] Restore default compare options
3718 Src: MainFrm.cpp Merge.rc PropCompare.cpp PropCompare.h resource.h
3719 Languages: *.rc resource.h
3720 PATCH: [ 892397 ] Distinguish prediffer from unpacker
3722 Src: DiffWrapper.cpp DirScan.cpp FileTransform.cpp FileTransform.h
3723 MainFrm.cpp MergeDoc.cpp SelectUnpackerDlg.cpp
3724 BUG: [ 909779 ] Uninitialised variable in CGhostTextBuffer::DeleteText()
3725 Fix submitted by Laoran
3726 Src: GhostTextBuffer.cpp
3727 BUG: [ 909796 ] Uninitialised variable on OnSelchangeUnpackerName()
3728 Fix submitted by Laoran
3729 Src: SelectUnpackerDlg.cpp
3730 BUG: [ 909090 ] MainFrm::m_CheckOutMulti not initialized
3731 Also m_bVCProjSync was unitilialised.
3735 PATCH: [ 911114 ] DiffOptions to new system
3736 Src: ConfigLog.cpp ConfigLog.h DiffWrapper.cpp DiffWrapper.h DirDoc.cpp
3737 DirDoc.h MainFrm.cpp MainFrm.h MergeDoc.cpp MergeDoc.h OptionsDef.h
3738 PATCH: [ 906872 ] Change ShellExtension to open directories non-recursive
3739 ShellExtension: ShellExtension.rc WinMergeShell.cpp WinMergeShell.h
3740 RFE: [ 874366 ] Add goto line-number
3741 Improvement: Show file's current line in Goto-dialog as selected
3742 Src: MergeEditView.cpp
3743 Add contributors.txt
3744 Docs: contributors.txt
3746 2004-03-06 WinMerge experimental release 2.1.5.13 (cvs)
3749 PATCH: [ 909980 ] Fix buffer types and descriptions
3750 Src: MergeDoc.cpp MergeDoc.h
3751 Two unrelated lines got removed by checkin of #909980
3755 Fix invalid return in paths_IsPathAbsolute()
3757 PATCH: [ 907898 ] Detect filechange by another app before saving
3758 Src: DiffContext.cpp DiffContext.h Merge.dsp Merge.rc MergeDoc.cpp
3759 MergeDoc.h resource.h
3760 Src new files: DiffFileInfo.cpp DiffFileInfo.h
3761 Languages: *.rc resource.h
3764 fix BUG: [ 902430 ] copy&paste comment bug
3768 PATCH: [ 908606 ] Restore default colors
3769 Add "Defaults" button to Color options page
3770 Src/Common: OptionsMgr.cpp OptionsMgr.cpp
3771 Src: Merge.rc PropColor.cpp PropColors.h resource.h
3772 Languages: recource.h *.rc
3773 PATCH: [ 908211 ] DiffContext.h should not include RegExp.h
3775 Src: DiffContext.h DirDoc.h
3776 BUG: [ 908217 ] MergeDoc has incorrect include
3781 PATCH: [ 907087 ] Allow commandline switches for external editor
3782 Src/Common: coretools.cpp coretools.h
3784 PATCH: [ 907641 ] Convert color options to new system
3785 Src: ColorButton.cpp ColorButton.h MainFrm.cpp Merge.cpp Merge.h
3786 MergeDiffDetailView.cpp MergeEditView.cpp OptionsDef.h
3787 PropColors.cpp PropColors.h
3790 PATCH: [ 906180 ] Use SHBrowseForFolder() to select folder
3791 Src: Merge.cpp Merge.h
3792 FIX wrong checkin comments and wrong patch number and description
3793 in previous checkin.
3794 PATCH: [ 906934 ] Fix filenames in patch-files
3795 Src: DiffWrapper.cpp
3797 2004-02-28 WinMerge experimental release 2.1.5.12 (cvs)
3800 PATCH: [ 906120 ] Improve error handling for dircompare fileoperations
3802 PATCH: [ 906224 ] Convert more options to new system
3803 Src: MainFrm.cpp MainFrm.h MergeDiffDetailView.cpp MergeDoc.cpp
3804 MergeDoc.h MergeEditView.cpp OptionsDef.h
3807 PATCH: [ 905115 ] Put deleted files to Recycle Bin
3808 Also added option to disable it in "System" options
3809 DirActions.cpp MainFrm.cpp Merge.rc OptionsDef.h PropRegistry.cpp
3810 PropRegistry.h resource.h
3811 Fix copy/paste error
3813 Better absolute path check (I thought I already applied this)
3817 PATCH: [ 903670 ] Copy Folder (and convert to CShellFileOp)
3818 Src: DirActions.cpp DirView.h MainFrm.cpp MainFrm.h
3821 PATCH: [ 902738 ] Two errors in resource (Whitespaces and Hilight)
3822 Also RFE [ 837773 ] fix all about boxes
3827 PATCH: [ 896153 ] OptionsManager
3828 Src/Common: new files OptionsMgr.cpp OptionsMgr.h
3829 Src: DirDoc.cpp DirView.cpp MainFrm.cpp MainFrm.h Merge.dsp MergeDoc.cpp
3831 Src: new file OptionsDef.h
3832 PATCH: [ 900718 ] Updated German translation
3833 Submitted by Tim Gerundt
3834 Languages/German: MergeGerman.rc
3837 Fix CopyAll.bat for new directory structure.
3838 Src: Languages\CopyAll.bat
3839 Add GetClipTcharTextFormat (needed by coretools now) to StdAfx.*
3840 MakeResDll: StdAfx.cpp StdAfx.h
3841 Fix MakeResDll.dsp to compile (new directory structure).
3842 MakeResDll\MakeResDll.dsp
3844 2004-02-20 WinMerge experimental release 2.1.5.11 (cvs)
3847 PATCH: [ 899926 ] Write LogErrorString()s to logfile
3848 Src: DiffWrapper.cpp MainFrm.cpp MergeDoc.cpp StdAfx.cpp
3851 BUG: [ 888992 ] 7zip integration: Error deleting file when closing WinMerge
3855 PATCH: [ 899145 ] Check if patch path is absolute
3856 Src: Merge.rc PatchDlg.cpp paths.cpp paths.h resource.h
3857 Languages: *.rc resource.h (incl. changes from #889357)
3858 BUG: [ 893410 ] Typo in IDS_DIFF_FILEOVERWRITE
3861 RFE: [ 897975 ] Syntax highlighting for INI files
3862 Patch submitted by Tim Gerundt
3864 editlib: ccrystaltextview.cpp ccrystaltextview.h
3865 editlib new file: ini.cpp
3868 PATCH: [ 889357 ] Attempt to improve DirScan speed
3869 The VERIFY(::DeleteFile... ) in prepAndCompareTwoFiles() won't fire as long as
3870 the gLog.m_nMaskLevel's LOGLEVEL::LSILENTVERIFY bit is set, which is the case
3872 Common: logfile.cpp logfile.h
3873 Src: stdafx.cpp stdafx.h Merge.rc resource.h Diff.cpp DiffContext.cpp
3874 DiffContext.h DiffWrapper.cpp DiffWrapper.h DirCompStateBar.cpp
3875 DirCompStateBar.h DirScan.cpp DirView.h DirViewColHandler.cpp
3876 DirViewColItems.cpp DirViewColItems.h files.cpp FileTransform.h
3880 BUG: [ 898745 ] Wrong result for folders (non-recursive compare)
3881 Src: DirViewColHandler.cpp
3884 BUG: [ 887280 ] Swap toolbar icon (usability)
3885 Swaps 'Last Diff' and 'First diff' buttons + adds separator before
3887 Src/res: Toolbar.bmp
3889 Languages/res: Toolbar.bmp
3892 PATCH: [ 873151 ] Attempt to fix Help/Configuration
3895 PATCH: [ 891364 ] Enumerated doctype (scratchpads)
3896 Src: MergeDoc.cpp MergeDoc.h
3899 BUG: [ 893287 ] Assign wrong file property when storing changes.
3903 Add header comments to functions lacking such in StdAfx.cpp
3907 PATCH: [ 892509 ] Reset dircompare statuspane before new compare
3908 Src: DirCompStateBar.cpp DirCompStateBar.h DirFrame.cpp
3909 PATCH: [ 890758 ] Fix and tune doxy config file
3911 BUG: [ 887271 ] Weird context menu position if opened from keyboard
3912 Src: MergeEditView.cpp
3915 BUG: [ 892158 ] Empty lines added to end of file
3918 2004-02-07 WinMerge experimental release 2.1.5.9 (cvs)
3921 BUG: [ 892115 ] Directory compare always recursive
3925 Remove doubled entrys from MessageMap
3926 Src: MergeEditView.cpp
3929 BUG: [ 876500 ] OlecharToUTF8 doesn't distinguish UCS-2BE?
3930 Add function header comment to OlecharToUTF8 in multiformatText.cpp
3931 Common: multiformatText.cpp
3934 PATCH: [ 888662 ] Add Editor options page
3935 Src: MainFrm.cpp Merge.dsp Merge.rc PropGeneral.cpp PropGeneral.h resource.g
3936 Src new files: PropEditor.cpp PropEditor.h
3937 Src removed files: PropSyntax.cpp PropSyntax.h
3938 Lanuages: *.rc resource.h
3941 Correcting the path for the original resource.h
3942 Languages: UpdateAll_resource_h.bat
3945 PATCH: [ 882683 ] Combine transform code in DirScan.cpp
3946 Src: DirScan.cpp FileTransform.cpp FileTransform.h MergeDoc.cpp
3947 PATCH: [ 890019 ] Fix diff_flag to bin_flag in CDiffWrapper::RunFileDiff
3948 Src: DiffWrapper.cpp
3951 Fix "Copy Right to.." (copy/paste error)
3953 PATCH: [ 889115 ] Delete transformed temp files in file compare
3954 Src: DiffWrapper.cpp
3955 PATCH: [ 889334 ] Improve and enable logging
3956 Logging is now enabled for debug builds, written to $temp/WinMerge.log
3957 Common: LogFile.cpp LogFile.h
3958 Src: DiffWrapper.cpp DirActions.cpp DirDoc.cpp DirScan.cpp
3959 MainFrm.cpp MergeDoc.cpp StdAfx.cpp
3960 PATCH: [ 887800 ] Add frames around items in dircompare statusbar
3961 Src: DirCompStateBar.cpp DirCompStateBar.h Merge.rc
3965 Cosmetic: fix copy&paste error in UniFile.cpp comment.
3966 Src/Common: UniFile.cpp
3969 PATCH: [ 885496 ] Move compare options to Compare-page
3970 src: MainFrm.cpp Merge.rc PropCompare.cpp PropCompare.h
3971 PropGeneral.cpp PropGeneral.h
3973 PATCH: [ 887085 ] CMergeDoc::TrySaveAs() cleanup
3974 src: MergeDoc.cpp MergeDoc.h
3975 Remove some unused variables
3976 src: DiffWrapper.cpp MergeDoc.cpp PatchDlg.cpp StringDiffs.cpp
3977 src/common: multiformatText.cpp
3978 Initialise all PackingInfo members
3979 src: FileTransform.h
3982 BUG: [ 885018 ] Crash when trying to save scratchpad
3986 PATCH: [ 887283 ] Menu cleanup
3991 BUG: [ 887957 ] Some builds of ShellExtension need include dir fixed
3992 ShellExtension: ShellExtension.dsp
3993 PATCH: [ 882650 ] Move temp build files out of Build into BuildTmp (more)
3994 ShellExtension: ShellExtension.dsp
3995 [ 879536 ] Add MakePatchDirs source to repository
3996 MakePatchDirs: AppVersion.cpp AppVersion.h CDirDialog.cpp CDirDialog.h
3997 CMoveConstraint.cpp CMoveConstraint.h CSubclass.cpp CSubclass.h
3998 ChangeLog.txt DropEdit.cpp DropEdit.h MakeDirs.cpp MakeDirs.h
3999 MakePatchDirs.dsp MakePatchDirs.ico MakePatchDirs.rc MakePatchDirs.rc2
4000 MakePatchDirsApp.cpp MakePatchDirsApp.h MakePatchDirsDlg.cpp
4001 MakePatchDirsDlg.h ReadMe.txt StdAfx.cpp StdAfx.h dist.txt exc.cpp
4004 2004-01-30 WinMerge experimental release 2.1.5.8 (cvs)
4007 BUG: [ 887543 ] Word-diff (No difference) messagebox has Cancel-button
4008 src: MergeDocLineDiffs.cpp
4011 PATCH: [ 885092 ] CMergeDoc::DoSave() cleanup
4012 src: MergeDoc.h MergeDoc.cpp
4015 PATCH: [ 884301 ] Modified Visual Basic syntax highlighting
4016 Submitted by Tim Gerundt
4017 src/editlib: basic.cpp
4019 2004-01-26 Christian
4020 PATCH: [ 883303 ] Upgrade WinMerge Home Page
4021 Web: index.php winmerge.css WinMergePAD.xml images/redswirl.gif
4024 BUG: [ 846034 ] drag and drop files does not set extension
4028 Avoid copying DIFFITEMs
4029 This badly slowed down DirView sorting and navigation.
4030 src: DirViewColHandler.cpp DirView.cpp DirView.h 7zCommon.cpp 7zCommon.h
4031 Fix ASSERT in vc98/mfc/src/olevar.cpp when sorting DirView by date
4032 src: DirViewColItems.cpp
4035 Fix bad default for OPENFILENAME::nFilterIndex
4039 [ 882650 ] Move temp build files out of Build into BuildTmp
4041 MakeResDll: MakeResDll.dsp
4044 PATCH: [ 881602 ] Don't allow canceling saving when its pointless
4045 src: MainFrm.cpp MergeDiffDetailView.cpp MergeDoc.cpp MergeDoc.h MergeEditView.cpp
4046 PATCH: [ 880769 ] Select all in Dir compare
4047 src: DirView.h DirView.cpp Merge.rc
4049 Minor update to 2.2 plan - couple of items completed, two new items (25, 26)
4052 PATCH: [ 880006 ] Code cleanup--old commented out lines in DirView.h
4054 Cleanup stdafx.h; comment includes & declarations, remove unneeded include of afxsock.h
4055 src: StdAfx.cpp StdAfx.h
4056 PATCH: [ 802113 ] strip out spurious tests: _MSC_VER >= 1000 { part #2/2 }
4057 src: CCPrompt.h ColorButton.h DiffViewBar.h DirCompStateBar.h MergeEditView.h
4058 OutputDlg.h PatchDlg.h PropColors.h PropCompare.h PropFilter.h PropRegistry.h
4059 PropSyntax.h SelectUnpackerDlg.h WMGotoDlg.h
4060 src/Common: SplitterWndEx.h
4063 PATCH: [ 848159 ] RFE 826652 : Compare by modified date
4064 Submitted by Tim Musschoot - some modifications by Kimmo
4065 src: DirScan.cpp MainFrm.h MainFrm.cpp Merge.dsp Merge.rc resource.h
4066 src new files: PropCompare.h PropCompare.cpp
4067 Languages: *.rc resource.h
4070 Add some comments before initialization of g_cols
4071 src: DirViewColItems.cpp
4074 PATCH: [ 878631 ] Add generic named properties to DiffContext
4075 src: Diff.cpp DiffContext.cpp DiffContext.h DirDoc.cpp DirScan.cpp
4076 DirView.h DirViewColHandler.cpp DirViewColItems.cpp Merge.dsp
4078 src/Common: varprop.cpp varprop.h
4081 PATCH: [ 880898 ] BCMenu update to v3.034
4082 src: BCMenu.h BCMenu.cpp
4084 2004-01-20 WinMerge experimental release 2.1.5.7 (cvs)
4088 New class CSilentException to be thrown on subsequent failures in proxy linking to merge7z*.dll.
4089 src: 7zCommon.cpp 7zCommon.h MainFrm.cpp
4092 Finish Merge7z integration
4093 src: Merge.rc resource.h DirView.cpp DirView.h DirDoc.cpp MainFrm.cpp Merge.dsp
4094 Merge7z: Merge7z311.dsp Merge7z312.dsp Merge7z313.dsp
4097 PATCH: [ 880046 ] Save every line including last one in SaveToFile
4099 UniStdioFile::OpenCreateUtf8 (shortcut for creating UTF-8 file)
4100 src/Common: UniFile.cpp UnFile.h
4103 PATCH: 876875 Go To -Dialog
4104 Fix crash in GotoDlg. This was in latest patch, but I merged part of older patch :(
4105 MergeEditView.h MergeEditView.cpp
4108 PATCH: [ 878625 ] Simplify and unify file operations calling diff_2_files.
4109 src: Diff.cpp DiffWrapper.cpp DiffWrapper.h
4110 PATCH: [ 847121 ] Code cleanup (remove unneeded AssertValid & Dump implementations)
4111 src: ChildFrm.cpp ChildFrm.h DirDoc.cpp DirDoc.h DirFrame.cpp DirFrame.h
4112 DirView.cpp DirView.h MainFrm.cpp MainFrm.h MergeDiffDetailView.cpp
4113 MergeDiffDetailView.h MergeEditView.cpp MergeEditView.h
4114 PATCH: [ 802113 ] strip out spurious tests: _MSC_VER >= 1000 { part#1/2 }
4115 src: ChildFrm.h DirFrame.h DirView.h EditFile.h FilepathEdit.h
4116 GhostTextBuffer.h GhostTextView.h MainFrm.h Merge.h MergeDoc.h
4117 PropGeneral.h PropVss.h StdAfx.h VssPrompt.h
4118 PATCH: [ 880046 ] Save every line including last one in SaveToFile
4122 PATCH: 876875 Go To -Dialog
4123 src new files: WMGotoDlg.h WMGotoDlg.cpp
4124 src: Merge.dsp Merge.rc MergeEditView.h MergeEditView.cpp resource.h
4125 src/Languages: *.rc resource.h
4126 PATCH: [ 872413 ] UnpackDFM TestStreamFormat
4127 Submitted by Michael Richter
4128 Plugins/Delphi/UnpackFDM: UnpackFDM.dpr UnpackFDMLib_TLB.pas
4130 Plugins/dlls: UnpackFDM.dll
4133 PATCH: [ 871789 ] Add "Copy to..." items to dirview context menu
4134 src/Common: new files CShellOp.h CShellOp.cpp
4135 src: DirActions.cpp DirView.h DirView.cpp Merge.cpp Merge.dsp
4136 Merge.h Merge.rc resource.h
4137 src/Languages: *.rc resource.h
4138 PATCH: [ 876556 ] (Minor) code cleanup for SaveToFile
4143 Fix bug in UniFile::WriteString counting of written bytes.
4144 Src/Common/UniFile.cpp
4146 2004-01-16 WinMerge experimental release 2.1.5.6 (cvs)
4149 PATCH: [ 873940 ] Diff navigation code cleanups
4150 src: MergeEditView.cpp
4151 Remove _T()'s from _RPTF() macros (forgot to do before last checkin)
4152 src: MergeEditView.cpp
4155 Remove rcs/cvs ID line from unicoder.* (because I share these elsewhere)
4156 src/WinMerge/Common: unicoder.cpp unicoder.h
4157 Fix bug in unicoder.cpp: WideCharToMultiByte: lpDefaultChar & lpUsedDefaultChar must be NULL when using UTF-8.
4158 src/WinMerge/Common: unicoder.cpp
4161 PATCH: [ 876546 ] Fix CMergeDoc::CDiffTextBuffer::SaveToFile ghost line detect
4162 src/WinMerge: MergeDoc.cpp
4165 Start Merge7z integration (to be continued)
4166 src: 7zCommon.cpp 7zCommon.h DirView.h
4169 PATCH: [ 875567 ] Compile after reorg
4170 Submitted by Christian to make WinMerge compile again!
4174 PATCH: [ 874451 ] Update lineposition offpane when navigating diffs
4175 Fixes wrong linenumber and cursor position in inactive file
4176 WinMerge: MergeEditView.cpp
4179 PATCH: [ 875237 ] Fix fwrite call in UniStdioFile::WriteString
4180 Fix byte count and argument order when UniStdioFile::WriteString calls fwrite.
4182 PATCH: [ 875215 ] Fix UnicodeFileToOlechar obtaining BOM
4183 common: multiformatText.cpp
4185 2004-01-11 WinMerge experimental release 2.1.5.5 (cvs)
4188 PATCH: [ 860054 ] Reimplement SaveToFile using stream output
4189 common: multiformatText.cpp unicoder.cpp unicoder.h UniFile.cpp UniFile.h
4190 WinMerge: DiffContext.cpp MergeDoc.cpp
4193 Minor update to 2.2 plan
4194 Docs: Planning_2_2.txt
4196 2004-01-11 WinMerge experimental release 2.1.5.4 (cvs)
4199 Update Merge7z project files to build to ../Build directories
4200 in same fashion as WinMerge project
4201 Merge7z: Merge7z311.dsp Merge7z312.dsp Merge7z313.dsp
4204 PATCH: [ 872762 ] Stricter error handling for Plugins
4205 WinMerge: Plugins.cpp
4208 Fix parameter type, CMergeDoc::TrySaveAs() second param is int.
4209 WinMerge: CMergeDoc.cpp
4212 PATCH: [ 872727 ] Fix function comment on lwdisp.c: ReportError
4214 PATCH: [ 862040 ] CAssureScriptsForThread like WaitCursor
4215 WinMerge: DiffThread.cpp FileTransform.cpp Merge.cpp Merge.h
4216 MergeEditView.cpp Plugins.cpp Plugins.h SelectUnpackerDlg.cpp
4217 PATCH: [ 860072 ] Allow singlethreaded diffs
4218 WinMerge: DiffThread.cpp
4222 Updated Russian translation from Dmitriy Aleshkowskiy
4223 Languages/Russian: MergeRussian.rc
4226 PATCH: [ 872032 ] Add SEH around calls to load plugins
4227 WinMerge: Plugins.cpp
4230 Added new module Merge7z
4231 Merge7z: Merge7z.h Merge7z311.cpp Merge7z311.dsp Merge7z312.dsp
4232 Merge7z313.dsp Merge7zCommon.cpp Merge7zCommon.h StdAfx.cpp
4233 StdAfx.h tools.cpp tools.h
4236 PATCH: [ 856396 ] Browse folders in non-recursive directory compare
4237 WinMerge: DirDoc.h DirDoc.cpp DirScan.cpp DirView.h DirView.cpp
4238 DirViewColHandler.cpp Merge.dsp Merge.rc Paths.h Paths.cpp resource.h
4239 WinMerge/res: new file folder.bmp
4240 Languages: *.rc resource.h
4241 Languages/res: new file folder.bmp
4244 Add Polish translation contributed by Pawel Wawrzyszko
4246 Languages: BuildAll.bat UpdateAll_resource_h.bat
4248 2004-01-06 WinMerge experimental release 2.1.5.3 (cvs)
4251 PATCH: [ 869575 ] UniMemFile needs to init charsize to 1
4253 PATCH: [ 869518 ] Fix IO.C to count non-UNIX prefix lines correctly
4257 BUG: [ 869289 ] Typo in XML_html.flt excludes gif files
4258 Filters: XML_html.flt
4261 PATCH: [ 868584 ] Move DIRSEL_TAG to string resource
4262 WinMerge: Merge.rc OpenDlg.cpp resource.h
4263 Languages: *.rc resource.h
4264 Adding missing line in patch [ 868584 ] and fixing one tab
4265 WinMerge: OpenDlg.cpp
4268 PATCH: [ 863738 ] Various Updates in German Translation
4269 Updates to German translation by Tim Gerundt (gerundt), based on 1.73 MergeGerman.rc
4270 Languages: German/MergeGerman.rc
4271 PATCH: [ 860472 ] Fix SuperComboBox to handle its own OLE requirements
4272 common: SuperComboBox.cpp SuperComboBox.h
4273 New Russian translation by Dmitriy Aleshkowskiy
4277 Put ID_POPUP_COPYALLDIFFSFROMOTHERSIDE back into rc file so it parses
4281 BUG: [ 860043 ] binary file detection broken
4282 WinMerge: DiffWrapper.cpp DirScan.cpp
4285 PATCH: [ 861099 ] Dirview context menu cleanup
4286 WinMerge: DirView.cpp Merge.rc resource.h
4287 Languages: *.rc resource.h
4290 PATCH: [ 860988 ] Change File from menu (Adds Window/Change Pane)
4291 WinMerge: Merge.rc MergeEditView.h MergeEditView.cpp resource.h
4292 Languages: *.rc resource.h
4293 PATCH: [ 861813 ] Optimise dircompare statuspane updating
4294 Fixes bug [ 860204 ] Dir compare statuspane flickers on slower machine
4295 WinMerge: DirCompStateBar.h DirCompStateBar.cpp
4298 adapt plugins syntax check, consequence of patch #853147
4299 WinMerge: Plugins.cpp
4302 PATCH: [ 858283 ] Add isResultDiff() to DiffItem
4303 Fix bug in patch (DirDoc.cpp)
4304 WinMerge: DirDoc.cpp
4307 update plugin docs and examples, consequence of patch #853147
4308 plugins: list of sources.txt readme.txt syntax.txt
4309 plugins\dlls: RCLocalizationHelper.dll list.txt
4310 plugins\src_VB\IgnoreTwoFirstCharsOrder: WinMergeScript.cls
4311 plugins\src_VCPP\RCLocalizationHelper: RCLocalizationHelper.idl WinMergeScript.cpp WinMergeScript.h
4314 PATCH: [ 860072 ] Allow singlethreaded diffs
4315 Add unused code to trigger diffs in main thread (for developer to trigger via breakpoint).
4316 WinMerge: DiffThread.cpp
4317 unpatch: Reverse (back out) patch [ 860072 ] Allow singlethreaded diffs
4318 WinMerge: DiffThread.cpp
4321 PATCH: [ 858283 ] Add isResultDiff() to DiffItem
4322 Fixes BUG [ 852998 ] Left Only being filtered out if not view different
4323 WinMerge: DiffContext.h DirDoc.cpp
4326 BUG: [ 833096 ] Left/right-only status overwrites skipped-status
4327 Apply fix for long result too
4328 WinMerge: DirViewColItems.cpp
4329 PATCH: [ 851586 ] Improve Patch generate dialog
4330 Also implements RFE #849890 Disable first line in patch-file
4331 WinMerge: DiffWrapper.h DiffWrapper.cpp Merge.rc PatchDlg.h PatchDlg.cpp
4332 PatchTool.cpp resource.h
4333 Languages: *.rc resource.h
4337 Docs: Planning_2_2.txt
4340 remove files UnicodeUtf8, consequence of patch #853147
4341 WinMerge: FileTransform.cpp Merge.dsp
4342 WinMerge delete: UnicodeUtf8.cpp UnicodeUtf8.h
4343 PATCH: [ 853147 ] New class for text conversion in plugins
4344 common: unicoder.cpp unicoder.h
4345 common add: multiformatText.cpp multiformatText.h
4346 WinMerge: DiffWrapper.cpp DirScan.cpp FileTransform.cpp FileTransform.h Merge.dsp MergeDoc.cpp
4347 Plugins.cpp Plugins.h SelectUnpackerDlg.cpp
4350 Add comment inside CMergeDoc::CDiffTextBuffer::SaveToFile about existing buggy code.
4351 WinMerge: MergeDoc.cpp
4354 PATCH: [ 857003 ] Move linediff messagebox text into resource
4355 WinMerge: Merge.rc MergeDocLineDiffs.cpp resource.h
4356 Languages: *.rc resource.h
4357 PATCH: [ 856974 ] More space for numbers in dir compare statuswindow
4362 BUG: [ 842812 ] Some extension filtering happening by default (fix for *.*)
4363 WinMerge: DirDoc.cpp
4364 Don't preprend a backslash to filename if there is already one (test for filter)
4365 WinMerge: DirDoc.cpp
4368 BUG: [ 836868 ] Search and replace field size limited (apply to languages)
4370 PATCH: [ 848476 ] Wrap end of file in replace dialog
4371 WinMerge: Merge.rc resource.h
4372 editlib: ccrystaleditview.cpp ccrystaltextview.h ceditreplacedlg.cpp ceditreplacedlg.h cfindtextdlg.h
4373 Languages : *.rc resource.h
4375 2003-12-03 WinMerge experimental release 2.1.5.1 (cvs)
4378 reclassing strings in resource.h in same order as in Merge.rc
4379 WinMerge: resource.h
4380 Languages: resource.h
4383 PATCH: [ 852062 ] XML/HTML file filter
4384 Filters: new file XML_html.flt
4387 Added comment giving Unicode for hanguko (Korean in Hangul alphabet)
4388 common: LanguageSelect.cpp: Korean/MergeKorean.rc
4391 PATCH: [ 847884 ] Remove obsolete registry keys
4392 WinMerge: PropRegistry.cpp PropRegistry.h
4393 InnoSetup: WinMerge.iss
4396 Rename folder1.bmp to lfolder.bmp (suggested in PATCH [ 841039 ] Green "binary.bmp")
4397 WinMerge: Merge.dsp Merge.rc
4398 Added WinMerge/res/lfolder.bmp
4399 Removed WinMerge/res/folder1.bmp
4403 Add header and RCS ID
4404 common: lwdisp.h unicoder.cpp unicoder.h FileTransform.h Plugins.h SelectUnpackerDlg.h
4407 BUG: [ 848725 ] Crash trying to generate report
4408 Fix submitted by Perry
4409 WinMerge: DirView.cpp
4412 PATCH: [ 849424 ] Fix worddiffs for whitespace
4413 Handle Sensitive to whitespace in stringdiffs.
4414 WinMerge: MergeDocLineDiffs.cpp stringdiffs.cpp
4415 PATCH: [ 842914 ] Add codepage guessing, and codepage column
4416 Optional codepage column in dirview. Code to check RC & HTML files for codepage
4417 WinMerge: DiffContext.cpp DiffContext.h DirViewColItems.cpp Merge.rc resource.h
4418 Languages: All resource.h and *.rc files.
4421 PATCH: [ 842534 ] Move copy & delete ops to submenus in dirview popup
4422 First part of patch; moved menu items into popup submenus.
4423 WinMerge: DirActions.cpp DirView.cpp DirView.h Merge.rc resource.h
4424 Languages: All resource.h and *.rc files.
4427 PATCH: [ 848955 ] Don't ask about saving after user selects 'Cancel'
4428 WinMerge: MergeDoc.cpp
4431 PATCH: [ 849138 ] Fix stringdiffs for diff in first word
4432 (Code was trying to access word#-1 when diff hit in first word)
4433 WinMerge: stringdiffs.cpp stringdiffs.h
4436 Missed one diff in PATCH: [ 847697 ] Move desc texts into doc classes
4437 WinMerge: MergeDoc.cpp
4439 2003-11-25 WinMerge experimental release 2.1.5.0 (cvs)
4442 PATCH: [ 847134 ] More commenting for DirScan (doxygenize function comments)
4443 WinMerge: DirScan.cpp DirScan.h
4444 [ 846405 ] Highlight individual word diffs in line
4445 (Enhance F4 to compute individual differences, and toggle through them in a cycle)
4446 WinMerge: Merge.dsp MergeDoc.cpp MergeDoc.h MergeDocLineDiffs.cpp
4447 stringdiffs.cpp stringdiffs.h stringdiffsi.h
4450 BUG: [ 848461 ] Toggle 'show different files' is broken (thanks to Kimmo)
4451 WinMerge: DirDoc.cpp
4454 Improvements to language names in LanguageSelect.cpp (and reference URLs), from Laurent.
4455 common: LanguageSelect.cpp
4458 PATCH: [ 847137 ] Report from dir compare results
4459 Submitted by Vikrant
4460 common: coretools.h coretools.cpp
4461 WinMerge: DirView.h DirView.cpp Merge.rc resource.h
4462 Languages: *.rc resource.h
4463 Within PATCH: [ 847137 ] - add space to New File item tooltip
4464 PATCH: [ 847137 ] Report from dir compare results
4465 Missed one diff from DirView.cpp
4466 WinMerge: DirView.cpp
4467 PATCH: [ 847697 ] Move desc texts into doc classes
4468 Fixes bug [ 847635 ] filenames after scratchpad
4469 WinMerge: DirDoc.h DirDoc.cpp MainFrm.h MainFrm.cpp MergeDoc.h MergeDoc.cpp
4472 Fix Exceptions.h for Unicode build
4473 WinMerge: Exceptions.h
4476 PATCH: [ 846237 ] Fix for the maximized/restored state (dirframe, docframe)
4477 WinMerge: ChildFrm.cpp DirFrame.cpp
4478 PATCH: [ 843124 ] Initialize COM in secondary threads
4479 WinMerge: Plugins.cpp Plugins.h
4480 BUG: [ 846622 ] rc files wrongly displayed as identical (fix : no automatic prediffing)
4481 WinMerge: FileTransform.cpp FileTransform.h MainFrm.cpp
4482 cosmetic: replace bUnpackerMode with m_bUnpackerMode
4483 WinMerge: FileTransform.cpp FileTransform.h MainFrm.cpp
4484 PATCH: [ 846523 ] error description for plugins error handler
4485 WinMerge: Merge.dsp Merge.rc Plugins.cpp
4486 WinMerge add: Exceptions.h
4489 PATCH: [ 847638 ] Unused member variables in MainFrm.h
4493 typo in TrySaveAs and merge error in DoSave
4494 WinMerge: MergeDoc.cpp
4497 PATCH: [ 842906 ] Hardcode native language names into LanguageSelection.cpp
4498 Now Merge.rc holds all ASCII language names, and non-ASCII versions (if different)
4499 are in LanguageSelection.cpp, as Unicode strings.
4501 common: LanguageSelection.cpp LanguageSelection.h
4504 PATCH: [ 820676 ] Scratchpad
4505 WinMerge: MainFrm.h MainFrm.cpp Merge.rc MergeDoc.h MergeDoc.cpp resource.h
4506 WinMerge/res: Toolbar.bmp
4507 Languages: *.rc resource.h
4508 Languages/res: Toolbar.bmp
4511 PATCH: [ 844780 ] MergeDoc code cleanup
4512 (removed AssertValid, Dump, and unused Serialize body)
4513 WinMerge: MergeDoc.cpp MergeDoc.h
4514 PATCH: [ 847126 ] Split large function in DirScan into 2 pieces
4515 WinMerge: DirScan.cpp
4516 PATCH: [ 847138 ] Initialize some variables in Plugins functions
4517 WinMerge: Plugins.cpp
4518 PATCH: [ 847149 ] Fix typo in DirScan (i->j)
4519 WinMerge: DirScan.cpp
4522 BUG: [ 846450 ] "Winmerge executable:" label missing from registry options
4525 cosmetic in Dirscan : FilterAdd -> StoreDiffResult
4526 WinMerge: DirScan.cpp
4527 SaveToFile : returned value (BOOL -> int)
4528 cosmetic changes in TrySaveAs/DoSave/OnFileSaveAsLeft/OnFileSaveAsRight
4529 WinMerge: MergeDoc.cpp MergeDoc.h
4531 2003-11-19 WinMerge beta 2.1.4.0 released
4534 BUG: [ 845196 ] UTF-8 files not correctly compared
4535 WinMerge: MergeDoc.cpp MergeDoc.h
4536 BUG: [ 845012 ] SaveToFile does not write BOM
4537 WinMerge: MergeDoc.cpp
4540 PATCH: [ 842817 ] Initialize OpenDlg extension filter to blank
4541 fix proposed by Perry
4542 WinMerge: OpenDlg.cpp
4543 BUG: [ 840759 ] Failed to load library UnpackDFM.dll
4544 fix proposed by Jochen
4548 [ 843526 ] cosmetic changes from the archives patch
4549 WinMerge: DirDoc.cpp DirDoc.h MainFrm.cpp
4552 PATCH: [ 841897 ] Bail out of LoadFromFile if see embedded zeros
4553 WinMerge: MergeDoc.cpp
4556 BUG: [ 818416 ] is stat population missing from RunFileDiff ?
4557 WinMerge: DiffWrapper.cpp
4560 BUG: [ 842746 ] Highlight diff tool button lacks tooltip
4565 PATCH: [ 838290 ] Move inf creation down in RunFileDiff (cosmetic)
4566 WinMerge: DiffWrapper.cpp
4567 PATCH: [ 841878 ] Fix wchar to char conversions at save
4568 WinMerge: MergeDoc.cpp MergeDoc.h
4569 common: unicoder.cpp unicoder.h UniFile.cpp UniFile.h
4571 2003-11-15 WinMerge experimental release 2.1.3.9 (cvs)
4574 PATCH: [ 840296 ] Informative messageboxes when loading files
4575 WinMerge: files.h MainFrm.cpp MainFrm.h Merge.rc MergeDoc.cpp resource.h
4576 Languages: *.rc resource.h
4577 PATCH: [ 841062 ] Alternative icons for PATCH [ 840273 ] (for hilight line diff)
4578 Submitted by Tim Gerundt
4582 Languages/res: Toolbar.bmp
4585 PATCH: [ 841767 ] Store unique item path
4586 Fixes bug: #840547 Copying unique file does not update date and size
4587 WinMerge: DirScan.cpp
4588 PATCH: [ 841889 ] Make long path in CConfigLog::WriteLogFile
4590 WinMerge: ConfigLog.cpp
4591 PATCH: [ 841039 ] Green "binary.bmp"?New binary item icons for dir compare)
4592 Submitted by Tim Gerundt
4593 WinMerge/res: binary.bmp binarydiff.bmp
4594 Languages/res: binary.bmp binarydiff.bmp
4597 BUG: [ 838272 ] corrupt string operations in lwdisp.c
4598 common: lwdisp.c lwdisp.h
4601 BUG: [ 841428 ] WinMerge executable path is deleted
4602 WinMerge: MainFrm.cpp PropRegistry.h
4605 PATCH: [ 838084 ] Add * to newer file's date field in dir compare
4606 WinMerge: DirView.cpp DirViewColHandler.cpp
4607 BUG: [ 840785 ] Menu: Plugins | Automatic/Manual inconsistent
4608 WinMerge: MainFrm.cpp
4609 Code cleanup: use SetDiffCompare() and SetDiffSide()
4610 (I think those functions were designed to be used instead of SetDiffStatus())
4611 WinMerge: DirActions.cpp
4612 Don't update filedata multiple times + comment changes/updates
4613 (In journey to solve BUG: 840547 Copying unique file does not update date and size
4614 WinMerge: DirActions.cpp DirDoc.cpp DirView.cpp
4615 Removing one unneeded function + code cleanups + comment changes/updates
4616 (Hunting reason for BUG: 840547 Copying unique file does not update date and size)
4617 WinMerge: DiffContext.cpp DirDoc.h DirDoc.h
4620 modify the assert in GetText/GetTextWithoutEmptys (see patch #837480)
4622 WinMerge: GhostTextBuffer.cpp
4623 editlib: ccrystaltextbuffer.cpp
4624 Merging lwdisp.c with Jochen's changes (see patch #837480)
4625 common: lwdisp.c lwdisp.h Plugins.cpp
4626 PATCH: [ 838354 ] Revisit Speedup Speed up display of large differences
4627 submitted by Hern Chen (hern_chen)
4628 WinMerge: GhostTextBuffer.cpp MergeDoc.cpp
4629 editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h
4632 avoid double message "no line difference"
4633 WinMerge: MergeDoc.cpp
4634 PATCH: [ 838530 ] Simplify GhostTextBuffer for Undo
4635 WinMerge: GhostTextBuffer.cpp GhostTextBuffer.h MergeDoc.cpp MergeDoc.h
4636 PATCH: [ 839970 ] Moving from LoadFromFile to OpenDocs all view functions
4637 WinMerge: MergeDoc.cpp
4640 PATCH: [ 838545 ] Fix osversion stuff in ConfigLog.cpp
4642 WinMerge: ConfigLog.cpp
4643 WinMerge new file: winnt_supp.h
4644 PATCH: [ 838898 ] Cleanup Registry -optionpage
4645 WinMerge: MainFrm.cpp Merge.rc PropRegistry.h PropRegistry.cpp
4649 PATCH: [ 839243 ] F4 should hilight diff in both files
4650 WinMerge: MergeDoc.cpp MergeDoc.h
4651 fix for syntax highlight in left pane view
4652 WinMerge: MergeDoc.cpp
4653 update global options dialog : 'Allow mixing EOL' -> 'preserve original EOL chars'
4654 update global options dialog : 'ignore EOL' like in 2.0
4655 WinMerge: Merge.rc PropGeneral.cpp PropGeneral.h
4657 PATCH: [ 831308 ] File filter selection text "<None>" hardcoded
4658 WinMerge: FileTransform.h Merge.cpp Merge.rc PropFilter.cpp SelectUnpackerDlg.cpp
4660 Languages : resource.h
4663 PATCH: [ 838574 ] SplitterWndEx OnHScroll
4664 common: SplitterWndEx.cpp SplitterWndEx.h
4665 fixing text alignment in dialogs (right aligned on screen->RTEXT, centered->CTEXT)
4670 PATCH: [ 835198 ] Command line path arguments handling
4671 Submitted by Hern Chen
4672 WinMerge: Merge.cpp Paths.h Paths.cpp
4675 comments for invoke helpers (see BUG[ 838275 ])
4676 WinMerge: Plugins.cpp
4680 PATCH: [ 838283 ] Simplify OnFileSave
4681 WinMerge: MergeDoc.cpp
4683 2003-11-08 WinMerge experimental release 2.1.3.8 (patch demo)
4685 2003-11-08 WinMerge experimental release 2.1.3.7 (cvs)
4688 BUG: [ 838248 ] possible typo in plugin code (cosmetic)
4689 WinMerge: Plugins.cpp
4692 PATCH: [ 836931 ] Move QueryRegMachine into RegKey
4693 common: RegKey.cpp RegKey.h
4694 WinMerge: MainFrm.cpp VssPrompt.cpp
4697 BUG: [ 837980 ] bug in save right as
4698 WinMerge: MergeDoc.cpp
4701 BUG: [ 837760 ] regression since 2.1.3.6 (diff array)
4702 WinMerge: MergeDoc.cpp
4703 PATCH: [ 836927 ] Improved platform detection in ConfigLog
4705 WinMerge: ConfigLog.cpp
4708 Updated Catalan translation (from Jordi Vilar, the translation author)
4709 Languages: Catalan/MergeCatalan.rc
4712 [ 836870 ] Scrollbar "bounces back" in diff pane.
4713 editlib: ccrystaltextview.cpp
4716 BUG: [ 836781 ] File not found: notepad.exe
4717 WinMerge: MainFrm.cpp
4718 PATCH: [ 836714 ] Separate counts of normal and trivial diffs
4719 WinMerge: MergeDoc.h MergeDoc.cpp
4720 Backout PATCH: [ 834230 ] Use PostMessage() to update dir compare status
4721 It caused bug [ 837366 ] Dir compare status panel not drawn correctly
4722 WinMerge: DiffContext.cpp
4725 BUG: [ 836868 ] Search and replace field size limited
4727 BUG: [ 836384 ] File extension wildcards does not work.
4728 WinMerge: OpenDlg.cpp
4731 Typofix: "Wiew Whitespaces" -> "View Whitespace"
4732 WinMerge: ConfigLog.cpp
4733 Update language count mentioned in readme-developers.html
4734 Docs: readme-developers.html
4737 BUG: [ 829435 ] Fix character classification routines for UNICODE
4741 Added doxygen config file. (Subsequently fixed cvs log messages.)
4745 BUG: [ 829435 ] Fix character classification routines for UNICODE
4746 WinMerge: paths.cpp stdafx.cpp
4747 editlib: cregexp.cpp
4749 2003-11-05 WinMerge experimental release 2.1.3.6 (cvs)
4752 change directory name 'Plugins' to 'MergePlugins' (see BUG [ 832090 ])
4753 WinMerge: Plugins.cpp
4756 deleted unused function files_loadLines per Laurent's suggestion
4757 (in PATCH: [ 826250 ] New UniMemFile class for memory-mapping)
4758 WinMerge: files.cpp files.h
4761 PATCH: [ 836186 ] Unicode fix for lwdisp.co
4765 PATCH: [ 831384 ] dir comparison : state bar & stop button
4766 WinMerge: DiffContext.cpp DiffContext.h DiffThread.cpp DirDoc.cpp DirFrame.cpp DirFrame.h
4767 MainFrm.cpp MainFrm.h Merge.dsp Merge.rc resource.h
4768 WinMerge(addition): DirCompStateBar.cpp DirCompStateBar.h
4769 Languages : *.rc and resource.h
4772 adapt plugins filters to the syntax of regular expressions
4773 Plugins\dlls: RCLocalizationHelper.dll
4774 Plugins\src\HideFirstLetter: WinMergeScript.cpp
4775 Plugins\src\HideLastLetter: WinMergeScript.cls
4776 Plugins\src\IgnoreTwoFirstCharsOrder: WinMergeScript.cls
4777 Plugins\src\RCLocalizationHelper: WinMergeScript.cpp
4778 fix to test plugin filter with left & right filenames (instead of just right one)
4779 WinMerge: Plugins.cpp
4780 PATCH: [ 833961 ] Swedish translation 2.1
4781 Submitted by Göran Håkansson
4782 Languages: BuildAll.bat
4783 Languages\Swedish: MergeSwedish.rc MergeSwedish_LastTranslation.rc resource.h
4784 Languages\Swedish\res : all files
4787 PATCH: [ 831052 ] Write version and configuration info
4788 WinMerge: MainFrm.h MainFrm.cpp Merge.dsp Merge.rc resource.h
4789 WinMerge new files: ConfigLog.h ConfigLog.cpp
4790 Languages: *.rc resource.h
4791 PATCH: [ 835220 ] Update default colors
4795 PATCH: [ 834122 ] Add Error Handling around calls to plug-ins
4796 WinMerge: Merge.rc MergeDoc.cpp Plugins.cpp Plugins.h files.h resource.h
4797 common: lwdisp.c lwdisp.h
4798 PATCH: [ 833188 ] clever and explicit error report in TypeLib
4802 PATCH: [ 834526 ] Check that file exist before executing in ShellExtension
4803 ShellExtension: ShellExtension.dsp WinMergeShell.h WinMergeShell.cpp
4806 BUG: (part of) [ 829435 ] Fix character classification routines for UNICODE
4807 WinMerge: MainFrm.cpp MergeDoc.cpp Paths.h Paths.cpp
4808 PATCH: [ 834230 ] Use PostMessage() to update dir compare status
4809 WinMerge: DiffContext.cpp
4812 Creation of directory Docs
4813 WinMerge(moved to Docs): readme-developers.html readme-developers-MakePatchDirs.html
4814 BUG: [ 834490 ] Ignore blank lines disabled when ignore EOL
4818 BUG: [ 833096 ] Left/right-only status overwrites skipped-status
4819 WinMerge: DirViewColItems.cpp
4820 Fix signed/unsigned clashes
4821 WinMerge: MergeDiffDetailView.cpp MergeDoc.cpp MergeEditView.cpp
4822 editlib: ccrystaltextview.cpp
4825 Remove whitespaces from begin and end of ShellExtension.dll path
4826 WinMerge: PropRegistry.cpp
4827 PATCH: [ 833681 ] Fix default editor for external editor
4828 WinMerge: MainFrm.h MainFrm.cpp
4829 Change action.code type to match DIFFITEM.code
4831 Removing unused variables
4832 WinMerge: DiffWrapper.cpp DirActions.cpp DirDoc.cpp DirScan.cpp
4833 DirViewColHandler.cpp MainFrm.cpp Merge.cpp MergeDoc.cpp
4834 BUG: [ 830258 ] Problem compiling with visual .net C++
4835 Submitted with fixes by Steve Beaudoin
4837 WinMerge: ChildFrm.cpp files.cpp
4840 fix Plugins PACK_UNPACK when nothing changes (+ update functions name)
4841 WinMerge: FileTransform.cpp Plugins.cpp Plugins.h
4844 BUG: [ 830911 ] trailing whitespaces not ignored
4846 PATCH: [ 830132 ] open empty file
4848 WinMerge: MergeDoc.cpp files.cpp
4851 Remove SillyTestCrap() from Merge.cpp
4853 Compare filename extensions as lowercase (before calling external editor)
4854 WinMerge: MainFrm.cpp
4855 Comment out GetIP() to fix compiling by including coretools.h
4856 common: coretools.h coretools.cpp
4859 change events PHYSICAL_PREPROCESS and SYNTAX_PREPROCESS to PREDIFFING
4860 WinMerge: FileTransform.cpp FileTransform.h Plugins.cpp Plugins.h
4863 PATCH: [ 830553 ] Finetune scroll to diff
4864 WinMerge: MergeEditView.h MergeEditView.cpp
4867 BUG: [ 830917 ] Rescan effects when validate changes in options
4868 WinMerge: MainFrm.cpp
4871 PATCH: [ 827332 ] detach buffer during load and rescan
4872 WinMerge: GhostTextView.cpp GhostTextView.h MergeDiffDetailView.cpp MergeDiffDetailView.h
4873 MergeDoc.cpp MergeEditView.cpp MergeEditView.h
4874 editlib: ccrystaltextview.cpp ccrystaltextview.h
4875 PATCH: [ 829895 ] Fixed German translation
4876 Submitted by Tim Gerundt
4877 Languages: MergeGerman.rc
4880 PATCH: [ 829570 ] Open patches after creation
4881 WinMerge: DirActions.cpp MainFrm.h MainFrm.cpp Merge.rc PatchDlg.c
4882 PatchDlg.cpp PatchTool.h PatchTool.cpp resource.h
4883 Languages: *.rc resource.h
4886 BUG: [ 830121 ] drag&drop changes ghost lines to real lines
4887 WinMerge: GhostTextView.cpp GhostTextView.h
4888 fix for context menu when the selection is empty
4889 WinMerge: MergeEditView.cpp
4890 fix in PopCursors for ptLastChange
4891 WinMerge: GhostTextView.cpp
4892 BUG: [ 830076 ] Context menu plugins change ghost lines to real lines
4893 WinMerge: GhostTextView.cpp GhostTextView.h MergeEditView.cpp
4894 BUG: [ 830072 ] "Unload script" does not work
4895 WinMerge: FileTransform.cpp MergeEditView.cpp
4898 Fix spelling of "delimiter" in comments.
4899 WinMerge: MainFrm.cpp
4901 2003-10-25 WinMerge experimental release 2.1.3.5 (cvs)
4904 PATCH: [ 828633 ] Abort running scan
4905 WinMerge: DiffThread.cpp DiffThread.h DirDoc.cpp DirDoc.h
4906 DirScan.cpp DirScan.h
4907 PATCH: [ 823924 ] Update about box and copyright year
4911 PATCH: [ 814832 ] Timing traces for loading file
4912 WinMerge: MergeDoc.cpp
4913 Add byte counts, and remove doubled line returns for load timing traces.
4914 WinMerge: MergeDoc.cpp
4915 common: UniMemFile.h
4916 PATCH: [ 826584 ] User-specified codepage conversions
4917 WinMerge: DiffContext.h DirView.cpp MainFrm.cpp MainFrm.h
4918 MergeDoc.cpp MergeDoc.h
4921 PATCH: [ 828283 ] Open Read-only files as such
4922 WinMerge: DirView.cpp files.h files.cpp MainFrm.cpp
4925 BUG: [ 829437 ] Can't compare two files with unicode filenames
4927 Fix typo & mistake, both in comments.
4928 common: SuperComboBox.cpp
4929 WinMerge: DirScan.cpp
4932 PATCH: [ 829266 ] commandline help
4933 WinMerge: Merge.cpp Merge.rc resource.h
4934 Languages: *.rc resource.h
4935 enabling filters in unicode build
4936 WinMerge: Dirdoc.cpp
4937 BUG: [ 829453 ] dropping file in a SuperComboBox, Unicode build
4938 common: SuperComboBox.cpp
4939 Fix unifile code to initialize txtstats.nlosses (see comments in BUG [ 828924 ])
4943 PATCH: [ 828619 ] Prevent closing dir doc whilst scanning
4944 WinMerge: DirDoc.cpp DirDoc.h
4945 PATCH: [ 829306 ] Fix unifile code to append last line
4946 WinMerge: MergeDoc.cpp
4947 Handle lib & includes for MakeResDll (& rearrange globals).
4948 Bump version from 1.0.1.0 to 1.0.2.0.
4949 MakeResDll: MakeResDll.cpp MakeResDll.rc readme.txt
4950 Handle lib & includes for .NET and .NET 2003 in MakeResDll.
4951 Fix location of RegKey.h in MakeResDll.
4952 MakeResDll: MakeResDll.cpp MakeResDll.dsp readme.txt
4953 BUG: [ 827996 ] isspace uses (-> _istspace)
4954 WinMerge: MergeDoc.cpp
4956 asp.cpp basic.cpp batch.cpp ccrystaleditview.cpp ccrystaltextview2.cpp
4957 cplusplus.cpp dcl.cpp fortran.cpp html.cpp is.cpp java.cpp lisp.cpp
4958 pascal.cpp perl.cpp php.cpp python.cpp rexx.cpp rsrc.cpp sgml.cpp
4959 sh.cpp siod.cpp sql.cpp tcl.cpp tex.cpp
4962 BUG: [ 815147 ] Scrollwheel scrolls too far at end of file
4963 editlib: ccrystaltextview.cpp
4964 BUG: [ 826834 ] Text selection startpoint not updated when navigating diffs
4965 WinMerge: MergeEditView.cpp
4968 PATCH: [ 827615 ] Speed up display of large differences - attachment
4969 Submitted by Hern Chen
4970 WinMerge: GhostTextBuffer.cpp MergeDoc.cpp MergeDoc.h
4971 editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h
4972 BUG: [ 828802 ] plugins interface problem
4973 WinMerge: Plugins.cpp
4974 recovering Czech and Slovak custom characters (they were changed to '?')
4975 Languages: Czech.rc Slovak.rc
4978 PATCH: [ 826250 ] New UniMemFile class for memory-mapping
4979 WinMerge: Merge.dsp MergeDoc.cpp
4980 common: unicoder.cpp unicoder.h UniFile.cpp UniFile.h
4983 Fix compile for MakeResDll
4984 common: coretools.cpp
4985 Ran "cvs admin -kb *.bmp *.ico" to fix incorrectly typed resources
4986 Languages: Czech/res Dutch/res French/res German/res
4987 Italian/res Spanish/res
4988 Fix MakeResDll for MSVC.NET & MSVC.NET 2003.
4989 Bump MakeResDll version from 1.0.0.1 to 1.0.1.0.
4990 MakeResDll: MakeResDll.cpp MakeResDll.rc
4991 Add readme.txt to MakeResDll.
4992 MakeResDll: MakeResDll.dsp readme.txt
4993 Fix MakeResDll to not create keys not found.
4994 MakeResDll: MakeResDll.cpp
4996 2003-10-22 WinMerge experimental release 2.1.3.4 (cvs)
4999 BUG: [ 826969 ] Wrong Open-dialog icon
5000 Load WinMerge icon to Open-dialog too
5001 WinMerge: OpenDlg.cpp
5004 Make icons and bitmaps in WinMerge\res directory cvs file type binary (cvs admin -kb)
5005 WinMerge: res\*.bmp res\*.ico
5008 BUG: [ 827064 ] Move "Window" menu after "Plugins" menu
5011 Add a backslash in front of relative path used to test for filter (as in 2.0)
5012 Undo the previous change (it disturbed the display) and make a new one
5013 WinMerge: DirScan.cpp DirDoc.cpp
5014 PATCH: [ 826048 ] headerbar improvements
5015 WinMerge: ChildFrm.cpp ChildFrm.h DirDoc.cpp DirDoc.h DirFrame.cpp DirFrame.h EditorFilepathBar.cpp
5016 EditorFilepathBar.h FilepathEdit.cpp FilepathEdit.h MergeDoc.cpp MergeDoc.h MergeEditView.cpp
5019 PATCH: [ 826149 ] Improved "Merge.ico" and "MergeDoc.ico"
5021 WinMerge/res: Merge.ico MergeDoc.ico
5022 All Languages/res: Merge.ico MergeDoc.ico
5023 PATCH: [ 824987 ] Change binary-file detection (look only for zeros)
5027 BUG: [ 826645 ] Scrolling to diff does not move cursor to diff
5028 WinMerge: MergeEditView.cpp
5029 Fix Patch Generate dialog's comboboxes to really change files
5030 WinMerge: PatchDlg.h PatchDlg.cpp
5031 PATCH: [ 809320 ] Open files with external editor
5032 WinMerge: DirActions.cpp DirView.h DirView.cpp MainFrm.h MainFrm.cpp
5033 Merge.rc PropRegistry.h PropRegistry.cpp resource.h
5034 Languages: *.rc resource.h
5037 Changing unidiff.cpp for DiffThread.cpp as doxygen example
5038 WinMerge: readme-developers.html
5039 'Comparison Summary' not updated after saving (lost in plugin patch)
5040 WinMerge: MergeDoc.cpp
5041 Format for (eol type) must set the asterisk (sign for modified file)
5042 WinMerge: MergeEditView.cpp
5044 2003-10-20 WinMerge experimental release 2.1.3.3 (patch demo)
5047 BUG: [ 826233 ] plugins or unicode bug
5048 WinMerge: UnicodeUtf8.cpp
5051 Add writeup for MakePatchDirs to readme-developers info. Add section on
5052 minor patches and bugfixes. Also make minor grammar fixes. Also update
5053 language count (to 14).
5054 WinMerge: readme-developers.html readme-developers-MakePatchDirs.html
5057 Rearranging strings in .rc (all languages) by growing identifier values
5060 Rearranging strings in English .rc
5064 Added Catalan translation (pre-plugin version)
5065 Languages: BuildAll.bat Catalan/*
5066 Update Catalan.rc for plugins (without stringtable rearrangement)
5067 Languages: Catalan/MergeCatalan.rc resource.h
5068 {Catalan} PATCH: [ 819188 ] Show column number in statusbar
5069 Languages: Catalan/MergeCatalan.rc
5070 PATCH: [ 818427 ] Fix hashing for mac lines and "ignore EOLs"
5071 WinMerge: IO.C MergeDoc.cpp UTIL.C
5072 Reapply PATCH: [ 818865 ] Exponentially grow text line array
5073 I lost it applying PATCH: [ 820364 ] Fix handling of non-ASCII 8-bit files
5074 from files.cpp cvs version 1.13 to 1.14.
5076 PATCH: [ 822451 ] unicoder.cpp update
5077 common: unicoder.cpp unicoder.h
5080 Add a backslash in front of relative path used to test for filter (as in 2.0)
5081 WinMerge: DirScan.cpp
5083 2003-10-17 Christian
5084 New readme-developers.html added
5085 PATCH: [ 825035 ] Updated German translation
5086 Languages: MergeGerman.rc
5088 2003-10-17 WinMerge experimental release 2.1.3.1 (cvs)
5091 RFE: [ 784695 ] Smarter scroll to diff
5092 WinMerge: MergeEditView.cpp
5095 fix for unicode conversion in unicode build
5096 WinMerge: UnicodeUtf8.cpp
5097 fix to delete useless temporary files
5098 WinMerge: FileTransform.cpp
5099 PATCH: [ 807263 ] Preprocessing patch
5100 common: dllproxy.c dllproxy.h lwdisp.c lwdisp.h
5101 Languages: resource.h *.rc
5102 WinMerge: DiffThread.cpp DiffWrapper.cpp DiffWrapper.h DirScan.cpp DirView.cpp DirView.h FileFilterMgr.cpp
5103 FileFilterMgr.h MainFrm.cpp MainFrm.h Merge.cpp Merge.dsp Merge.h Merge.rc MergeDoc.cpp MergeDoc.h
5104 MergeEditView.cpp OpenDlg.cpp OpenDlg.h resource.h
5105 WinMerge Add: FileTransform.cpp FileTransform.h Plugins.cpp Plugins.h SelectUnpackerDlg.cpp
5106 SelectUnpackerDlg.h UnicodeUtf8.cpp UnicodeUtf8.h
5107 WinMerge Remove: unidiff.cpp unidiff.h
5108 PATCH: [ 823556 ] CF_UNICODETEXT format for OLE in unicode build
5109 WinMerge: FilepathEdit.cpp StdAfx.cpp StdAfx.h
5110 editlib: ccrystaleditview.cpp ccrystaltextview2.cpp
5111 PATCH: [ 823074 ] DiffContext not updated
5112 WinMerge: DirDoc.cpp
5115 Get first selected file from directory compare to
5116 Patch Generate dialog
5117 WinMerge: MainFrm.cpp
5118 BUG: [ 813557 ] Selection not visible after find
5119 editlib: cfindtextdlg.cpp
5120 Fix bug: Commandline params for diff were missing from
5121 generated patch-file in unicode build. (Missing conversion)
5122 WinMerge: DiffWrapper.cpp
5125 PATCH: [ 823382 ] Save As should update filename
5126 WinMerge: MergeDoc.h MergeDoc.cpp
5127 BUG: [ 823099 ] RO status not fully implemented when lossy conversions
5128 WinMerge: ChildFrm.cpp
5129 Removed unneeded unlocalisable string from SelectFile() ("Directory selection")
5131 Use SelectFile() from Merge.cpp in Patch Generate dialog
5132 also fixes bug Result-file asked with "Open" dialog
5133 WinMerge: PatchDlg.h PatchDlg.cpp
5134 Use ComboBox with history in Patch Generate -dialog
5135 WinMerge: Merge.rc PatchDlg.h PatchDlg.cpp
5137 Fix bug: File timestamps wrong in patch files
5138 WinMerge: DiffWrapper.cpp
5141 PATCH: [ 819123 ] Half-wait cursor during rescan (new try)
5142 WinMerge: DirDoc.cpp DirDoc.h MainFrm.cpp MainFrm.h WaitStatusCursor.cpp WaitStatusCursor.h
5143 BUG: correcting memory allocation for Unicode build in FilepathEdit.cpp
5144 editlib: FilepathEdit.cpp
5145 BUG: [ 822844 ] Drag & Drop crashes on Unicode build (correcting memory allocation)
5146 editlib: ccrystaltextview.cpp
5149 PATCH: [ 821821 ] Merge multiple diffs
5150 WinMerge: Merge.rc MergeDoc.cpp MergeDoc.h MergeEditView.cpp MergeEditView.h resource.h
5151 editlib: ccrystaltextview.cpp ccrystaltextview.h
5154 PATCH: [ 797502 ] Bugfix and new options for SourceSafe
5155 Submitted by Marvin Gouw
5156 WinMerge: DirActions.cpp MainFrm.h MainFrm.cpp Merge.rc resource.h
5157 VssPrompt.h VssPrompt.cpp
5158 Languages: resource.h *.rc
5161 PATCH: [ 817079 ] New Copy to Left/Right icons
5162 WinMerge/res: Toolbar.bmp
5163 Languages/res: Toolbar.bmp
5165 2003-10-11 WinMerge experimental release 2.1.3.0 (cvs)
5168 PATCH: [ 821532 ] Fix CmpResults After Delete
5169 WinMerge: DiffContext.h DirActions.cpp
5170 PATCH: [ 817875 ] Resizable open dialog
5171 common: CSubclass.h CMoveConstraint.h CSubclass.cpp CMoveConstraint.cpp
5172 Languages: UpdateAll_resource_h.bat *.rc
5173 WinMerge: Merge.rc OpenDlg.cpp OpenDlg.h resource.h
5176 PATCH: [ 820742 ] use extension filter during Rescan in 2.1
5177 DiffContext.cpp DiffContext.h DirDoc.cpp DirDoc.h DirScan.cpp MainFrm.cpp
5180 PATCH: [ 791487 ] Norwegian (bokmål) translation
5181 (Enlarge label in color dialog to avoid clipping text.)
5182 Languages: MergeNorwegian.rc
5183 PATCH: [ 820364 ] Fix handling of non-ASCII 8-bit files
5184 common: unicoder.cpp unicoder.h
5186 PATCH: [ 821431 ] Update SideFlag When Copy file
5187 WinMerge: DirActions.cpp
5190 cosmetic change because I want to use BeSweet with source (delete one space !)
5191 editlib: ccrystaleditview.cpp
5192 PATCH: [ 818198 ] Colors for "ignore blank lines"
5193 Languages: *.rc (except not Brazilian or ChineseSimplified)
5196 PATCH: [ 818865 ] Exponentially grow text line array
5200 PATCH: [ 819219 ] Show only simple EOL char when no mixing EOL modes allowed
5201 WinMerge: MainFrm.cpp MainFrm.h MergeDoc.cpp ccrystaltextview.cpp ccrystaltextview.h
5204 Fix duplicate copy of IDS_LINE_STATUS_INFO (to IDS_LINE_STATUS_INFO_EOL) in most
5205 language files. Fix missing id ID_POPUP_COPYFROMOTHERSIDE in German file
5206 Languages: *.rc (except not Brazilian or ChineseSimplified)
5209 BUG: [ 819793 ] Assert when saving after a Dirdoc session
5210 WinMerge: DirDoc.cpp
5211 PATCH: [ 818198 ] Colors for "ignore blank lines"
5212 WinMerge: MainFrm.cpp Merge.cpp Merge.h Merge.rc MergeDoc.cpp MergeEditView.cpp PropColors.cpp
5213 PropColors.h resource.h
5216 PATCH: [ 819188 ] Show column number in statusbar
5217 WinMerge: ChildFrm.h ChildFrm.cpp Merge.rc MergeEditStatus.h MergeEditView.cpp
5221 PATCH: [ 817502 ] Fix "ignore blank lines"
5222 WinMerge: analyze.c Diff.cpp DIFF.H DiffWrapper.cpp DiffWrapper.h
5223 MergeDiffDetailView.cpp MergeDoc.cpp MergeEditView.cpp MergeEditView.h
5225 PATCH: [ 806277 ] Patch output fix (803299) alternate approach
5227 PATCH: 819633 Fix bug in my "fix ignore blank lines" patch
5231 BUG: [ 803330 ] DirView updated too many times after compare
5232 WinMerge: DiffThread.cpp DirDoc.h DirDoc.cpp
5233 RFE: [ 817859 ] Generate patch from modified files
5234 WinMerge: MainFrm.cpp
5235 Fix Refresh-crash I introduced when fixing BUG [ 803330 ]
5236 WinMerge: DirDoc.cpp
5237 Properly clear display before new dir compare (don't use Redisplay())
5238 WinMerge: DirDoc.cpp
5241 Show text "Identical" on diffnumber panel when files are identical
5244 BUG: [ 817766 ] Dir compare speed drop after 2.0
5245 WinMerge: DiffContext.cpp
5248 PATCH: [ 817269 ] Fix navigation in directory compare
5249 WinMerge: DirView.cpp
5250 PATCH: [ 817394 ] Implement Copy diff and advance to next
5251 WinMerge: Merge.rc MergeEditView.h MergeEditView.cpp resource.h
5252 WinMerge/res: Toolbar.bmp
5253 Languages: resource.h *.rc
5254 Languages/res: Toolbar.bmp
5257 Update dll copy batch file for 4 new build targets
5258 Languages/CopyAll.bat
5261 Undo last changes related to PATCH: [ 813794 ] Fix "ignore blank lines"
5262 Back as of 2003-10-02 23:59
5265 Restore trivial colors originally included in PATCH: [ 813794 ] Fix "ignore blank lines"
5266 WinMerge: MainFrm.cpp Merge.h MergeEditView.cpp PropColors.h
5269 Bugfix for PATCH: [ 813794 ] Fix "ignore blank lines"
5270 (Prevent crashes on identical files dereferencing null script).
5274 two minor changes for PATCH: [ 813794 ] Fix "ignore blank lines"
5275 WinMerge: MergeDiffDetailView.cpp MergeDoc.cpp
5278 PATCH: [ 813794 ] Fix "ignore blank lines"
5279 WinMerge: analyze.c ColorButton.h Diff.cpp DIFF.H DiffWrapper.cpp
5280 DiffWrapper.h MainFrm.cpp Merge.cpp Merge.h MergeDiffDetailView.cpp
5281 MergeDoc.cpp MergeEditView.cpp MergeEditView.h PropColors.cpp
5285 PATCH: [ 815138 ] Commandline filedescriptors
5286 Usage: -dl "description" for left and -dr "description" for right
5287 WinMerge: MainFrm.h Merge.h Merge.cpp MergeDoc.cpp
5290 PATCH: [ 815483 ] Fix file stat structure (lost in dirscan patch)
5291 WinMerge: Diff.cpp DirScan.cpp
5292 PATCH: [ 815523 ] Fix utf8len_of_string
5293 common: unicoder.cpp
5296 PATCH: [ 814829 ] Fix handle bad utf8
5298 PATCH: [ 813847 ] Fix Unicode double copy
5299 WinMerge: MergeDoc.cpp
5302 PATCH: [ 814830 ] Prevent rescan of scanning dirdoc
5304 WinMerge: DirDoc.cpp
5305 PATCH: [ 812581 ] Prevent second scan during first scan
5307 WinMerge: MainFrm.cpp
5310 PATCH: [ 814098 ] More edit-events for delayed rescan
5311 WinMerge: MergeEditView.cpp
5314 BUG In DrawSingleLine, Draw EOL only if there is an EOL in the line
5315 WinMerge: ccrystaltextview.cpp ccrystaltextview.h
5316 BUG [ 814214 ] ASSERT failure with diff at eof
5320 delete NDEBUG from ReleaseMinsize preprocessor definitions
5324 PATCH: [ 809149 ] Handle Unicode files
5325 common: unicoder.cpp unicoder.h
5326 WinMerge: DiffContext.cpp DiffContext.h DirScan.cpp FileFilterMgr.cpp files.cpp
5327 files.h GhostTextBuffer.cpp GhostTextBuffer.cpp.bak GhostTextBuffer.h Merge.dsp
5328 MergeDoc.cpp MergeDoc.h unidiff.cpp unidiff.h
5329 WinMerge/editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h ccrystaltextview2.cpp
5332 PATCH: [ 811039 ] Identify filters by path to solve problems with reused names
5333 common: coretools.cpp coretools.h
5334 WinMerge: FileFilterMgr.cpp FileFilterMgr.h MainFrm.cpp Merge.cpp Merge.h
5335 PropFilter.cpp PropFilter.h
5337 2003-09-26 WinMerge beta 2.1.2.0 released
5339 2003-09-26 WinMerge experimental release 2.1.1.9 (Unicode handling patch)
5342 PATCH: [ 812820 ] Fix regexp for Unicode
5343 common: RegExp.cpp RegExp.h
5344 PATCH: [ 812851 ] Another Unicode fix for PutToClipboard
5345 WinMerge/editlib/ccrystaltextview2.cpp
5346 Fix GetFromClipboard for Unicode (variation on PATCH: [ 812853 ])
5347 WinMerge/editlib/ccrystaltextview2.cpp
5350 PATCH: [ 811371 ] Replace lines when pasting text to ghost lines
5351 WinMerge: GhostTextBuffer.cpp GhostTextBuffer.h
5352 editlib: ccrystaltextbuffer.cpp
5355 fix BUG: [ 812547 ] copy to clipboard crash in WinMergeU.exe
5356 WinMerge/editlib: ccrystaltextview2.cpp
5359 PATCH: [ 811307 ] Open dirview column dialog from menu
5360 WinMerge: DirView.h DirView.cpp Merge.rc resource.h
5361 Languages: resource.h *.rc
5364 fix BUG: [ 811750 ] typo in DirScan.cpp
5365 WinMerge: DirScan.cpp
5366 fix BUG: [ 811747 ] VersionInfo clipping in Unicode ?
5370 BUG: [ 811748 ] Brazilian RC compile failure
5371 Languages/Brasilian: MergeBrasilian.rc
5372 Patch Generate improvements and fixes
5373 WinMerge: DiffWrapper.cpp PatchDlg.h PatchDlg.cpp PatchTool.h
5377 Don't show [0 files selected] in Patch Generate -dialog
5378 WinMerge: PatchDlg.cpp
5381 PATCH: [ 810998 ] Unicode fix for ghosttextbuffer
5382 WinMerge: GhostTextBuffer.cpp
5385 PATCH: [ 809902 ] Show if file is changed
5386 WinMerge: MergeDoc.h MergeDoc.cpp MergeEditView.cpp
5387 PATCH: [ 810066 ] Add Save Left (as...) and Save Right (as...)
5388 WinMerge: Merge.rc MergeDoc.h MergeDoc.cpp MergeEditView.h
5389 MergeEditView.cpp resource.h
5390 Languages: resource.h *.rc
5393 BUG: [ 807766 ] File filter rules not applied to unique items (2.1)
5394 WinMerge: DirScan.cpp
5395 Optimise CFilePathEdit to not change text when same text given again
5396 By Laoran (PATCH "#809902 Show if file is changed" comments)
5397 WinMerge: FilePathEdit.cpp
5398 Remove unused function GetPathOnly() from DirDoc.cpp -
5399 its really defined in coretools.cpp and
5400 WinMerge: DirDoc.cpp
5402 2003-09-20 WinMerge experimental release 2.1.1.7 (Unicode handling patch)
5405 Make directory compare Window to remember maximized state
5406 WinMerge: DirFrame.h DirFrame.cpp
5409 Actualizing the GnuC filter *.o -> \.o
5410 filter: Merge_GnuC_loose.flt
5413 PATCH: [ 809253 ] New release minsize mode
5415 Modifications in patch-dialog to compile in Unicode
5416 WinMerge: PatchDlg.cpp
5419 Select compared files when opening Generate patch-dialog
5420 WinMerge: MainFrm.cpp PatchDlg.cpp
5423 PATCH: [ 803904 ] Create patches
5424 WinMerge: DiffWrapper.h DiffWrapper.cpp MainFrm.h MainFrm.cpp Merge.dsp
5425 Merge.rc resource.h util.cpp
5426 WinMerge new files: PatchDlg.h PatchDlg.cpp PatchTool.h PatchTool.cpp
5427 Languages: *.rc resource.h
5428 BUG: [ 800256 ] Hilight line diff does not scroll to difference
5429 WinMerge: MergeDoc.cpp
5431 2003-09-17 WinMerge experimental release 2.1.1.6 (Preprocessing patch)
5434 fix BUG: [ 807420 ] assert when saving a modified doc
5435 WinMerge: DiffContext.cpp
5438 BUG: [ 807402 ] ListCopy problem for Unix Files
5439 WinMerge: MergeDoc.cpp
5442 PATCH: [ 781013 ] 256 Color icon
5443 Applying to languages
5444 Languages/res: Merge.ico
5445 PATCH: [ 806785 ] Add menuitem to show/hide skipped files
5446 WinMerge: MainFrm.h MainFrm.cpp Merge.rc resource.h
5447 Languages: *.rc resource.h
5450 BUG: [ 806552 ] DirView icons missing?
5451 Adding icons for skipped files and folders
5452 WinMerge: DirView.cpp Merge.rc resource.h
5453 WinMerge/res: new files fileskip.bmp folderskip.bmp
5454 Languages: resource.h *.rc new files /res fileskip.bmp folderskip.bmp
5455 Don't color skipped items filenames in directory compare
5456 WinMerge: DirView.cpp
5457 PATCH: [ 804493 ] Read filter files from users profile directory
5458 NOTE: Filters are read from %profiledir%/Application Data/WinMerge/Filters
5459 common: coretools.h coretools.cpp
5460 WinMerge: FileFilterMgr.cpp Merge.cpp
5463 PATCH: [ 805875 ] Switch to diffcode flags
5464 WinMerge: DiffContext.cpp DiffContext.h DirActions.cpp DirDoc.cpp DirDoc.h
5465 DirScan.cpp DirView.cpp DirView.h DirViewColHandler.cpp DirViewColItems.cpp
5466 MainFrm.cpp MainFrm.h
5467 PATCH: [ 805427 ] Delete unused CStdioFile variable in PrimeTextBuffers
5468 WinMerge: MergeDoc.cpp
5469 PATCH: [ 805888 ] Unicode compile of WinMerge
5470 common: coretools.cpp dllproxy.c LanguageSelect.cpp LanguageSelect.h
5471 LogFile.cpp lwdisp.c lwdisp.h RegExp.cpp RegExp.h StatLink.cpp
5472 SuperComboBox.cpp SuperComboBox.h
5473 WinMerge: ChildFrm.cpp Diff.cpp DiffWrapper.cpp DirDoc.cpp DIRENT.C DirFrame.cpp
5474 DirView.cpp DirViewColHandler.cpp EditorFilepathBar.cpp FilepathEdit.cpp
5475 MainFrm.cpp MainFrm.h Merge.cpp Merge.dsp MergeDoc.cpp MergeEditView.cpp
5476 OpenDlg.cpp paths.cpp PropColors.cpp
5479 Widen label IDC_PRIVATEBUILD on about box.
5482 PATCH: [ 802120 ] Fix for VC.NET
5483 WinMerge: DiffContext.cpp DiffContext.h DirScan.cpp DirView.cpp
5484 DirView.h DirViewColItems.cpp EditorFilepathBar.cpp MainFrm.cpp
5485 MainFrm.h MergeEditView.cpp
5486 editlib: ccrystaleditview.cpp ccrystaleditview.h
5488 2003-09-13 WinMerge experimental release 2.1.1.5 (patch demos)
5489 2003-09-13 WinMerge experimental release 2.1.1.4 (cvs)
5492 effects of patch [ 797821 ]
5493 WinMerge: Merge.rc resource.h
5494 Languages: resource.h *.rc
5497 PATCH: [ 804408 ] Fixes to help compile release version
5499 PATCH: [ 797821 ] GUI for the file EOL option
5500 WinMerge: ChildFrm.cpp GhostTextBuffer.cpp MainFrm.cpp MainFrm.h Merge.rc MergeDoc.cpp
5501 MergeDoc.h MergeEditView.cpp MergeEditView.h PropGeneral.cpp PropGeneral.h resource.h
5502 editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h
5505 PATCH: [ 802762 ] Optimise printc() in diffutils
5509 FIX ASSERT in GetAllViews during a merge session
5510 WinMerge: MainFrm.cpp MainFrm.h
5513 PATCH: [ 799633 ] context menu with scriptlet, from Jochen Tucht
5514 WinMerge: Merge.dsp MergeEditView.cpp MergeEditView.h
5515 common new files: dllproxy.c dllproxy.h lwdisp.c lwdisp.h
5516 PATCH: [ 802373 ] undo/redo/onEditOperation when RO (2.1)
5517 WinMerge: MergeEditView.cpp
5518 PATCH: [ 802359 ] display in diff pane when no diff (2.1)
5519 WinMerge: MergeDiffDetailView.cpp
5522 PATCH: [ 802096 ] Fix diff navigation when first/last diff selected
5523 WinMerge: MergeEditView.cpp
5526 PATCH: [ 802066 ] diff pane when OnDisplayDiff(-1) (2.1)
5527 WinMerge: MergeDiffDetailView.cpp
5530 PATCH: [ 802132 ] Resort dir columns after redisplay
5531 WinMerge: DirView.h DirView.cpp DirDoc.cpp
5532 Fix bug [ 798404 ] Reordering dirview columns does not preserve sorting column
5533 WinMerge: DirView.cpp
5536 PATCH: [ 799464 ] preserve positions during Rescan (2.1)
5537 WinMerge: GhostTextBuffer.cpp GhostTextView.cpp GhostTextView.h MergeDoc.cpp
5538 editlib: ccrystaleditview.cpp ccrystaleditview.h ccrystaltextbuffer.cpp ccrystaltextbuffer.h
5539 ccrystaltextview.cpp ccrystaltextview.h
5542 BUG: [ 802063 ] files_analyzeFile bug for UNIX file (2.1)
5545 2003-09-07 WinMerge experimental release 2.1.1.3 (cvs)
5548 PATCH: [ 800420 ] Fix recursive compare and cleanup recursive usage
5549 WinMerge: DiffThread.h DiffThread.cpp DirDoc.h DirDoc.cpp MainFrm.cpp
5550 Use constant values for whitespace compare setting
5551 WinMerge: DiffWrapper.h DiffWrapper.cpp
5552 Change default diff colors to more eye friendly ones (not so bright ones)
5554 Tweak more yellow diff color
5558 PATCH: [ 795082 ] Display Private Build version in about box
5559 WinMerge: Merge.cpp Merge.rc resource.h
5560 Languages: resource.h *.rc
5563 PATCH: [ 793900 ] Editable file filters
5565 WinMerge: FileFilterMgr.h FileFilterMgr.cpp Merge.h Merge.cpp Merge.rc
5566 PropFilter.h PropFilter.cpp Resource.h
5567 Languages: resource.h *.rc
5570 PATCH: [ 800175 ] skip custom draw if comctl32.dll < 4.71
5571 WinMerge: DirView.cpp
5573 2003-09-07 WinMerge experimental release 2.1.1.2 (cvs)
5576 PATCH: [ 797957 ] correct line number for last real line (in statusbar)
5577 WinMerge: MergeEditView.cpp
5580 PATCH: [ 798272 ] save settings for the dockable diff bar
5581 WinMerge: ChildFrm.cpp ChildFrm.h MainFrm.cpp
5584 Improve 256-color icon
5585 WinMerge/res: Merge.ico
5588 correction for the patch [797741] in CMergeDoc::CDiffTextBuffer::LoadFromFile
5589 WinMerge: MergeDoc.cpp
5592 PATCH: [ 797741 ] Faster file loading
5593 WinMerge: files.h files.cpp MergeDoc.h MergeDoc.cpp
5594 PATCH: [ 784302 ] Implement Read-only for files and dirs
5596 WinMerge: ChildFrm.cpp DirFrame.cpp DirView.h DirView.cpp Merge.rc
5597 MergeEditView.h MergeEditView.cpp Resource.h
5598 Languages: resource.h *.rc
5599 Fix ASSERT when opening files for merging.
5600 Submitted by laoran (PATCH [ 784302 ] comments)
5601 WinMerge: ChildFrm.cpp
5604 PATCH: [ 797797 ] OnOptions must exchange diffOptions with the registry
5605 Submitted by Laoran.
5606 WinMerge: MainFrm.cpp
5609 PATCH: [ 784109 ] layout with two new horizontal panels
5610 common new files: sizecbar.cpp sizecbar.h sizecbarg.cpp sizecbarg.h
5611 common: SplitterWndEx.cpp SplitterWndEx.h
5612 WinMerge: ChildFrm.cpp ChildFrm.h MainFrm.cpp Merge.dsp Merge.rc MergeDoc.cpp
5613 MergeDoc.h MergeEditView.cpp resource.h
5614 Winmerge new files: DiffViewBar.cpp DiffViewBar.h MergeDiffDetailView.cpp MergeDiffDetailView.h
5615 editlib: ccrystaltextview.h
5618 PATCH: [ 779818 ] Fix number display to be locale & user-pref aware
5619 (extended to handle larger numbers than 32 bit, for size)
5620 WinMerge: DirView.cpp DirViewColItems.cpp locality.cpp locality.h Merge.dsp
5623 PATCH: [ 796756 ] Diff API
5624 WinMerge: DiffWrapper.h DiffWrapper.cpp DirDoc.h DirDoc.cpp DirView.cpp
5625 MainFrm.h MainFrm.cpp MergeDoc.h MergeDoc.cpp
5628 PATCH: [ 794345 ] make visible the changed text when undo/redo
5629 WinMerge: MergeEditView.cpp
5632 i18n effects of patch#781529: new popup menu, new dialog, alter existing col header strings
5633 Languages: Czech, Danish, Dutch
5634 i18n effects of patch#781529: new popup menu, new dialog, alter existing col header strings
5635 Languages: French, German, Italian, Korean, Norwegian, Slovak, Spanish
5638 PATCH: [ 784302 ] Implement Read-only for files and dirs
5639 Only background changes, no UI changes
5640 WinMerge: DirDoc.h DirDoc.cpp DirView.cpp MainFrm.h MainFrm.cpp
5641 MergeDoc.h MergeDoc.cpp MergeEditView.h MergeEditView.cpp
5644 Add new colhdrs from patch#781529 to Brazilian.
5645 Reorder ChineseSimplified string tables to match English, and add missing entries.
5646 Reorder ChineseTraditional string tables to match English, and add missing entries.
5647 Languages: Brazilian, ChineseSimplified, ChineseTraditional
5650 Implement fix for BUG#794514: 'Comparison Summary' not updated properly
5651 WinMerge: DirDoc.cpp
5652 i18n effects of patch#781529: new popup menu, new dialog, alter existing col header strings
5653 Languages: Brazilian, ChineseSimplified, ChineseTraditional
5656 [ 783507 ] normalize replaceSelection and ListCopy
5657 WinMerge: GhostTextBuffer.cpp GhostTextBuffer.h MergeDoc.cpp MergeDoc.h
5658 editlib : ccrystaleditview.cpp ccrystaltextbuffer.cpp ccrystaltextbuffer.h
5661 [ 794081 ] Error when dropping a column out of WinMerge
5662 WinMerge: DirView.cpp
5665 Fix paths_GetLongPath to handle trailing . or ..
5666 (BUGFIX: [ 792074 ] Directory mnemonics . and .. are not honored properly)
5668 Fix DIFFITEM::getLeftFilepath & DIFFITEM::getRightFilepath
5669 (BUGFIX: [ 794319 ] Assert when save after merging)
5670 WinMerge: DiffContext.cpp
5673 PATCH: [ 792668 ] Move file load code to CMergeDoc
5674 WinMerge: MainFrm.cpp MergeDoc.h MergeDoc.cpp
5677 PATCH: [ 791487 ] Norwegian (bokmål) translation
5678 Corrections#2 Avbrytt->Avbryt and #3 Opdater->Oppdater
5679 Languages\Norwegian: MergeNorwegian.rc
5680 Correction#0 Bokmal->Bokmål
5682 Correction#1 værktøylinje(n)->verktøylinje(n)
5683 Languages\Norwegian: MergeNorwegian.rc
5684 PATCH: [ 781529 ] Make column info array, and add new columns
5685 common: version.cpp version.h
5686 WinMerge: DiffContext.cpp DiffContext.h DirActions.cpp DirDoc.cpp DirDoc.h
5687 DirScan.cpp DirView.cpp DirView.h MainFrm.cpp Merge.dsp Merge.rc
5688 MergeDoc.cpp resource.h
5689 WinMerge new files: DirColsDlg.cpp DirColsDlg.h DirViewColHandler.cpp
5690 DirViewColItems.cpp DirViewColItems.h
5691 Bugfix: CDiffContext::AddDiff was not setting diff context subdir from argument.
5692 WinMerge:: DiffContext.cpp
5693 Bugfix: Don't prefix subdirectories with dot in ColPathGet.
5694 WinMerge: DirViewColItems.cpp
5695 Bugfix: FILE_SKIP & DIR_SKIP are being labelled as errors
5696 WinMerge: DirViewColItems.cpp Merge.rc resource.h
5697 Bugfix: Fix CDirView::GetItemFileNames to get path properly (as before 2003-08-07).
5698 WinMerge: DirActions.cpp
5699 Bugfix: Remove several memsets of structures whose size varies with common control versions
5700 WinMerge: DirView.cpp DirViewColHandler.cpp
5703 PATCH: [ 787495 ] Create diffutils class (CDiffWrapper)
5704 WinMerge: Merge.dsp MergeDoc.h MergeDoc.cpp
5705 Added: DiffWrapper.h DiffWrapper.cpp
5706 Adding licence text and comments
5707 WinMerge: files.h files.cpp
5708 Adding licence text and comments
5709 WinMerge: DiffThread.h DiffThread.cpp DiffWrapper.h
5712 PATCH: [ 791924 ] Fix sorting when columns are reordered
5713 WinMerge: DirView.cpp
5714 Fix color dialog in Norwegian (Earlier today I forgot to move down the previous labels).
5715 Languages\Norwegian: Norwegian/MergeNorwegian.rc
5716 Updated color property page in Korean (patch#768740).
5717 Languages\Korean: MergeKorean.rc
5720 PATCH: [ 791263 ] Remove CStringEx from OpenDlg (and from WinMerge?)
5721 WinMerge: Merge.dsp OpenDlg.cpp
5722 Common: removed StringEx.h StringEx.cpp
5725 Added Norwegian to batch build file
5726 Languages: BuildAll.bat
5727 Updated two property pages in Norwegian
5728 IDD_PROPPAGE_REGISTRY (patch#789504) and IDD_PROPPAGE_COLORS (patch#768740).
5729 Languages\Norwegian: resource.h Norwegian/MergeNorwegian.rc
5730 Updated color property page in Brazilian (patch#768740).
5731 Languages\Brazilian: MergeBrazilian.rc
5732 Updated color property page in Simplified Chinese (patch#768740 not quite complete).
5733 Languages\ChineseSimplified: MergeChineseSimplified.rc
5734 Updated color property page in ChineseTraditional (patch#768740).
5735 Languages\ChineseTraditional: MergeChineseTraditional.rc
5737 2003-08-20 Christian
5738 PATCH: [ 791487 ] Norwegian (bokmål) translation
5739 Languages: Norwegian added
5741 2003-08-19 WinMerge beta 2.1.0.1 released
5744 Change versions in Merge.rc to "000.000.000.000" as recommended by stampver
5745 (http://www.elphin.com/products/stampver.html).
5749 Updated comments for ShellExtension: added comment about used registry values etc
5751 ShellExtension.cpp WinMergeShell.h WinMergeShell.cpp
5752 Removed two generated files from CVS (Christian spotted those)
5754 ShellExtension.h DllData.cp
5757 PATCH: [ 789204 ] Color dir compare based on left/right newer
5758 WinMerge: DirView.h DirView.cpp
5759 PATCH: [ 789504 ] Remove unneeded old dir shell assoc
5760 WinMerge: Merge.rc PropRegistry.h PropRegistry.cpp resource.h
5761 Languages: resource.h *.rc
5763 2003-08-12 Christian
5764 PATCH: [ 786618 ] Brazilian Portuguese translation
5765 Languages: BuilAll.bat and resurrected directory Brazilian
5766 PATCH: [ 782820 ] Updated Traditional Chinese for 2.0
5767 Languages\ChineseTraditional: MergeChineseTraditional.rc
5768 PATCH: [ 782824 ] Add languages to installer
5769 InnoSetup: WinMerge.iss Info.txt
5772 PATCH: [ 785288 ] Overwrite Read-Only file
5773 WinMerge: MainFrm.h MainFrm.cpp Merge.rc MergeDoc.cpp
5777 PATCH: [ 781013 ] 256 Color icon
5778 editlib/res: Merge.ico
5779 PATCH: [ 783593 ] Add Merge-menu
5784 Fix GetItemFileNames to not pull its data from listview (b/c columns may be reordered).
5785 (Various const fixes needed.)
5786 WinMerge: DiffContext.cpp DiffContext.h DirActions.cpp DirView.cpp DirView.h
5789 PATCH: [ 781582 ] Timer for FlushAndRescan
5790 WinMerge: MergeDoc.cpp MergeDoc.h MergeEditView.cpp MergeEditView.h
5793 PATCH: [ 782866 ] round off in CMergeDoc::RescanIfNeeded
5794 WinMerge: MergeDoc.cpp
5797 PATCH: [ 780359 ] Open identical files
5798 WinMerge: DirView.cpp MainFrm.cpp
5800 2003-08-03 WinMerge release 2.0
5803 PATCH: [ 780827 ] Tooltips for DirView
5805 WinMerge: DirView.cpp DirView.h
5808 PATCH: [ 780508 ] Convert Line Length array to CArray
5809 WinMerge: ccrystaltextview.cpp ccrystaltextview.h
5812 PATCH: [ 780067 ] SUndoRecord::SetText must free previous text
5813 WinMerge: ccrystaltextbuffer.cpp ccrystaltextbuffer.h
5816 PATCH: [ 779470 ] disable unwanted options in PropGeneral
5817 WinMerge: PropGeneral.cpp PropGeneral.h
5820 PATCH: [ 777871 ] New headerbar for the file paths
5821 WinMerge: ChildFrm.cpp ChildFrm.h dllver.cpp dllver.h Merge.dsp Merge.rc resource.h
5822 WinMerge new files : EditorFilepathBar.cpp EditorFilepathBar.h FilepathEdit.cpp FilepathEdit.h
5825 PATCH: [ 778379 ] Drag&drop reordering columns
5826 WinMerge: DirDoc.cpp DirView.cpp DirView.h Merge.dsp dllver.cpp dllver.h
5827 Annotate UpdateResources methods
5828 WinMerge: DirDoc.cpp MainFrm.cpp MergeEditView.cpp
5831 PATCH: [ 779224 ] Fix sort bug in right date
5832 WinMerge: DirView.cpp
5833 bugfix for PATCH: [ 765225]
5834 editlib: ccrystaltextview.cpp ccrystaltextview.h
5837 PATCH: [ 779172 ] Saving fix for 2.0 and 2.1
5838 WinMerge: MergeDoc.cpp
5839 PATCH: [ 779005 ] No temp files when saving local temp files
5840 WinMerge: MergeDoc.cpp
5841 Fix Register.bat comments. Batch files use ":" for comments...
5842 ShellExtension: Register.bat
5845 Some fixes to MergeChineseTraditional.rc from Koko
5846 Languages\ChineseTraditional\MergeChineseTraditional.rc
5849 PATCH: [ 778234 ] Fix DirScan ASSERT when run out of right list
5850 WinMerge: DirScan.cpp
5851 PATCH: [ 765225 ] Convert parse cookie array to be CArray
5852 editlib: ccrystaltextview.cpp ccrystaltextview.h
5855 PATCH: [ 778144 ] Use CopyFile instead of DeleteFile() and MoveFile()
5856 WinMerge: MainFrm.cpp
5857 PATCH: [ 778384 ] Sync OnDropFiles() from MainFrame to SuperComboBox
5858 common: SuperComboBox.cpp
5859 PATCH: [ 778403 ] Fix accel keys in lang files
5860 Languages: ChineseSimplified, ChineseTraditional
5863 PATCH: [ 778290 ] Typo in comment
5864 WinMerge: MergeDoc.cpp
5867 BUG: [ 778166 ] Shell integration missing quotes (2.1)
5868 ShellExtension: WinMergeShell.cpp
5871 [ 776114 ] french keyboard shortcut
5872 Languages: french.rc
5875 PATCH: [ 773296 ] Add shell integration
5876 Added new module ShellExtension
5877 WinMerge: Merge.rc PropRegistry.h PropRegistry.cpp resource.h
5878 Languages: all *.rc and resource.h files
5881 PATCH: [ 776106 ] Fix for TEMP dir error
5883 WinMerge: MergeDoc.cpp
5886 PATCH: [ 766287 ] Use our own dir traversal (instead of diff's)
5887 WinMerge: Diff.cpp DiffContext.h DiffThread.cpp DirDoc.cpp Merge.dsp
5888 DirScan.h DirScan.cpp
5889 PATCH: [ 773981 ] Modify language build process to eliminate msgboxes
5890 (also added a version resource to MakeResDll, as it lacked one)
5891 Languages: BuildAll.bat BuildDll.bat
5892 MakeResDll: MakeResDll.cpp MakeResDll.rc
5893 Added F4 accelerator to all languages besides English
5894 Languages: all *.rc files
5897 PATCH: [ 776525 ] Close doc after failed load
5898 WinMerge: MainFrm.cpp
5901 PATCH: [ 776046 ] Fixes for <Highlight Line Diff> menu item
5902 WinMerge: Merge.rc MergeEditView.cpp
5903 Languages: All Merge*.rc files and resource.h files
5904 PATCH: [ 771666 ] Fix for English descriptions of Chinese
5905 common: LanguageSelect.rc
5909 Added ChineseTraditional, ChineseSimplified, Korean, translations.
5910 PATCH: [ 775000 ] Improve const correctness in crystaltextbuffer
5911 editlib: crystaltextbuffer.cpp crystaltextbuffer.h
5914 PATCH: [ 767147 ] Don't clear existing dirdoc until user saves
5915 WinMerge: DirDoc.cpp
5916 PATCH: [ 763616 ] New menu item: Highlight line diff
5917 WinMerge: Merge.rc MergeDoc.cpp MergeDoc.h MergeEditView.cpp MergeEditView.h resource.h
5918 editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h ccrystaltextview.cpp ccrystaltextview.h
5921 PATCH: [ 772843 ] Remember custom colors
5922 WinMerge: PropColors.h PropColors.cpp
5925 PATCH : [ 771587 ] Undo/Redo functions
5926 WinMerge: MainFrm.cpp MergeDoc.cpp MergeDoc.h MergeEditView.cpp
5927 editlib: ccrystaleditview.cpp ccrystaleditview.h ccrystaltextbuffer.cpp ccrystaltextbuffer.h
5930 PATCH : [ 772908 ] ResetView must reset m_nTopSubLine
5931 editlib: ccrystaltextview.cpp
5934 PATCH : [ 769535 ] Preserve cursor during Rescan
5935 WinMerge: MergeDoc.cpp
5936 editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h ccrystaltextview.cpp ccrystaltextview.h
5939 PATCH: [ 767878 ] Better handling of ghost flag and EOL
5940 WinMerge: MergeDoc.cpp MergeEditView.cpp
5941 editlib: ccrystaleditview.cpp ccrystaltextbuffer.cpp ccrystaltextbuffer.h
5944 PATCH: [ 772228 ] Quick bin check for 2.0
5945 WinMerge: files.h files.cpp MainFrm.cpp MergeDoc.cpp
5948 PATCH: [ 765926 ] Merge empty last line to the last diffrange (change)
5950 WinMerge: MergeDoc.cpp
5953 PATCH: [ 771525 ] Updating cursor in ListCopy
5954 WinMerge: MergeDoc.cpp MergeDoc.h
5955 editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h
5958 PATCH: [ 771503 ] correct UpdateView context in internalInsertText
5959 editlib: ccrystaltextbuffer.cpp
5962 PATCH: [ 768740 ] Additional color options
5963 Submitted by Gilbert Wellisch
5964 WinMerge: MainFrm.cpp Merge.cpp Merge.h Merge.rc MergeEditView.cpp
5965 PropColors.cpp PropColors.h resource.h
5966 Updated other languages
5969 PATCH: [ 771625 ] regression for patch [765399]
5970 WinMerge: MergeEditView.cpp
5973 PATCH: [ 770361 ] Slovak translation
5974 Languages: New Slovak subdirectory
5977 PATCH: [ 765399 ] Careful view initialization in PrimeListWithFile
5978 WinMerge: MergeDoc.cpp MergeEditView.cpp
5979 editlib: ccrystaltextview.cpp
5982 PATCH: [ 769122 ] Keep top screen line within the shorter panel
5983 WinMerge: MergeEditView.cpp
5986 PATCH: [ 765150 ] Fix char count in edit view bottom status line
5987 WinMerge: ChildFrm.cpp ChildFrm.h Merge.rc MergeEditStatus.h
5988 MergeEditView.cpp resource.h
5989 editlib: ccrystaltextview.cpp ccrystaltextview.h
5990 Languages: Updated all resource.h and rc files to include two new strings
5993 PATCH: [ 769295 ] Fix for threaded dir compare crash
5994 WinMerge: DiffThread.h DiffThread.cpp DirDoc.h DirDoc.cpp DirView.h DirView.cpp
5997 PATCH: [ 766727 ] Threaded dir compare
5998 WinMerge: DiffContext.h DiffContext.cpp DirDoc.h DirDoc.cpp
5999 DirView.h DirView.cpp MainFrm.h MainFrm.cpp Merge.dsp
6000 New files: DiffThread.h DiffThread.cpp
6003 PATCH: [ 768378 ] use Rescan Timer for Replace All
6004 WinMerge: MergeEditView.cpp
6007 PATCH: [ 765768 ] Only one Rescan on AllToLeft
6009 WinMerge: MergeDoc.h MergeDoc.cpp MergeEditView.cpp
6012 PATCH: [ 766473 ] Update identical files
6013 WinMerge: MergeDoc.cpp
6016 PATCH: [ 767159 ] merge LF_RIGHT_ONLY and LF_LEFT_ONLY -> LF_GHOST
6017 WinMerge: MergeDoc.cpp MergeEditView.cpp
6018 editlib: ccrystaltextbuffer.h ccrystaltextview.cpp
6021 PATCH: [ 767051 ] code cleanup for GetTextWithoutEmptys
6022 WinMerge: MergeDoc.cpp MergeDoc.h MergeEditView.cpp
6023 editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h
6026 PATCH: [ 765165 ] Log error string if CreateFile fails (to debug window)
6027 WinMerge: files.cpp MainFrm.cpp MainFrm.h MergeDoc.cpp StdAfx.cpp StdAfx.h
6030 PATCH: [ 767204 ] Fix for assert when rescanning with selection
6031 Submitted by Gilbert Wellisch
6032 editlib: ccrystaltextview.cpp
6035 PATCH: [ 765399 ] resize m_pdwParseCookies before GoToLine
6036 WinMerge: MergeDoc.cpp MergeEditView.cpp
6039 PATCH: [ 765926 ] Merge empty last line to the last diffrange (change)
6040 WinMerge: MergeDoc.cpp
6043 PATCH: [ 766038 ] stay in the viewing area during OnFirstdiff
6044 WinMerge: MergeEditView.cpp
6047 PATCH: [ 765463 ] Simplify temp path handling a little
6048 WinMerge: MergeDoc.h MergeDoc.cpp
6051 PATCH: [ 764571 ] Ask about saving when closing with esc
6052 WinMerge: MainFrm.cpp MergeDoc.cpp MergeEditView.cpp
6053 PATCH: [ 763499 ] update french language
6058 PATCH: [ 763265 ] Fix handling of .. and . components
6062 PATCH: [ 764789 ] Fix Private Build string in rc file
6066 PATCH: [ 763817 ] Hilight diffs when syntax hilight is off
6067 WinMerge: MergeEditView.cpp
6068 PATCH: [ 762531 ] Inproper globals in editlib/cs2cs.cpp
6071 PATCH: [ 762529 ] Dirframe trying to clear non-existing pane
6073 WinMerge: DirFrame.cpp
6075 2003-06-30 WinMerge beta 2.1.0.0 released
6078 [ 762394 ] update german language
6079 Languages: German\MergeGerman.rc
6082 PATCH: [ 762835 ] Display line number etc beneath editor
6083 WinMerge: ChildFrm.cpp ChildFrm.h DirFrame.cpp Merge.cpp Merge.dsp
6084 MergeEditStatus.h MergeEditView.cpp MergeEditView.h
6085 editlib: ccrystaltextbuffer.h ccrystaltextview.cpp ccrystaltextview.h
6088 PATCH: [ 758912 ] Combine duplicated code in CMergeEditView::OnEditCopy
6089 WinMerge: MergeEditView.cpp
6090 PATCH: [ 762533 ] Stdafx.h has dublicated and unneeded includes
6092 PATCH: [ 762271 ] Alter ListCopy to copy eol chars
6093 WinMerge: MergeDoc.cpp MergeDoc.h
6094 editlib: ccrystaltextbuffer.h ccrystaltextbuffer.cpp
6097 PATCH: [ 762749 ] Forced rescan after options changed
6098 WinMerge: MainFrm.cpp
6101 PATCH: [ 761874 ] Fix unlocalisable acceskeys
6104 Updated language files too
6105 PATCH: [ 761827 ] Current diff item to select inactive diff
6106 WinMerge: MergeDoc.h MergeDoc.cpp MergeEditView.cpp
6107 PATCH: [ 762098 ] Code cleanups from Jochen
6109 WinMerge: MainFrm.h MainFrm.cpp MergeDoc.cpp MergeEditView.cpp
6112 PATCH: [ 758930 ] Display EOL chars with View Whitespace
6113 WinMerge: MainFrm.cpp
6114 editlib: ccrystaltextview.h ccrystaltextview.cpp
6115 PATCH: [ 762268 ] Fix typo in comment (wenn -> when)
6116 editlib: ccrystaltextview.cpp
6119 PATCH: [ 761951 ] Fix scrolling corruption
6121 editlib: ccrystaltextview.cpp
6124 PATCH: [ 760745 ] Fix empty search field detection and better history in FindDlg and EditReplaceDlg
6125 editlib : ccrystaleditview.cpp ccrystaltextview.cpp ceditreplacedlg.cpp ceditreplacedlg.h
6126 cfindtextdlg.cpp cfindtextdlg.h memcombo.cpp memcombo.h
6128 2003-06-26 Christian
6129 PATCH: [ 754001 ] 2.0 doc link points to 1.7 docs
6130 WinMerge: MainFrm.cpp
6133 PATCH: [ 755918 ] Fix typo in CCrystalTextView extension list
6134 Added more filename extensions
6135 editlib: ccrystaltextview.cpp
6136 PATCH: [ 757180 ] Update Open OK on dropped file
6138 common: SuperComboBox.cpp
6141 PATCH: [ 759755 ] Better rescan error reporting
6142 WinMerge: MainFrm.cpp MergeDoc.h MergeDoc.cpp
6143 PATCH: [ 760441 ] Fix recursive d&d compare
6144 WinMerge: MainFrm.cpp
6147 PATCH: [ 759778 ] Minor cleanup of crystaltextbuffer.cpp
6148 editlib: ccrystaltextbuffer.cpp
6149 PATCH: [ 760077 ] Omit final ghostline if last line unterminated
6150 WinMerge: MergeDoc.cpp
6151 PATCH: [ 760129 ] Wipe Undo stack if Undo fails, and fix Undo check
6152 editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h
6155 PATCH: [ 759533 ] Fix InternalInsertText & InternalDeleteText
6156 editlib: ccrystaltextbuffer.cpp
6157 PATCH: [ 759569 ] Fix Undo/Redo & line mappings
6158 editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h ccrystaleditview.cpp
6161 PATCH: [ 759344 ] Add Copy, Cut & Paste to Edit menu
6163 Updated other languages too - translations from Perry and Christian
6166 PATCH: [ 758870 ] Return filesize+1 rather than 0 for new lines at end
6167 editlib: crystaltextbuffer.cpp crystaltextbuffer.h
6168 PATCH: [ 758900 ] Fix bug in pasting contiguous empty lines.
6169 editlib: crystaltextbuffer.cpp
6170 PATCH: [ 756218 ] Fix copy & paste typo in comment in Merge.cpp
6174 PATCH: [ 716456 ] Update Undo/Redo info with rescan line mapping
6175 WinMerge: MergeDoc.cpp MergeEditView.h
6176 editlib: crystaltextbuffer.cpp crystaltextbuffer.h
6179 PATCH: [ 728153 ] If opening first file fails, don't open second
6180 WinMerge: MainFrm.cpp
6183 PATCH: [ 755918 ] Fix typo in CCrystalTextView extension list
6184 editlib: ccrystaltextview.cpp
6186 2003-06-16 Christian
6187 PATCH [ 754015 ] WinMerge installer imrovements
6188 InnoSetup: Info.txt WinMerge.iss WinMergeIcon.bmp WinMergeLarge.bmp
6191 PATCH: [ 753284 ] Fix cursor slowdown after rescan
6192 editlib: ccrystaltextview.cpp
6195 PATCH: [ 750160 ] Char width fix
6196 editlib: ccrystaltextview.cpp
6199 PATCH: [ 750302 ] Allow *.flt filter files
6203 Updated filter file from patch [ 742041 ] Improvements to file/directory filters
6204 Filters: Merge_VC_loose.flt
6205 BUG: [ 749007 ] "Highlighting" is misspelled as "Hilighting"
6208 2003-06-05 WinMerge 2.0.0 Release Candidate 1 released
6210 2003-06-05 Christian
6211 PATCH: [ 749566 ] Updated resource files
6212 Languages: all resource.h files and all Merge*.rc files
6214 2003-06-04 Christian
6215 Updated Czech and Danish resources
6216 Languages: Czech\resource.h Czech\MergeCzech.rc Danish\resource.h Danish\MergeDanish.rc
6219 PATCH: [ 747090 ] Fix scroll handling
6220 editlib: ccrystaltextview.cpp
6223 PATCH: [ 746319 ] Adjust horiz scrolling width
6224 editlib: ccrystaltextview.cpp
6227 PATCH: [ 745654 ] Draw long lines
6228 WinMerge: MergeEditView.cpp
6229 editlib: ccrystaltextview.cpp
6230 PATCH: [ 742041 ] Improvements to file/directory filters
6231 WinMerge: FileFilterMgr.h FileFilterMgr.cpp Merge.cpp
6232 PATCH: [ 738557 ] Allow "Open Left" for directories
6233 WinMerge: DirActions.cpp DirView.h DirView.cpp
6235 2003-05-29 Christian
6236 PATCH: Applied [ 745223 ] Fix pasting different EOL types
6237 edilib: ccrystaltextbuffer.cpp
6238 BUG: [ 744990 ] Pasting to the right
6241 Made new folder \Filters for filter files. Added Perry's original filter files
6242 working with beta 1.9.2.2
6245 PATCH: [ 744872 ] Use CopyFile()
6246 WinMerge: files.h files.cpp MergeDoc.cpp
6249 PATCH: [ 743284 ] String fixes
6250 WinMerge: DirDoc.cpp DirView.cpp MainFrm.cpp MergeDoc.h paths.cpp
6251 editlib: ccrystaleditview.cpp ccrystaltextview.cpp registry.cpp
6254 PATCH: [ 742735 ] Fix CCrystalTextBuffer::InsertLine()
6255 edilib: ccrystaltextbuffer.cpp
6257 2003-05-23 Christian
6258 Made new folder \InnoSetup\ for files related to making WinMerge installer using InnoSetup
6261 PATCH: [ 741265 ] Fix for bug#741263: 1.9.2.2 crash on refresh
6262 WinMerge: Diff.cpp DiffContext.cpp DiffContext.h DirDoc.cpp MainFrm.cpp
6264 2003-05-19 WinMerge beta 1.9.2.2 released
6267 PATCH: [ 739529 ] project file & directory filters
6268 WinMerge: Diff.cpp DiffContext.cpp DiffContext.h FileFilterMgr.cpp
6269 FileFilterMgr.h MainFrm.cpp MainFrm.h Merge.cpp Merge.dsp Merge.h
6270 Merge.rc PropFilter.cpp PropFilter.h resource.h
6273 PATCH: [ 737709 ] Remove unneeded UpdateAllViews()
6274 WinMerge: MergeDoc.cpp
6275 PATCH: [ 738467 ] Enable/disable save items
6276 WinMerge: MergeEditView.h MergeEditView.cpp
6279 PATCH: [ 737692 ] Scrolling optimisation - significant speedup
6280 editlib: ccrystaltextview.cpp
6283 PATCH: [ 736443 ] Prpoper Esc fix
6284 WinMerge: DirView.h DirView.cpp Merge.cpp MergeEditView.h MergeEditView.cpp
6287 PATCH: [ 735127 ] German Translation
6288 Updated German language file submitted by Jörg Schneider
6289 PATCH: [ 734787 ] Disable ESC closing window
6290 NOTE: This is to fix BUG [ 734554 ] ESC closes dialog + document
6292 BUG: [ 711961 ] shift-tab in editor moved block then deselects
6293 WinMerge: MergeEditView.cpp
6296 PATCH: [ 733383 ] Enable Find- and Replace- dialogs
6297 WinMerge: Merge.rc resource.h
6298 editlib: ceditreplacedlg.h ceditreplacedlg.cpp cfindtextdlg.h
6299 cfindtextdlg.cpp editcmd.h editres.rc
6300 Removed: editlib/resource.h
6301 Updated other languages
6302 PATCH: [ 733926 ] Fix find dialog text selection
6303 editlib: ccrystaltextview.cpp
6306 PATCH: [ 732775 ] Add support for MAC files
6307 WinMerge: MergeDoc.cpp MergeEditView.h
6310 BUG: [ 731486 ] Crash after save
6311 WinMerge: MergeDoc.cpp
6312 PATCH: [ 731533 ] Temp path fix
6313 WinMerge: MergeDoc.h MergeDoc.cpp
6314 editlib: ccrystaltextbuffer.h ccrystaltextbuffer.cpp
6317 BUG: [ 724726 ] Status bar says "Rescanning" the first time
6321 PATCH: [ 730738 ] Update BCMenu (to v3.033)
6322 WinMerge: BCMenu.h BCMenu.cpp
6323 Updates BCMenu to v3.033, http://www.codeproject.com/menu/bcmenu.asp
6326 PATCH: [ 728542 ] Automatic rescan enable/disable
6327 WinMerge: MainFrm.h MainFrm.cpp Merge.rc MergeEditView.h MergeEditView.cpp
6328 PropGeneral.h PropGeneral.cpp resource.h
6329 Updated other languages too
6332 PATCH: [ 726330 ] Saving before refresh - backout saving - see bug [ 723412 ]
6333 WinMerge: MergeDoc.cpp MergeEditView.cpp
6334 PATCH: [ 728228 ] Rename properties to options and rearrange
6335 Renaming "Properties" to "Options"
6336 WinMerge: MainFrm.h MainFrm.cpp Merge.rc resource.h
6337 Updated .rc and resource.h for other languages
6338 BUG: [ 718133 ] Inconsistent user keyword list for C/C++ syntax hiligth
6339 editlib: cplusplus.cpp
6342 BUG: [ 728173 ] Autoscroll first diff breaks syntax hilight
6343 WinMerge: MergeDoc.cpp
6346 PATCH: [ 726330 ] Saving before refresh
6347 WinMerge: MergeDoc.h MergeDoc.cpp MergeEditView.cpp
6348 PATCH: [ 727455 ] Autoscroll first diff for dir compare
6349 WinMerge: DirView.h MainFrm.cpp
6352 PATCH: [ 727104 ] Disable margins for unknown filetypes
6353 editlib: ccrystaltextview.h ccrystaltextview.cpp
6356 PATCH: [ 721939 ] Wider horiz scroll + more space after last char
6357 editlib: ccrystaltextview.cpp
6358 PATCH: [ 726390 ] Last diff shown incorrectly sometimes
6359 WinMerge: MergeDoc.cpp
6362 Changed dynamic array to be CArray based
6363 editlib: ccrystaltextview.cpp
6364 PATCH: [ 724309 ] Add WaitStatusCursors
6365 WinMerge: DirDoc.cpp DirView.cpp MainFrm.cpp Merge.dsp MergeDoc.cpp MergeEditView.cpp
6366 WaitStatusCursor.cpp WaitStatusCursor.h
6367 PATCH: [ 724473 ] Move WaitStatusCursor strings into RC
6368 WinMerge: DirDoc.cpp DirView.cpp MainFrm.cpp MergeDoc.cpp MergeEditView.cpp resource.h StdAfx.cpp StdAfx.h
6369 PATCH: [ 724479 ] Fix Refresh crash in empty dir view
6370 WinMerge: DirDoc.cpp
6371 bugfix: Add new files that were part of patch#724309
6372 WinMerge: WaitStatusCursor.cpp WaitStatusCursor.h
6373 PATCH: [ 724493 ] WaitStatusCursor for MergeDoc rescans
6374 WinMerge: MergeDoc.cpp
6377 [ 724280 ] Could use wait cursors at OpenSelection calls
6378 WinMerge: DirView.cpp
6381 PATCH: [ 722083 ] refresh button (menu item, accelerator)
6382 WinMerge: DirView.cpp DirView.h Merge.rc MergeEditView.cpp MergeEditView.h resource.h res/Toolbar.bmp
6383 Also updated resource files (resource.h, *.rc, Toolbar.bmp) to all languages
6386 PATCH: [ 720613 ] CDirView leaks imagelist
6387 WinMerge: DirView.cpp
6388 PATCH: [ 720701 ] Use memory-mapped files when saving files
6389 WinMerge: files.h files.cpp MergeDoc.h MergeDoc.cpp
6392 PATCH: [ 716475 ] Reduce edtlib.h coupling
6393 WinMerge: MergeEditView.h StdAfx.h editlib/ccrystaleditview.inl
6396 PATCH: [ 719872 ] Use memory-mapped files when loading files
6397 WinMerge: files.h files.cpp Merge.dsp MergeDoc.h MergeDoc.cpp
6400 PATCH: [ 717688 ] CrystalEditor optimisations and memleaks
6402 editlib: ccrystaltextview.cpp
6405 PATCH: [ 717688 ] CrystalEditor optimisations and memleaks
6406 editlib: ccrystaltextview.cpp
6409 PATCH: [ 716744 ] Fix CrystalEditor memory leaks
6410 editlib: ccrystaltextbuffer.cpp ccrystaltextview.cpp
6413 PATCH: [ 716308 ] Disable italic text
6414 editlib: ccrystaltextview.cpp
6415 PATCH: [ 715553 ] Add commandline options to not add paths to MRU
6416 Usage: -ur to ignore rigth, -ul to ignore left and -ub to ignore both
6417 WinMerge: MainFrm.h MainFrm.cpp Merge.cpp
6420 PATCH: [ 715457 ] LoadFromFile() rewrote
6421 WinMerge: MergeDoc.h MergeDoc.cpp
6424 PATCH: [ 716088 ] Fix bin same/diff bug in Diff.cpp & analyze.c
6425 WinMerge: analyze.c Diff.cpp
6427 2003-04-04 Christian
6428 PATCH: [ 711843 ] Allow backspace at beginning of line
6429 WinMerge: MainFrm.cpp
6432 BUG: [ 714570 ] Sensitive to EOL -setting not saved
6433 WinMerge: MainFrm.cpp
6436 PATCH: [ 713322 ] Save whole buffer not line by line
6437 WinMerge: MergeDoc.cpp
6438 PATCH: [ 713416 ] MergeEditView optimisations
6439 WinMerge: MergeEditView.cpp
6442 PATCH: [ 711437 ] Don't copy/cut removed lines
6443 WinMerge: MergeDoc.h MergeDoc.cpp MergeEditView.h MergeEditView.cpp
6446 PATCH: [ 712429 ] Fix UpdateItemStatus bug 712093
6447 WinMerge: DirActions.cpp DirView.cpp paths.cpp paths.h
6450 PATCH: [ 712417 ] Fix save of open doc before next merge
6451 WinMerge: ChildFrm.cpp ChildFrm.h DirDoc.cpp DirDoc.h DirFrame.cpp DirFrame.h
6452 DirView.cpp DirView.h MainFrm.cpp MainFrm.h MergeDoc.cpp MergeDoc.h
6455 PATCH: [ 710347 ] Fix crash of winmerge c:\ d:\
6456 WinMerge: DiffContext.h DirDoc.cpp MainFrm.cpp Merge.cpp OpenDlg.cpp OpenDlg.h paths.cpp paths.h
6457 PATCH: [ 687177 ] Handle more errors during copy/creation
6458 WinMerge: MainFrm.cpp
6459 PATCH: [ 689884 ] Revise doc/view code (allow multiple docs)
6460 WinMerge: ChildFrm.cpp DirActions.cpp DirDoc.cpp DirDoc.h DirView.cpp MainFrm.cpp MainFrm.h
6461 Merge.cpp MergeDoc.cpp MergeDoc.h MergeEditView.cpp
6462 NB: This broke two things in MainFrm--search for TODO: 2003-03-29
6463 BUGFIX: [ 711975 ] CMainFrame::GetAllViews crashes
6464 WinMerge: MainFrm.cpp
6465 BUGFIX: [ 711983 ] ClearMergeDoc causing ASSERT
6466 WinMerge: DirDoc.cpp MergeDoc.cpp
6468 2003-03-26 WinMerge beta 1.9.1.4 released
6471 PATCH: [ 709575 ] Fix sanity check in CChildFrame::UpdateHeaderSizes()
6472 WinMerge: ChildFrm.cpp
6473 PATCH: [ 708542 ] Make splash & about show language-independent version
6474 common: version.cpp version.h
6475 WinMerge: Merge.cpp Splash.cpp
6477 2003-03-25 Christian
6478 Replace COPYING with corrected version from http://www.gnu.org/licenses/gpl.txt
6481 PATCH: [ 708893 ] Don't ask to save file compare
6482 WinMerge: MergeDoc.h MergeDoc.cpp
6483 PATCH: [ 703069 ] Fix undo crash
6484 editlib: crystaltextbuffer.cpp
6485 PATCH: [ 709502 ] Fix missing/existing EOL at end of file
6486 WinMerge: MergeDoc.h MergeDoc.cpp
6489 PATCH: [ 706006 ] Suppress Rescan during Merge
6490 Merge.cpp Merge.h MergeDoc.cpp MergeDoc.h MergeEditView.cpp
6493 PATCH: [ 707753 ] Delayed rescan - fix
6494 WinMerge: MergeEditView.cpp
6497 PATCH: [ 707753 ] Delayed rescan
6498 WinMerge: MergeEditView.h MergeEditView.cpp
6501 PATCH: [ 707152 ] Delay path check in opendialog
6502 WinMerge: OpenDlg.h OpenDlg.cpp
6505 PATCH: [ 703234 ] Use stricmp
6506 WinMerge: DIFF.C diffmain.c SDIFF.C
6509 Deleted unused res files: bitmap1.bmp, bmp00001.bmp, ScreenShot.gif, WinMerge.gif
6511 2003-03-11 Christian
6512 PATCH: [ 700872 ] Esc to close crashes WinMerge
6516 PATCH: [ 699839 ] Add same binaries to dir compare status
6517 WinMerge: MainFrm.h MainFrm.cpp
6518 PATCH: [ 699893 ] Add drag&drop of files/paths to main window
6519 Note: Press down Ctrl when dropping dirs for recursive compare
6520 WinMerge: MainFrm.h MainFrm.cpp Merge.cpp paths.h paths.cpp
6522 2003-03-07 WinMerge beta 1.9.1.3 released
6525 PATCH: [ 699580 ] Fix paths.cpp
6529 PATCH: [ 698754 ] Update filetimes after save
6530 WinMerge: DiffContext.h DiffContext.cpp DirDoc.h DirDoc.cpp MergeDoc.cpp
6532 2003-03-06 Christian
6533 Update Danish language file with new strings in MergeDanish.rc
6534 Removed duplicate dialog in French language file in MergeFrench.rc
6535 Added Czech to BuildAll.bat
6536 PATCH: [ 698346 ] Use full path for directory context menu option
6537 WinMerge: PropRegistry.cpp
6540 PATCH: [ 696695 ] DirDoc Redisplay optimisation
6541 WinMerge: DirDoc.h DirDoc.cpp
6544 Added new subdir Languages/Danish/res
6545 PATCH: [ 695857 ] Fix directory handling, & UNC paths, & shortnames
6546 Fix Danish language files: Update resource.h and update language dialogbox to use IDC_LANGUAGE_LIST.
6549 BUG: [ 684622 ] Escape key closes whole program
6550 Nikki Locke's patch slightly modified
6552 PATCH: [ 696588 ] Multimonitor + virtual screens support
6553 WinMerge: MainFrm.cpp Merge.dsp multimon.h
6554 BUG: [ 697320 ] Saving enabled when comparing directories
6555 WinMerge: DirView.h DirView.cpp
6558 BUG: [ 693932 ] Trailing \ on path crashes WinMerge
6559 WinMerge: OpenDlg.h OpenDlg.cpp
6562 BUG: [ 693820 ] Typed path failed to compare
6563 WinMerge: OpenDlg.cpp
6564 BUG: [ 693004 ] Keyboard does not work for accessing menus
6565 Add missing WM_MENUCHAR handler from www.codeguru.com
6566 WinMerge: MainFrm.h MainFrm.cpp
6569 BUG: [ 683753 ] Rescan is not prompting to save dirty
6574 2003-02-26 Christian
6575 [ 70970 ] Translate Merge.rc into danish
6576 BuildAll.bat and added directory Languages/Danish
6579 [ 692922 ] Don't try to compare file & directory
6582 [ 686699 ] Check & return file saving success
6583 Fix2: Do not return save success of "Save As"
6588 [ 687574 ] Navigate in directory view (fix bug in patch)
6591 [ 686699 ] Check & return file saving success - fix
6593 MergeDoc.h Mergedoc.cpp
6596 [ 650356 ] suggest commenting out several functions
6597 [ 684416 ] is_all_whitespace is bad
6598 Removed bad unused functions in common/coretools.cpp (& .h)
6599 (Did not remove all unused functions, only ones with bugs)
6602 Sync'ed all language resources to English version.
6603 [ 684300 ] Stringified Diffitems
6604 + combined & modularized code in DirDoc.cpp
6606 DiffContext.cpp DiffContext.h DirDoc.cpp DirView.cpp DirView.h
6609 [ 689876 ] Patch to fix bug # 689869 (ASSERT on Rescan)
6611 MainFrm.cpp & new resource IDS_ERROR_FILE_NOT_FOUND
6612 [ 687574 ] Navigate in directory view
6614 DirView.cpp DirView.h
6615 [ 690176 ] Cmdline param for ESC closing
6616 (and updated all obsolete French & German accelerators as well)
6618 Merge.cpp Merge.h Merge.rc
6620 Czech\MergeCzech.rc Dutch\MergeDutch.rc French\MergeFrench.rc
6621 German\MergeGerman.rc Italian\MergeItalian.rc Spanish\MergeSpanish.rc
6622 [ 689896 ] Update to sync Czech resource
6625 2003-02-18 Christian
6626 Removed annoying SourceSafe path from Merge.dsp
6629 [ 684737 ] Fix Language Box to handle dblclick
6631 LanguageSelect.h LanguageSelect.cpp
6634 [ 687039 ] View whitespaces on editor
6636 MainFrm.h MainFrm.cpp Merge.rc resource.h
6638 ccrystaltextview.cpp
6641 [ 686699 ] Check & return file saving success
6642 Merge.rc MergeDoc.h Mergedoc.cpp resource.h
6645 [ 685491 ] Saving fixes: SaveToFile() rewrite part
6646 + Missing NULL check for mf->m_pDirDoc in CMergeDoc
6647 MergeDoc.h MergeDoc.cpp
6650 [ 685816 ] Recommend deleting unlocalized translations
6651 [ 684290 ] improved bin test:
6653 [ 686090 ] Show/hide binary files
6655 DirDoc.cpp MainFrm.cpp MainFrm.h Merge.rc readme.txt
6658 Spanish/MergeSpanish.rc Spanish/resource.h
6663 Some updates to align Dutch rc towards English rc.
6664 [ 685637 ] CMainFrame::SyncFiles GPF bug
6666 2003-02-12 Christian
6667 [ 630286 ] WinMerge crashes/fails in WinCVS
6668 [ 683752 ] Add option to be listed on Directory context menu
6671 Fixing recent SplitFilename & directory concat problems.
6672 [ 683924 ] Same binaries for directory compare.
6675 Kimmo's fix for crash due to NULL doc pointer in MergeDoc::SaveHelper.
6676 [ 470013 ] Spanish Orthography and Semantics
6679 [ 683120 ] splitfilename changed to CStrings
6680 Move new SplitFilename from Chris Mumford into coretools, remove old
6681 versions, add test chassis, and fix some minor cases.
6684 DirDoc.*: Changed from strftime to COleDateTime::Format (respects user prefs).
6685 First half of [ 679692 ] Update after editing (with code combination).
6686 [ 682505 ] API changes for CLog, CDirView and CDirDoc
6687 2nd half of [ 679692 ] Update after editing
6689 2003-02-07 WinMerge beta 1.9.1.1 released
6691 2003-02-07 Christian
6692 Added 24 missing languages
6693 Fixed duplicated strings in Italian rc.
6696 Updated Brazilian, Italian, Spanish resources to sync with English/main resources.
6698 2003-01-28 Christian
6699 Committed [ 424579 ] Escape to exit
6701 2003-01-27 Christian
6702 [ 668654 ] Tabtype selection feature
6703 [ 672554 ] Update DirView after individual merge
6704 Fixed [ 225571 ] After individual merge, dirView not updated
6705 [ 672879 ] Propose clarifying change in ccrystaleditview.cpp
6706 [ 672885 ] Fix for ASSERT from CChildFrame::UpdateHeaderSizes
6707 [ 673063 ] Modification check before close
6708 [ 675526 ] Waitcursors and merging all
6710 2003-01-21 Christian
6711 [ 671037 ] Changes for MSVC.NET
6712 [ 671810 ] Tempfiles to temp dir
6714 2003-01-20 Christian
6715 [ 671034 ] operator precedence bug in SplitterWndEx.cpp
6717 2003-01-15 Christian
6718 [ 650384 ] Fix for false equals for binary files
6719 [ 651689 ] Add OpenLeft, OpenLeftWith, ... context
6720 [ 650293 ] Implement context menus with multiselect
6722 2003-01-14 Christian
6723 [ 665993 ] Little optimisation
6725 2002-12-17 WinMerge beta 1.7.2.11 released
6728 Implemented recursive directory delete
6729 Fix bug in EOL handling in crystaltextbuffer, and add optional EOL sensitivity.
6730 Added optional EOL insensitivity to gnu diff IO.c.
6731 Added status bar progress (file count) indicator during scanning
6732 Fixed tooltips of toolbar buttons to list correct hotkeys
6733 Split "Show Unique" option into "Show Left Unique" and "Show Right Unique"
6736 Added left files, left dirs, right files, right dirs to status bar feedback
6738 2002-11-18 WinMerge beta 1.7.2.1 released