2 RFE: [ 952959 ] split Are you sure you want to copy into more lines
5 PATCH: [ 1011066 ] Better error message for failed file loading
6 Src: MergeDoc.cpp MergeDoc.h
7 Src/Common: UniFile.cpp
8 PATCH: [ 1002432 ] codepage UI version 2
9 Patch by Perry and Laoran
10 Src: ConfigLog.cpp ConfigLog.h DirDoc.cpp DirScan.cpp MainFrm.cpp Merge.dsp
11 Merge.rc OptionsDef.h PropGeneral.cpp PropGeneral.h resource.h
12 Src new files: codepage.cpp codepage.h PropCodepage.cpp PropCodepage.h
13 Src/Common: LanguageSelect.cpp multiformatText.cpp unicoder.cpp unicoder.h unifile.cpp
14 Src/Languages: resource.h *.rc
16 2004-08-17 WinMerge experimental release 2.1.7.11 (cvs)
19 PATCH: [ 1010387 ] Updated MergeSwedish.rc file
20 Submitted by Hans Eriksson
21 Src/Languages/Swedish: MergeSwedish.rc
22 PATCH: [ 975840 ] Cleanup VCS/VSS code part 2
23 Src: MainFrm.cpp MainFrm.h Merge.dsp
24 Src new files: VSSHelper.cpp VSSHelper.h
27 BUG: [ 1002035 ] Crash with locked files (WM v2.1.7.10)
29 BUG: [ 1002035 ] Crash with locked files (WM v2.1.7.10)
31 BUG: [ 1009918 ] Binary files not detected (unicode builds)
32 Src/Common: UniFile.cpp
35 PATCH: [ 1008755 ] avoid flickering when diff view opens
36 Submitted by Takashi Sawanaka
37 Src: ChildFrm.cpp DiffViewBar.cpp
38 Don't post ID_FORCE_REDRAW in CCrystalTextView::OnSize()
39 Suggested by Takashi Sawanaka in patch item #1008755
40 Src/editlib: ccrystaltextview.cpp
43 BUG: [ 1007320 ] VB Syntax highlighting: Wrong masking from "
44 Src/editlib: basic.cpp
47 PATCH: [ 1007212 ] Make extension matching in Open-dialog case insensitive
48 Src: FileFilterHelper.cpp
49 PATCH: [ 1007216 ] Allow '*.' to match files without extension in Open-dialog
50 Src: FileFilterHelper.cpp
51 PATCH: [ 1007627 ] Filter selection fixes
52 Src: FileFilterHelper.cpp FileFilterHelper.h MainFrm.cpp OpenDlg.cpp
53 OpenDlg.h OptionsDef.h
56 PATCH: [ 1006475 ] Don't save editor settings to different key in registry
57 Src/editlib: editreg.h
58 PATCH: [ 1006870 ] Don't add '\' to filenames for regexp filtering
59 Src: FileFilterHelper.cpp
60 Backout PATCH: [ 999738 ] Gray out moved block menuitems when moved blocks disabled
61 Those menuitems didn't work like I expected
65 BUG: [ 1006164 ] accelerator conflict
67 PATCH: [ 1003181 ] Move filter options to OptionsManager
68 Src: MainFrm.cpp MainFrm.h OptionsDef.h
71 PATCH: [ 1001981 ] Italian translation updated
72 Submitted by Andrea Decorte
73 Src/Languages/Italian: MergeItalian.rc
74 PATCH: [ 1002585 ] Update dir compare statepane counts when reopening
76 PATCH: [ 1002887 ] Enable Change Pane menuitem for Diff Pane
77 Src: MergeDiffDetailView.cpp MergeDoffDetailView.h
78 PATCH: [ 1000020 ] Simple project files (no GUI)
79 Src: MainFrm.cpp MainFrm.h Merge.cpp Merge.dsp Merge.h OpenDlg.cpp OpenDlg.h
80 Src new files: ProjectFile.cpp ProjectFile.h
81 Option OPT_HIDE_BACKUP didn't get removed when UI was removed, remove it now
82 Src: ConfigLog.cpp ConfigLog.h DirDoc.cpp MainFrm.cpp OptionsDef.h
83 Backout previous 'Option OPT_HIDE_BACKUP didn't get removed..' checkin.
84 It caused build with VC6 to crash in dir compare -- really weird why
85 Src: ConfigLog.cpp ConfigLog.h DirDoc.cpp MainFrm.cpp OptionsDef.h
89 PATCH: [ 1002333 ] Set default filter to *.* when starting WinMerge
91 PATCH: [ 1002280 ] Don't show dircompare statepane if no dircompare results
93 Remove GPL licence from coretools.cpp/h - that code is mostly freeware, not GPL
94 Src/Common: coretools.cpp coretools.h
95 PATCH: [ 1001974 ] Allow ESC to stop dir compare
96 Src: DirCompStateBar.cpp
97 PATCH: [ 1000423 ] Try to fix invisible find result
99 Src/editlib: ccrystaltextview.cpp
102 PATCH: [ 1001111 ] Warn if user selected binary files for patch creating
103 Src: MainFrm.cpp Merge.rc PatchTool.cpp resource.h
104 Src/Languages: *.rc resource.h
105 PATCH: [ 999804 ] Fix setting recursive for Open-dialog
106 New patch fixing bug #1001301 recursive not getting remembered
107 Src: MainFrm.cpp MainFrm.h Merge.cpp
110 PATCH: [ 967405 ] Add Japanese satellite dll to MakePatchDirs
111 MakePatchDirs: MakePatchDirs.dsp MakePatchDirs.rc
112 MakePatchDirsApp.cpp MakePatchDirsDlg.cpp MakePatchDirsDlg.h
114 PATCH: [ 967405 ] Add Japanese satellite dll to MakePatchDirs
115 (Adding new files forgotten at first check-in)
116 MakePatchDirs: MakePatchDirs_ja.dsp MakePatchDirs_ja.rc
117 MakePatchDirs_sat.cpp Satellites.cpp Satellites.h
120 PATCH: [ 989288 ] Inno Setup Localization: Italian
121 InnoSetup\Languages: Italian.isl
122 PATCH: [ 963429 ] Fix language in floating status bar
123 Src: DirCompStateBar.cpp DirCompStateBar.h DirDoc.cpp DirFrame.cpp DirFrame.h
127 PATCH: [ 1000714 ] Don't create difflist or patch file for binary files
129 PATCH: [ 1000772 ] Fix focus in SaveClosing dialog
130 Src: SaveClosingDlg.cpp
133 PATCH: [ 999738 ] Gray out moved block menuitems when moved blocks disabled
134 Src: LocationView.cpp
135 PATCH: [ 1000117 ] Hide only skipped subfolders in non-recursive compare
136 Fixes bug #922718 'show different files' off : subdirs not displayed
137 Src: DirDoc.cpp DirDoc.h
138 PATCH: [ 1000308 ] Add GotoLine() to CMergeEditView and use it
139 Src: LocationView.cpp LocationView.h MergeEditView.cpp MergeEditView.h
140 Add icons to Find and Replace result messageboxes.
141 Src/editlib: ceditreplacedlg.cpp cfindtextdlg.cpp
142 PATCH: [ 1000423 ] Try to fix invisible find result
143 Bug: #951584 Find: word found not visible or badly placed
144 Src: MergeDocLineDiffs.cpp
145 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
148 PATCH: [ 999681 ] Accept filter name from commandline
149 Src: FilterHelper.cpp FilterHelper.h Merge.cpp Merge.rc
151 PATCH: [ 999804 ] Fix setting recursive for Open-dialog
152 Src: MainFrm.cpp OpenDlg.cpp OpenDlg.h
155 Remove suppressing checkbox from commandline help messagebox
159 PATCH: [ 988505 ] updated email address for catalan translator
160 Update email address for Jordi Vilar (Catalan translator)
161 Web\developer\l10n: status.xml
162 PATCH: [ 988503 ] Inno Setup Localization: Catalan
163 InnoSetup\Languages: Catalan.isl
165 2004-07-23 WinMerge experimental release 2.7.1.10 (cvs)
168 BUG: [ 993402 ] Need review of native language names
169 Removed asterisks from Nederlands & Svenska (thanks to A. Decorte).
170 Src/Common: LanguageSelect.cpp
173 BUG: [ 969933 ] 'discriminated' language names
174 Capitalized native language names to make consistent in language selection box
175 Src/Common: LanguageSelect.cpp
178 PATCH: [ 992218 ] Add -f commandline switch for filemask
179 Usage: WinMerge -f "*.ext1 *.ext2" (like in Open-dialog)
180 Src: FileFilterHelper.cpp FileFilterHelper.h MainFrm.cpp Merge.cpp
181 Merge.rc OpenDlg.cpp OpenDlg.h
185 PATCH: [ 990976 ] FileFilterHelper (filter code cleanup)
186 Src: DiffContext.cpp DiffContext.h DirDoc.cpp DirDoc.h DirScan.cpp
187 FileFiltersDlg.cpp FileFilterDlg.h MainFrm.cpp Merge.cpp Merge.dsp
189 Src new files: FileFilterHelper.cpp FileFilterHelper.h
190 PATCH: [ 986393 ] Lose '(debug)' from 'Reload plugins'
193 PATCH: [ 941621 ] widen find/replace dialog
197 PATCH: [ 941621 ] widen find/replace dialog
201 PATCH: [ 990901 ] Add Move to DirView Context menu commands.
202 Submitted by Vladimir Lukianov
203 Src: DirActions.cpp DirView.cpp DirView.h Merge.rc resource.h
204 Src/Languages: *.rc resource.h
207 PATCH: [ 991181 ] Disable 'Goto Line' outside reduced locationpane bars
208 Src: LocationView.cpp
209 PATCH: [ 990365 ] Dialog to ask about saving modified files
210 Src: Merge.dsp Merge.rc MergeDoc.cpp resource.h
211 Src new files: SaveClosingDlg.cpp SaveClosingDlg.h
212 Src/Languages: *.rc resource.h
215 PATCH: [ 988494 ] Catalan translation update
216 Submitted by Jordi Vilar
217 Src/Languages/Catalan: MergeCatalan.rc
218 Src/Languages/Catalan/res: splash1.bmp
221 PATCH: [ 987122 ] Horizontal scroll for dirview columns dialog listboxes
222 Src: DirColsDlg.cpp DirColsDlg.h Merge.dsp Merge.rc
223 Src/Common new files: HScrollListBox.cpp HScrollListBox.h
227 PATCH: [ 986794 ] Hide 'Apply' button from filters dialog
229 PATCH: [ 986785 ] Improve location pane with short files
230 Src: LocationView.cpp LocationView.h
231 PATCH: [ 986873 ] Allow recursive compares for archive files
235 PATCH: [ 983265 ] Italian translation updated for latest experimental version
236 Src/Languages/Italian: MergeItalian.rc
238 2004-07-04 WinMerge experimental release 2.1.7.9 (cvs)
241 Add lost piece of PATCH: [ 982960 ] Rescan when saving to update dir compare status
245 PATCH: [ 984520 ] Don't add '...' items as fileaction targets
249 PATCH: [ 982960 ] Rescan when saving to update dir compare status
250 Src: DiffContext.cpp DiffContext.h DirDoc.cpp DirDoc.h MergeDoc.cpp
251 MergeDoc.h MergeEditView.cpp
252 PATCH: [ 983410 ] Warn that New clears dircompare results
253 Src: MainFrm.cpp Merge.rc resource.h
254 Src/Languages: *.rc resource.h
255 PATCH: [ 983721 ] Remove 'don't show again' checkbox from saving messages
257 PATCH: [ 984059 ] Disable merge actions for '...' item in dir compare
261 PATCH: [ 982683 ] Clear results only after user chooses new files or folders
263 PATCH: [ 982703 ] Open manual when user presses F1
264 Src: MainFrm.cpp MainFrm.h Merge.cpp Merge.h Merge.rc
268 BUG: [ 981796 ] Dir compare : rescan clears "auto-prediffer"
270 PATCH: [ 981529 ] remove hide .BAK from menu
271 Filters: Merge_GnuC_loose.flt Merge_VB_loose.flt Merge_VC_loose.flt
272 Src: MainFrm.cpp MainFrm.h Merge.rc resource.h
273 Src/Languages: *.rc resource.h
276 PATCH: [ 981468 ] Properly handle different commentstyles for Pascal
277 Src/editlib: pascal.cpp
278 PATCH: [ 981526 ] Don't ignore one-char lines in syntax highlight
279 Src/editlib: asp.cpp basic.cpp batch.cpp cplusplus.cpp csharp.cpp dcl.cpp
280 fortran.cpp html.cpp ini.cpp is.cpp java.cpp lisp.cpp pascal.cpp perl.cpp
281 php.cpp python.cpp rexx.cpp rsrc.cpp siod.cpp sql.cpp tex.cpp xml.cpp
284 PATCH: [ 981290 ] Updated Swedish MergeSwedish.rc file
285 Submitted by Hans Eriksson
286 Src/Languages/Swedish: MergeSwedish.rc
289 PATCH: [ 980851 ] Don't save VSS password
291 PATCH: [ 978987 ] [RFE 976364] Expand Environment Strings in paths
292 Submitted by Jordi Vilar - minor tweak by Kimmo
295 2004-06-23 WinMerge experimental release 2.1.7.8 (cvs)
298 PATCH: [ 977587 ] Fix fileattrib handling and show all attribs in dir compare
299 Src: DiffFileInfo.cpp DiffFileInfo.h DirScan.cpp DirView.cpp
300 PATCH: [ 977796 ] Make dir compare column cust. dialog usable from keyboard
301 Src: DirColsDlg.cpp DirColsDlg.h
302 BUG: [ 936525 ] RO not removed in refresh
303 Don't set files/dirs with RO fileflag RO in UI - this was bad idea!
304 Src: DirView.cpp MainFrm.cpp
305 BUG: [ 978062 ] VSS support broken
307 PATCH: [ 978393 ] Better VSS errormessages
308 Src: MainFrm.cpp MainFrm.h Merge.rc resource.h
309 Src/Languages: *.rc resource.h
312 PATCH: [ 977475 ] Log DeleteFile() failure in FileTransform.cpp
313 Src: FileTransform.cpp
314 PATCH: [ 977479 ] Delete non-functional line in CPatchDlg::SaveSettings()
318 BUG: [ 974662 ] Inconsistent menutexts for dircompare column dialog
319 Scr: DirView.cpp Merge.rc resource.h
320 Src/Languages: *.rc resource.h
323 PATCH: [ 975187 ] getDefaultCodepage, use UI language only when UI not english
324 Src/common: unicoder.cpp
327 PATCH: [ 972500 ] Italian translation updated
328 Submitted by Andrea Decorte
329 Src/Languages/Italian: MergeItalian.rc
330 PATCH: [ 975025 ] Fix column number in file compare statusbar
331 Src: MergeEditView.cpp
332 RFE: [ 891123 ] Short format for line info in file compare
335 PATCH: [ 976255 ] Add total columns and current char to lineinfo
336 Src: ChildFrm.cpp ChildFrm.h Merge.rc MergeEditStatus.h MergeEditView.cpp
340 PATCH: [ 975432 ] Add codepage detection option to configlog
341 Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
344 PATCH: [ 974714 ] detect codepage when open documents directly, small update
346 PATCH: [ 974714 ] detect codepage when open documents directly
347 Src: DiffContext.cpp MainFrm.cpp MainFrm.h
348 Src/Common: UniFile.cpp UniFile.h
349 PATCH: [ 975213 ] warn when codepages differ
350 Src: MainFrm.cpp Merge.rc resource.h
351 Src/Languages: *.rc resource.h
354 BUG: [ 930574 ] Remove old and unused undo-code
355 Src: MergeDoc.h MergeDoc.cpp
358 Remove commented out functions ExpandTabs() and Tabify()
359 Src: MergeDoc.h MergeDoc.cpp
362 PATCH: [ 972108 ] use getDefaultCodepage for document with no codepage
364 Src/Common: UniFile.cpp unicoder.cpp unicoder.h
365 PATCH: [ 973029 ] Scroll when more than 65536 characters
366 Src/Common: SplitterWndEx.cpp
367 Src/editlib: ccrystaltextview.cpp
368 widen labels in colors dialog
373 PATCH: [ 972575 ] Goto real line from location pane
374 Src: LocationView.cpp LocationView.h
375 Add instructions for generating HTML documentation using SF.net shell server
376 Docs/Developers: readme-developers.html
379 PATCH: [ 972188 ] Add More Pascal comments styles to syntax highlight
380 Src/editlib: pascal.cpp
383 PATCH: [ 972290 ] In LoadFromFile, free the handle before deleting temp files
385 PATCH: [ 972296 ] GetLineCount in MergeDoc must test validity of buffers
386 Src: LocationView.cpp MergeDoc.cpp MergeDoc.h
387 declare GetLeftView()/GetRightView()/GetLeftDetailView()/GetRightDetailView() as const
391 PATCH: [ 972007 ] Japanese translation update(2) ; submitted by Takashi Sawanaka
392 Src/Languages: UpdateAll_resource_h.bat
393 Src/Languages/Japanese: MergeJapanese.rc
394 PATCH: [ 971862 ] Various Updates in German Translation ; submitter : Tim Gerundt
395 Src/Languages/German: MergeGerman.rc
397 2004-06-12 WinMerge experimental release 2.1.7.7 (cvs)
400 BUG: [ 970936 ] Cannot merge last diff
401 Src: MergeDiffDetailView.cpp
402 PATCH: [ 970991 ] Force redraw after changing moved block option
403 Src: LocationView.cpp
404 PATCH: [ 970221 ] Keep overlay mode after Rescan
405 Src/editlib: ccrystaltextview.cpp
408 BUG: [ 969922 ] inconsistent 'options' dialog behavior
409 Fix enabling/disabling 'Apply to unrecognized side' checkbox in Editor options
411 BUG: [ 970940 ] Location pane bars not shown if syntax highlight disabled
412 Src: LocationView.cpp
413 BUG: [ 969922 ] inconsistent 'options' dialog behavior
414 Fix enabling/disabling 'Enable advanced menu' checkbox in System options
415 Src: PropRegistry.cpp PropRegistry.h
418 BUG: [ 969922 ] inconsistent 'options' dialog behavior
419 Remove 'Apply' button from options-dialog
421 BUG: [ 826560 ] CVssPrompt::OnInitDialog neglects to notice failure in open
422 Also inform user if VSS databases not found
423 Src: Merge.rc resource.h VssPrompt.cpp
424 Src/Languages: *.rc resource.h
425 PATCH: [ 970478 ] Cleanup VCS/VSS code part 1
426 Src: MainFrm.cpp MainFrm.h Merge.rc resource.h
427 Src/Languages: *.rc resource.h
430 PATCH: [ 968887 ] UI for codepage detection
431 Src: DiffContext.cpp DiffContext.h DiffWrapper.cpp DiffWrapper.h DirDoc.cpp
432 MainFrm.cpp Merge.rc OptionsDef.h PropGeneral.cpp PropGeneral.h resource.h
433 Src/Languages: *.rc resource.h
436 PATCH: [ 969277 ] Color options for moved blocks
437 Src: MainFrm.cpp Merge.rc MergeEditView.cpp MergeEditView.h OptionsDef.h
438 PropColors.cpp PropColors.h resource.h
439 Src/Languages: *.rc resource.h
442 PATCH: [ 968504 ] Add Goto Line to location pane context menu
443 Src: LocationView.cpp LocationView.h Merge.rc resource.h
444 Src/Languages: *.rc resource.h
445 PATCH: [ 968960 ] Add moved blocks setting to configlog
446 Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
449 [ 967406 ] Add .clw to filtered out files in MakePatchDirs
450 Filter out also clw files in MSVC filter. Bump version to 1.2.2.0.
451 MakePatchDirs: MakePatchDirs.rc MakePatchDirsDlg.cpp
452 [ 967315 ] Remove needless cast in unicoder.cpp:CrossConvert
453 Src/Common: unicoder.cpp
456 BUG: [ 967899 ] Ignore carriage return differences logic backwards
458 PATCH: [ 968255 ] Rename EOL sensitive in configlog
460 PATCH: [ 967700 ] Add Goto-items to location pane context menu
461 Src: LocationView.cpp Merge.rc MergeEditView.h resource.h
462 Src/Languages: *.rc resource.h
465 PATCH: [ 966693 ] set scroll width in diffpane for widest view
466 Src: MergeDiffDetailView.cpp MergeDiffDetailView.h
467 Src\editlib: ccrystaltextview.h
468 PATCH: [ 963124 ] better name for variable for Undo/deleteText
469 Src: GhostTextBuffer.cpp GhostTextBuffer.h
472 Updated Catalan translation from Jordi Vilar
473 Src/Languages: Catalan/MergeCatalan.rc
476 BUG: [ 959729 ] View menu show-items disabled in mergeview
477 Second try, renumber items in editlib/editcmd.h
478 Src/editlib/editcmd.h
481 update for MergeSwedish.rc ; contribution from Hans Eriksson
482 Language/Swedish: MergeSwedish.rc
484 2004-06-04 WinMerge experimental release 2.1.7.6 (cvs)
487 PATCH: [ 965950 ] Simplify and fix Open-dialog extension parser
491 BUG: [ 964242 ] WinMerge getting slower loading and showing files
492 Src/Common: unicoder.cpp
495 PATCH: [ 963814 ] Cosmetic: fix call in OpenDlg to LoadPosition
500 PATCH: [ 964665 ] And another unneeded include in DirDoc.h
504 PATCH: [ 964497 ] fix display of moved block in detail pane
505 Src: MergeDiffDetailView.cpp
508 BUG: [ 964885 ] ColExtGet() returns extension converted to lowercase
509 Src: DirViewColItems.cpp
512 PATCH: [ 964678 ] New MergeJapanese.rc file
513 Src/Languages: Japanese/MergeJapanese.rc etc
514 Update "18 languages" to "19 languages"
515 Docs\Developers: readme-developers.html
516 PATCH: [ 964661 ] Remove unneeded include from DirDoc.h
517 Src: 7Common.cpp DirDoc.h
518 PATCH: [ 964664 ] Remove another unneeded include from DirDoc.h
519 Src: 7Common.h DirDoc.h
522 BUG: [ 963820 ] Cutting off trailing chars in opendlg
524 Src/Common: CoreTools.cpp
527 PATCH: [ 948368 ] display moved blocks in location bar
528 Src: DiffWrapper.cpp DiffWrapper.h LocationView.cpp LocationView.h MainFrm.cpp
529 Merge.rc MergeDoc.cpp MergeDoc.h OptionsDef.h resource.h
530 Src/Languages: *.rc resource.h
531 PATCH: [ 960455 ] Clip text in DrawLineHelperImpl
532 Src/editlib: crystaltextview.cpp
535 PATCH: [ 963804 ] Report also thread codepage in config
539 Backout patch for BUG: [ 959729 ] View menu show-items disabled in mergeview
540 It caused bug #963299 Can't execute 2.1.7.5 under Windows 98
541 Src/editlib/editcmd.h
544 PATCH: [ 963092 ] Cannot compile LanguageSelect.cpp using MSVC Japanese Ver.
545 Src/Common: LanguageSelect.cpp
546 Src/editlib: crystaltextview.cpp cs2cs.cpp
547 PATCH: [ 962460 ] Add codepage & locale info to config log
549 PATCH: [ 962538 ] In Rescan, set status to binary if caller said so
551 PATCH: [ 963438 ] Fix selection of language in dialog
552 Src/Common: LanguageSelect.cpp
555 PATCH: [ 963019 ] keyboard shortcuts in replace dialog
556 Submitted by Takashi Sawanaka
559 PATCH: [ 913743 ] Icons for menuitems (RFE 873697) - 16-color icons, 3 new icons
560 Submitted by Tim Gerundt
561 Src: MainFrm.cpp Merge.rc
562 Src/res: cascade.bmp change_pane.bmp close.bmp error.bmp exit.bmp
563 go_to.bmp horizontally.bmp language.bmp replace.bmp select_font.bmp
564 unknown.bmp vertically.bmp
565 Src/res new files: customize_columns.bmp filters.bmp select_all.bmp
566 Src/languages: *.rc resource.h
567 Src/languages/res: same changes than in Src/res
568 PATCH: [ 962509 ] Copy pathnames and filenames from directory compare
569 Src: DirView.cpp DirView.h Merge.rc resource.h
570 Src/languages: *.rc resource.h
571 BUG: [ 962449 ] Zip* items in dircompare context menu don't have help text
576 BUG: [ 909779 ] Uninitialised variable in CGhostTextBuffer::DeleteText() ; fix the fix !
577 Src: GhostTextBuffer.cpp
578 PATCH: [ 963118 ] variable name fix in CGhostTextBuffer::Undo
579 Src: GhostTextBuffer.cpp
582 PATCH: [ 962558 ] Some MBCS fixes from sawanaka
583 Src: paths.cpp paths.h StdAfx.cpp StdAfx.h
584 Src/Common: coretools.cpp
585 PATCH: [ 962539 ] Add ResetInit which handles partly full buffers
587 Src/editlib: ccrystaltextbuffer.h
590 PATCH: [ 961810 ] Store path for ShellExtension
591 ShellExtension: resource.h ShellExtension.cpp ShellExtension.rc
592 WinMergeShell.cpp WinMergeShell.h
593 PATCH: [ 961780 ] ShellExtension advanced menu - UI
594 Src: Merge.rc PropRegistry.cpp PropRegistry.h resource.h
595 Src/Languages: *.rc resource.h
596 PATCH: [ 962348 ] Center OpenDialog to MainFrame
597 Src: OpenDlg.cpp OpenDlg.h
600 Updated WinMerge Localized.iss from seier (manifest & plugins.txt changes)
601 InnoSetup: WinMerge Localized.iss
602 PATCH: [ 945759 ] Move to location when double-click location view
603 Src/Common: LocationView.cpp LocationView.h
604 BUG: [ 961901 ] Possible overflow bug in SplitFilename
605 Src/Common: coretools.cpp
606 New InnoSetup/Languages/Japanese.isl from sawanaka
607 From url posted in discussion in BUG [ 958805 ] 2 bytes display error
608 (I removed the entry for English before checking it in, as there is no English satellite DLL)
609 InnoSetup: Languages/Japanese.isl
611 2004-05-29 WinMerge experimental release 2.1.7.5 (cvs)
614 BUG: [ 959729 ] View menu show-items disabled in mergeview
615 Src/editlib: editcmd.h
618 PATCH: [ 960771 ] disable .. in dirview if upward move is not reversible
619 Src: DirView.cpp DirView.h Merge.rc resource.h
620 Src/res Add: folderup.bmp folderup_disable.bmp
621 Src/Languages: *.rc resource.h
622 Src/Languages/res Add: folderup.bmp folderup_disable.bmp
623 PATCH: [ 961304 ] WinDiff-compatible (F7/F8) keybindings for next/prev diff
624 submitted by Krzysztof Kowalczyk
629 PATCH: [ 960996 ] 'backspace' key in dirview for parent directory
630 Src: DirView.cpp DirView.h
633 PATCH: [ 959843 ] Fix codepage initialization to thread default
634 Src: DiffWrapper.cpp DiffWrapper.h DirScan.cpp DirScan.h Merge.cpp
635 Src/Common: unicoder.cpp
636 Localized some language names into Catalan
637 Src/Languages: MergeCatalan.rc
640 Added a few more native or ASCII language names (Albanian, Arabic, Armenian
641 Belarusian, Croatian, Estonian, Farsi, Georgian, Greek, Urdu)
642 Src/Common: LanguageSelect.cpp
645 PATCH: [ 960265 ] Don't show size for folder or non-existing file
646 Src: DiffFileInfo.cpp DiffFileInfo.h DirScan.cpp DirViewColItems.cpp
649 PATCH: [ 959468 ] A patch for "Bug [ 958805 ] 2 bytes display error".
651 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
654 (cosmetic) Update edit dates in file headers
655 Src/Common: unicoder.cpp unicoder.h
656 Localized language names into Russian
657 Src/Languages: MergeRussian.rc
658 Localized language names into Bulgarian
659 Src/Languages: MergeBulgarian.rc
662 PATCH: [ 959627 ] Fix crash when opening context menu for '..' item in dirview
663 Src: DirActions.cpp DirView.cpp
664 BUG: [ 880104 ] CCCPrompt--does it work at all?
665 Disable "Save as..." button since its not used
668 RFE [ 950290 ] Use MS Shell Dlg font in dialogs
669 Convert Chinese and Korean translations too
670 Src/Languages: MergeChineseSimplified.rc MergeChineseTraditional.rc MergeKorean.rc
671 PATCH: [ 959503 ] Enable word deletion function(Ctrl+Del)
672 Submitted by Takashi Sawanaka
673 Src/editlib: editcmd.h editres.rc
676 PATCH: [ 950243 ] 2 minor updates to developers docs
677 Docs/Developers: readme-developers.html
678 Localized language names into Italian
679 Src/Languages: MergeItalian.rc
682 PATCH: [ 958973 ] CDiffTextBuffer::LoadFromFile wrong return
686 PATCH: [ 959111 ] Optionally don't disable Open-dialog OK-button
687 Src: MainFrm.cpp Merge.rc OpenDlg.cpp OptionsDef.h PropGeneral.cpp
688 PropGeneral.h resource.h
689 Src/Languages: *.rc resource.h
692 Fix compilation (trailing comma in CCrystalTextView::m_SourceDefs)
693 Src/editlib: ccrystaltextview.cpp
696 PATCH: [ 958938 ] Better way to close WinMerge with ESC (-e switch)
697 Src: MainFrm.cpp MainFrm.h Merge.cpp Merge.h
698 PATCH: [ 959035 ] Registry value for enabling logging
699 Src: MainFrm.cpp OptionsDef.h
700 Add note about logging (patch #959035]
701 Docs/Developers: readme-developers.html
702 RFE: [ 934419 ] Syntax highlighting *.cls with Visual Basic (basic.cpp)
703 Submitted by Tim Gerundt
704 Src/editlib: ccrystaltextview.cpp
707 PATCH: [ 893202 ] Bug fixed for DBCS text edit (Attach again)
708 Src\editlib: ccrystaleditview.cpp ccrystaltextview.cpp
710 2004-05-23 WinMerge experimental release 2.1.7.4 (cvs)
713 PATCH: [ 957317 ] Broken menu in Winmerge 2.1.7.3
715 Src/Common: LanguageSelect.cpp
716 typo in russian language : APTION -> CAPTION
717 Src/Languages/Russian: MergeRussian.rc
720 PATCH: [ 958478 ] Allow ESC close WinMerge if no open docs
721 Src: MainFrm.cpp MainFrm.h
724 Localized language names into Portuguese
725 Src/Languages: MergeBrazilian.rc
728 PATCH: [ 958122 ] Add C# syntax highlight
730 Src/editlib: crystaltextview.cpp crystaltextview.h
731 Src/editlib new file: csharp.cpp
732 RFE: [ 950290 ] Use MS Shell Dlg font in dialogs
734 Src/Languages: *.rc, except MergeChineseSimplified.rc
735 Merge ChineseTraditional.rc, MergeKorean.rc
738 Localized language names into French
739 Src/Languages: MergeFrench.rc
740 Updates to Spanish localized language names
741 Src/Languages: MergeSpanish.rc
742 BUG: [ 898924 ] Lang order in Language selection dialog?
743 RFE: [ 953015 ] sort language names
744 Mark listbox in language dialog as sorted
746 Src/Languages: Merge*.rc
749 Fix PATCH [ 957740] - declare CMergeDoc::CompareBinaries
751 Updated WinMerge Localized.iss from seier (add Swedish Readme after install)
752 InnoSetup: WinMerge Localized.iss
753 Updated Swedish ReadMe from seier
754 Docs/Users/Languages: Read Me-Swedish.rtf
755 Updated all non-localized language versions of Read Me*.rtf to current Read Me.rtf
756 Docs\Users\Languages: Read Me*.rtf (except Swedish)
757 Remove all localization Contributors*.rtf
758 Docs\Users\Languages: removed Contributors*.rtf
761 PATCH: [ 957740 ] Tell if two binary files are different/identical
762 Src: DiffWrapper.cpp DiffWrapper.h Merge.rc MergeDoc.cpp resource.h
763 Src/Languages: *.rc resource.h
766 PATCH: [ 947680 ] Organize resource strings, part 2 (IDD and IDB)
768 Src/Languages: resource.h
771 PrivateBuild in version resource must be empty string in CVS.
776 Localized language names into Korean
777 Src/Languages: MergeKorean.rc
780 PATCH: [ 956893 ] Fix toolbar problem with XP themes and VC6
781 Src: MainFrm.cpp Merge.cpp
782 PATCH: [ 954991 ] Add directory compare column descriptions
783 Src: DirColsDlg.cpp DirColsDlg.h DirView.h DirViewColHandler.cpp
784 DirViewColItems.cpp Merge.rc resource.h
785 Src/Languages: *.rc resource.h
788 PATCH: [ 955408 ] Select first item in dir compare
790 PATCH: [ 956044 ] Don't select '..' and don't skip unique folders in dirview
794 PATCH: [ 955573 ] Swedish localization of Read Me.rtf
795 Docs/User/Languages: Read Me-Swedish.rtf
797 2004-05-18 WinMerge experimental release 2.1.7.3 (cvs)
800 PATCH: (continued) [ 942021 ] Propose translation of language names
801 Src/Languages: MergeBrazilian.rc MergeBulgarian.rc MergeCatalan.rc
802 MergeChineseSimplified.rc MergeChineseTraditional.rc
803 MergeKorean.rc MergeRussian.rc
804 BUG: [ 955550 ] Slovak rc file broken (typo)
805 Src/Languages: MergeSlovak.rc
806 BUG: [ 955553 ] Russian rc file broken
807 Src/Languages: MergeRussian.rc
808 BUG: [ 955557 ] Chinese traditional rc file broken (cvs)
809 Src/Languages: MergeChineseTraditional.rc
812 PATCH: [ 955411 ] Remove non-functional firstdiff selection
813 Src: DirView.h MainFrm.cpp
816 Fix build error, VC6 doesn't like CList::GetSize()
818 PATCH: [ 952877 ] Return better results from Rescan()
819 Src: MergeDoc.cpp MergeDoc.h
822 PATCH: [ 952825 ] Cleanup VSS dialog layout
825 PATCH: [ 952586 ] Improve readonly file and folder handling
826 Src: DirActions.cpp MainFrm.cpp MainFrm.h Merge.rc MergeDoc.cpp resource.h
827 Src/Languages: *.rc resource.h
828 PATCH: [ 948592 ] Open and select filefilter from Open-dialog
829 Src: FileFiltersDlg.cpp MainFrm.cpp MainFrm.h Merge.cpp Merge.h
830 Merge.rc OpenDlg.cpp OpenDlg.h resource.h
831 Src/Languages: *.rc resource.h
834 Backout last change to Merge.rc - restore version 1.187
836 BUG: [ 953232 ] Some lang-files broken
837 Backout last changes to lang files (see bug item for details)
838 Src/Languages: MergeBulgarian.rc MergeChineseSimplified.rc
839 MergeChineseTraditional.rc MergeKorean.rc MergeRussian.rc
840 PATCH: [ 953056 ] Rename 'Sensitive to EOL' option
843 PATCH: [ 953515 ] Improve LocationPane drawing code
844 Src: LocationView.cpp
847 PATCH: [ 950530 ] Remove unneeded cast in DirView.cpp
849 PATCH: [ 945722 ] Two functions are never called
850 Src: DiffContext.cpp DiffContext.h
851 PATCH: [ 945152 ] Installer: My last revisions
852 InnoSetup: WinMerge Localized.iss
853 InnoSetup/Languages: *.isl (except Swedish.isl)
854 PATCH: [ 950236 ] Set DIFFCODE::BOTH correctly
856 PATCH: [ 942021 ] Propose translation of language names
858 Src/Common: LanguageSelect.cpp LanguageSelect.h
860 PATCH: [ 950212 ] wrong language shown in LanguageSelect
861 Src/Common: LanguageSelect.cpp
862 BUG: [ 876539 ] Wrong textinclude language def in ChineseTraditional
863 Src/Languages: ChineseTraditional.rc
864 Translate language names into Dutch (follow-up to PATCH#942021)
865 Src/Languages: MergeDutch.rc
866 Add a few more native language names
867 Src/Common: LanguageSelect.cpp
870 PATCH: [ 948448 ] Remove WinMerge.exe path from system options
871 Src: Merge.rc PropRegistry.cpp PropRegistry.h resource.h
874 PATCH: [ 948528 ] Build BCMenu after select language
875 Src: MainFrm.cpp MainFrm.h Merge.cpp
876 Src\Common: LanguageSelect.cpp
879 Fix MakePatchDirs to ignore BuildTmp.
880 MakePatchDirs: ChangeLog.txt MakePatchDirs.rc MakePatchDirsDlg.cpp
883 PATCH: [ 951404 ] Add statusmessage for dircompare copy/delete ops
884 Src: DirActions.cpp Merge.rc resource.h
885 Src/Languages: *.rc resource.h
888 PATCH: [ 945467 ] Remove ReleaseMinsize and UnicodeReleaseMinsize
890 Src/Languages: CopyAll.bat
893 PATCH: [ 951234 ] Use resourceIDs in dircompare statebar bitmpaps
898 apply again modifications to IDS_QUICKHELP, lost during PATCH: [ 947680 ]
900 Src\Languages\Swedish: MergeSwedish.rc
903 PATCH: [ 947680 ] Organize resource strings
904 Src: CCPrompt.cpp DiffWrapper.cpp DirFrame.cpp MainFrm.cpp Merge.rc MergeDoc.cpp
905 PropGeneral.cpp VssPrompt.cpp resource.h
906 Src\editlib: ccrystaltextview.cpp ccrystaltextview.h editcmd.h
907 Src\Common: LanguageSelect.h
908 Src\Languages: *.rc resource.h
910 2004-05-08 WinMerge experimental release 2.1.7.2 (cvs)
913 update for MergeSwedish.rc ; contribution from Hans Eriksson
914 Language/Swedish: MergeSwedish.rc
917 PATCH: [ 949428 ] Show VSS dialogs only once
918 Src: DirActions.cpp MainFrm.cpp MainFrm.h Merge.rc resource.h
919 Languages: *.rc resource.h
920 BUG: [ 947121 ] ShellExtension does not compile with Visual Studio 2003
921 ShellExtension: ShellExtension.dsp
922 BUG: [ 941335 ] RC file missing strings and errors
927 PATCH: [ 948366 ] clear moved blocks before Rescan
928 Src: DiffWrapper.cpp DiffWrapper.h MergeDoc.cpp
931 PATCH: [ 948634 ] Commandline switch to open left/right side as readonly
932 Src: Merge.cpp Merge.rc
936 PATCH: [ 947232 ] Add primary path to WinMerge.exe for ShellExtension
937 ShellExtension: ShellExtension.rc WinMergeShell.cpp
940 PATCH: [ 947599 ] Remove EditFile.cpp EditFile.h
941 Src remove: EditFile.cpp EditFile.h
942 Src: Merge.dsp Merge.rc resource.h
943 Languages: *.rc resource.h
946 PATCH: [ 942565 ] Option for closing windows with ESC
947 Src: DirDoc.cpp DirView.cpp DirView.h MainFrm.cpp Merge.rc MergeEditView.cpp
948 MergeEditView.h OptionsDef.h PropGeneral.cpp PropGeneral.h resource.h
949 Languages: *.rc resource.h
950 PATCH: [ 946550 ] [MergeMode] Don't try to merge if diff not selected
951 Src: MergeEditView.cpp
954 PATCH: [ 946091 ] Fix for GetLineActualLength
955 Src/editlib: ccrystaltextview.cpp
958 PATCH: [ 936842 ] Custom message when same file in both panels
959 Src: Merge.rc MergeDoc.cpp resource.h
960 Languages: *.rc resource.h
963 PATCH: [ 833180 ] Filters dialog
964 Src new files: FileFiltersDlg.cpp FileFiltersDlg.h
965 Src: MainFrm.cpp MainFrm.h Merge.dsp Merge.rc
966 PropFilter.cpp PropFilter.h resource.h
967 Languages: *.rc resource.h
970 PATCH: addon to [ 941623 ] Propose moving IDC_COMPARISON_STOP to block with ...CLOSE
975 PATCH: [ 941979 ] Add cast to suppress VS.NET 2002 warning
977 PATCH: [ 927929 ] Reload language menus after resources hooked
979 PATCH: [ 941623 ] Propose moving IDC_COMPARISON_STOP to block with ...CLOSE
982 Languages: MergeBrazilian.rc MergeBulgarian.rc MergeCatalan.rc
983 MergeChineseSimplified.rc MergeChineseTraditional.rc MergeCzech.rc
984 MergeDanish.rc MergeDutch.rc MergeFrench.rc MergeGerman.rc MergeItalian.rc
985 MergeKorean.rc MergeNorwegian.rc MergePolish.rc MergeRussian.rc
986 MergeSlovak.rc MergeSpanish.rc MergeSwedish.rc
987 PATCH: [ 909761 ] Misplaced return in CDirView::ValidateColumnOrdering()?
988 Src: DirViewColHandler.cpp
991 PATCH: [ 941982 ] Fix VS6 compilation
992 Src/Common: MessageBoxDialog.cpp MessageBoxDialog.h
995 PATCH: [ 943149 ] Contributors fix
996 Src: Merge.cpp Merge.rc
998 Docs/Users/Contributors.txt
999 Removed: Docs/Users/Contributors.rtf
1000 BUG: [ 944290 ] Crash when deleting files
1004 PATCH: [ 937947 ] Open-dialog improvements (no codepage controls)
1005 Src: Merge.rc OpenDlg.cpp OpenDlg.h resource.h
1006 Languages: *.rc resource.h
1009 RFE: [ 942591 ] Loose filter for Visual Basic
1010 Submitted by Tim Gerundt
1011 Filters new file: Merge_VB_loose.flt
1012 PATCH: [ 930482 ] Add comments to filter: Merge_GnuC_loose.flt
1013 Submitted by Tim Gerundt
1014 Filters: Merge_GnuC_loose.flt
1017 BUG: [ 940709 ] Dircompare column widths saved only when WinMerge closed
1019 Src: DirViewColHandler.cpp
1022 PATCH: [ 941986 ] Remove blank lines in popup dirview menu in Merge.rc
1025 2004-04-25 WinMerge experimental release 2.1.7.1 (cvs)
1028 More removing obsolete keywords to sync languages to English
1029 Languages: MergeDutch.rc MergeFrench.rc MergeGerman.rc
1030 MergeItalian.rc MergeKorean.rc MergeNorwegian.rc
1033 PATCH: [ 941524 ] Reset dircompare column widths
1034 Src: DirColsDlg.cpp DirColsDlg.h DirView.cpp DirView.h DirViewColHandler.cpp
1035 PATCH: [ 941545 ] Fix Shift-Arrow to select text in merge mode
1036 Src: MergeEditView.cpp
1039 More removing obsolete keywords to sync languages to English
1040 Languages: MergeCatalan.rc MergeChineseSimplified.rc
1041 MergeChineseTraditional.rc MergeCzech.rc MergeDanish.rc
1042 MergeFrench.rc MergePolish.rc
1045 More removing obsolete keywords to sync languages to English
1047 Languages: MergeBrazilian.rc MergeSpanish.rc MergeSwedish.rc
1048 More removing obsolete keywords to sync languages to English
1050 Languages: MergeRussian.rc MergeSlovak.rc MergeSpanish.rc
1052 More removing obsolete keywords to sync languages to English
1053 Languages: MergeBrazilian.rc MergeSlovak.rc MergeSpanish.rc
1057 BUG: [ 939245 ] Location Bar don't show diff in first line
1058 Src: LocationView.cpp
1059 PATCH: [ 938822 ] Enable merge items in file compare context menu
1064 PATCH: [ 941014 ] Various Updates in German Translation (Tim Gerundt)
1065 (Except I didn't remove the synchro comments)
1066 Languages: MergeGerman.rc
1067 Added synchro comments to Merge.rc. Synchronized various languages to English.
1069 Languages: MergeBrazilian.rc MergeBulgarian.rc MergeCatalan.rc
1070 MergeChineseSimplified.rc MergeChineseTraditional.rc
1071 MergeCzech.rc MergeDanish.rc MergeFrench.rc MergeGerman.rc
1075 PATCH: [ 940713 ] Fix for resetting dirview columns
1076 Src: DirViewColHandler.cpp
1077 Remove deprecated keywords from RC file I added in when applying #936682.
1079 PATCH: [ 940089 ] Add Binary column and shorten short result
1080 Src: DirViewColHandler.cpp DirViewColItems.cpp Merge.rc resource.h
1081 Languages: *.rc resource.h
1082 PATCH: [ 940036 ] Add missing dirview column table indexes
1083 Src DirViewColHandler.cpp
1086 PATCH: [ 936682 ] Highlight syntax in unrecognized side
1087 Src: MainFrm.cpp Merge.rc MergeDoc.cpp OptionsDef.h PropEditor.cpp
1088 PropEditor.h resource.h
1089 Languages: *.rc resource.h
1092 PATCH: [ 938609 ] Merge mode (simplified)
1093 Src: MainFrm.cpp Merge.rc MergeDoc.cpp MergeDoc.h MergeEdiView.cpp
1094 MergeEditView.h OptionsDef.h resource.h
1095 Languages: *.rc resource.h
1096 BUG: [ 939548 ] Location bar crash if diff at end missing last line EOL
1097 Src: LocationView.cpp
1099 2004-04-20 WinMerge experimental release 2.1.7.0 (cvs)
1102 Syntax correction for Unicode
1106 BUG:[ 938373 ] Filtering broken - infinite loop when file filtered
1110 updated swedish translation
1111 Submitted by Hans Eriksson <hans.ericson@bredband.net>
1112 Languages/Swedish: MergeSwedish.rc
1115 PATCH: [ 929210 ] GUI for prediffer (compare two files)
1116 Src: DiffWrapper.cpp DirView.cpp MainFrm.cpp MainFrm.h Merge.rc MergeDoc.cpp MergeEditView.cpp
1117 MergeEditView.h resource.h
1118 Languages: *.rc resource.h
1121 Fix English typos in Localization Instructions.txt
1122 InnoSetup/Languages/Localization Instructions.txt
1125 PATCH [ 937535 ] Updated syntax highlighting for resources files (*.rc)
1126 Submitted by Tim Gerundt
1127 Src/editlib: rsrc.cpp
1130 BUG: [ 937435 ] cvs doesn't compile -- typo in CMergeDoc::ShowRescanError(
1132 PATCH: [ 937441 ] CMergeEditView:Avoid calling SelectDiff when no current diff
1133 Src: MergeEditView.cpp
1134 BUG: [ 936079 ] castellano options
1135 Src/Languages/Spanish: MergeSpanish.rc
1138 PATCH: [ 934738 ] CopyLeftTo/CopyRightTo Including Common Subdirectories
1139 Submitted by Ben (?) - some modifications by Kimmo
1141 PATCH: [ 930456 ] Allow Copy Left/Right to copy folders too
1143 PATCH: [ 934370 ] Log temp file errors and own errormessage
1144 Src: Merge.rc MergeDoc.cpp MergeDoc.h resource.h
1145 Languages: *.rc resource.h
1148 PATCH: [ 910557 ] Location Bar
1149 Submitted by Vincent Osele
1150 Src: ChildFrm.cpp ChildFrm.h MainFrm.cpp Merge.dsp Merge.rc
1151 MergeDoc.cpp MergeDoc.h MergeEditView.h resource.h
1152 Src new files: LocationBar.cpp LocationBar.h LocationView.h LocationView.cpp
1153 Languages: *.rc resource.h
1156 PATCH: [ 929001 ] Delete commented out "diff_dirs2"
1160 BUG: [ 936824 ] Prediffer not initialized when generate patch
1164 BUG: [ 936524 ] Cannot compare/Cancel,Retry,Continue
1168 Fix for unicode build after patch #935048 -- add _T() around string
1172 PATCH: [ 935048 ] Plugin manager and per-file plugin settings V2
1173 Src: DiffContext.cpp DiffContext.h DiffWrapper.cpp DiffWrapper.h DirActions.cpp DirDoc.cpp DirDoc.h
1174 DirScan.cpp DirView.cpp DirView.h MainFrm.cpp Merge.dsp Merge.rc MergeDoc.cpp MergeDoc.h resource.h
1175 Src Add: PluginManager.cpp PluginManager.h
1178 updated swedish translation
1179 Submitted by Hans Eriksson <hans.ericson@bredband.net>
1180 Languages/Swedish: MergeSwedish.rc
1183 RFE: [ 934446 ] Syntax highlighting for XML files
1184 Submitted by Tim Gerundt
1186 Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
1187 Src/editlib new file: xml.cpp
1190 BUG: [ 926578 ] Division by zero exception
1191 Fix tabsize limits in options dialog
1193 PATCH: [ 934344 ] Reset dircompare columns
1194 Src: DirColsDlg.cpp DirColsDlg.h DirViewColHandler.cpp Merge.rc resource.h
1195 Languages: *.rc resource.h
1198 PATCH: [ 889357 ] Attempt to improve DirScan speed -- updated patch from 2004-03-18
1199 Src: 7zCommon.cpp 7zCommon.h DiffContext.cpp DiffContext.h DiffFileInfo.h
1200 DiffWrapper.cpp DiffWrapper.h DirDoc.cpp DirScan.cpp DirViewColHandler.cpp DirViewColItems.cpp DirViewColItems.h
1202 Merge7z: Merge7z.def Merge7z.h Merge7z311.cpp Merge7zCommon.cpp Merge7z311.dsp Merge7z312.dsp Merge7z313.dsp
1205 PATCH: [ 932086 ] Syntax highlighting of HTML not complete (Bug 930930)
1206 Submitted by Tim Gerundt
1207 Src/editlib: ccrystaltextview.cpp html.cpp php.cpp
1208 Fix typo causing wrong icon for error items in dir compare
1212 BUG: [ 930995 ] Cursor help text ... ; part two : inversion in menu
1217 PATCH: [ 930495 ] Log delete file errors from FileTransform.cpp
1218 Src: FileTransform.cpp
1219 PATCH: [ 930512 ] Log delete file errors from multiformatText.cpp
1220 Src/Common: multiformatText.cpp
1223 BUG: [ 930995 ] Cursor help text ...
1224 Src/Languages/German: MergeGerman.rc
1227 PATCH: [ 929155 ] Add identical folders to dircompare statepane
1228 Src: DirCompStateBar.cpp DirCompStateBar.h DirView.cpp Merge.dsp
1230 Src/res new file: error.bmp
1231 Languages: Merge.rc resource.h res/error.bmp
1232 PATCH: [ 929584 ] Reset scratchpad names
1233 Don't show "Untitled Left/Right" for docs opened after scratchpads
1237 PATCH: [ 928976 ] Handle when selected language not in list
1238 Src/Common: LanguageSelect.cpp
1241 PATCH: [ 914513 ] Move message ids to stdafx.h
1245 Move enum ACT_TYPE, struct action, and typedef DeletedItemList inside of
1246 struct ActionList, of which they are part. Add header comment for ActionList.
1247 Src: DirActions.cpp DirView.h
1250 PATCH: [ 923044 ] Partial compare large files
1251 Plugins: list of sources.txt
1252 Plugins\src_VCPP_WatchBeginningOfLog add: all files
1253 Plugins\src_VCPP_WatchEndOfLog add: all files
1256 PATCH [ 925172 ] Check for presence of Windows Script
1257 Src: ConfigLog.cpp ConfigLog.h Merge.rc MergeEditView.cpp Plugins.cpp Plugins.h resource.h
1260 Change plugins event title 'CONTEXT_MENU' -> 'EDITOR_SCRIPT'
1261 Src: FileTransform.cpp FileTransform.h MergeEditView.cpp Plugins.cpp Plugins.h
1262 Plugins/dlls: editor addin.sct insert datetime.sct list.txt
1263 Plugins: list of sources.txt readme.txt syntax.txt
1264 Plugins/src_VB/ToUpper: WinMergeScript.cls
1267 Remove most of obsolete keywords in rc file (a la Merge.rc 1.149, which didn't have them)
1269 PATCH: [ 927000 ] Russian translation update (based on 1.32)
1270 (Not applied exactly, but updated to match current English Merge.rc (mostly removing obsolete keywords).
1271 Languages: Russian/MergeRussian.rc
1272 Merge Portuguese Brazilian to current English Merge.rc (mostly removing obsolete keywords).
1273 Languages: Brazilian/MergeBrazilian.rc
1276 PATCH: [ 924521 ] Add context menu for file compare
1277 Src: DirView.cpp FilePathEdit.cpp Merge.rc MergeEditView.cpp resource.h
1278 Languages: resource.h *.rc
1281 Fixed Swedish Language had a description of Spanish in the installer.
1282 Fixed Swedish was installing along with Spanish rather than the Swedish component description in the installer.
1283 Src: InnoSetup/WinMerge.iss
1284 Release Notes Table template created in response to the table located at http://sourceforge.net/project/shownotes.php?release_id=226701.
1285 Src: Docs/Users/Release Notes Template.htm
1286 Migration of /UsersGuide --> /Docs/Users/UsersGuide --> /Docs/Users/Guide Documented
1287 Src: Docs/Developers/File Migration Log.htm
1290 PATCH: [ 922724 ] "Don't display again" option for messageboxes
1291 Src: DirActions.cpp DirView.cpp MainFrm.cpp Merge.cpp Merge.dsp Merge.rc
1292 MergeDoc.cpp PatchDlg.cpp PatchTool.cpp PropGeneral.cpp PropGeneral.h StdAfx.h resource.h
1293 Src/editlib: ceditreplacedlg.cpp
1294 Src/common add: MessageBoxDialog.cpp MessageBoxDialog.h
1295 Languages: *.rc resource.h
1298 PATCH: [ 925179 ] Remove is_*file() functions from coretools.h/cpp
1299 Common: coretools.cpp coretools.h
1302 BUG [ 925202 ] broken feature: after save error, save with another filename
1306 PATCH: [ 913743 ] Icons for menuitems (RFE 873697)
1307 File/Exit and Help/Contents icons from Tim Gerundt
1308 Src: MainFrm.cpp Merge.rc resource.h
1309 Src/res new files: exit.bmp help_contents.bmp
1310 Languages: *.rc resource.h
1311 Languages/res: exit.bmp help_contents.bmp
1314 PATCH [ 921788 ] scripts submenu in the main menu
1315 Src: FileTransform.cpp FileTransform.h MainFrm.cpp MainFrm.h Merge.rc
1316 MergeEditView.cpp MergeEditView.h Plugins.cpp Plugins.h resource.h
1317 Src/Languages: *.rc resource.h
1319 2003-03-27 WinMerge beta 2.1.6.0 released
1322 Src/Languages: Bulgarian/MergeBulgarian.rc
1323 Many cosmetic changes to make MergeBulgarian.rc match Merge.rc (mostly dropping obsolete keywords).
1326 [ 847155 ] Utf8len_of_string is wrong for 8-bit
1327 Src/Common: unicoder.cpp unicoder.h
1330 Docs/Users: Contributors.rtf
1331 Add Bulgarian credit to contributors.rtf. Move Portuguese to alphabetically Portuguese.
1334 Fixed Swedish Language had a description of Spanish in the installer.
1335 Fixed Swedish was installing along with Spanish rather than the Swedish component description in the installer.
1336 Src: InnoSetup/WinMerge.iss
1339 Add new Bulgarian translation
1340 Src/Languages/Bulgarian
1343 BUG: [ 918760 ] doxygen.cfg moved
1344 Update paths for new location of doxygen.cfg in docs/developers
1345 docs/developers: doxygen.cfg
1348 HideFirstLetter plugin : fix : open input and output file as binary
1349 Plugins/HideFirstLetter: WinMergeScript.cpp
1351 2004-03-24 WinMerge experimental release 2.1.5.16 (cvs)
1354 BUG: [ 922716 ] "delete both" broken
1358 Add simple comments in action list code
1362 PATCH: [ 921440 ] UI option for detecting moved blocks
1363 Src: DirDoc.cpp MainFrm.cpp Merge.rc MergeDoc.cpp OptionsDef.h
1364 PropCompare.cpp PropCompare.h resource.h
1365 Languages: *.rc resource.h
1368 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.
1369 InnoSetup: desktop.ini
1370 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.
1371 Docs: Users/Manual/screenshots/*.bmp --> *.gif
1372 Docs: Users/Manual/Compare_dirs.xml
1373 Docs: Users/Manual/Compare_files.xml
1376 PATCH: [ 920530 ] Remember Patch-dialog settings
1377 Src: Merge.rc PatchDlg.cpp PatchDlg.h resource.h
1378 Languages: *.rc resource.h
1379 BUG: [ 920965 ] Merging moved block messes up linecolors
1381 BUG: [ 902915 ] Directory compare statepane button text blinks
1382 Fix submitted by Jochen in Patch #889357 Attempt to improve DirScan speed.
1383 Src: DirCompStateBar.cpp
1384 Change directory compare statepane button to defaultbutton
1385 Allows stopping directory compare with Enter-key
1390 PATCH: [ 909672 ] Undo makes marker messy
1391 Src: MergeEditView.cpp
1392 Src/editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h
1395 Installer now also installs WinMerge as the merging application in addition being the differencing application.
1396 Installer updated to use \ShellExtension\ShellExtension.dll as the new location for that file
1397 Installer will now remove the ComCtlupd.exe at the end of the installation.
1398 Patch: [ 919134 ] I added the OleAut32.dll necessary for others to compile the WinMerge.iss script.
1399 Src: /InnoSetup/WinMerge.iss
1400 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.
1401 Src: /Src/Res/Splash2.bmp
1404 PATCH: [ 918545 ] New Splash Screen
1405 Submitted and graphics by Dean Grimm
1406 Src: Splash.cpp Splash.h
1407 Src/res: splash1.bmp
1409 2004-03-19 Christian
1410 PATCH: [ 919134 ] Paths fixed in installer
1411 InnoSetup: WinMerge.iss
1414 BUG: [ 919090 ] Memory leak in DiffFileData
1415 Src: DiffWrapper.cpp
1418 BUG: [ 919160 ] Cannot execute notepad.exe
1419 Fix OpenFileToExternalEditor to prepend space before quoted filename.
1421 PATCH: [ 891498 ] moved block detection
1422 Src: Diff.cpp DiffWrapper.cpp DiffWrapper.h MergeDoc.cpp MergeDoc.h
1423 MergeEditView.cpp MergeEditView.h
1424 Src\diffutils\src: analyze.c DIFF.H
1427 Modified \ShellExtension\Register.bat to also UnRegister via a /U (case-insensitive) parameter.
1428 I also added an UnRegister.bat which does nothing more than call Register.bat with the /u switch.
1429 If you're wondering where a particular file or folder went and why please see \Docs\Developers\File Migration Log.htm.
1430 Everyone can use this file from now on.
1433 PATCH: [ 913743 ] Icons for menuitems (RFE 873697)
1434 More nice icons from Tim Gerundt (Edit/Goto, Edit/Replace, View/Language, View/Font, Window/Change Pane)
1435 Src: MainFrm.cpp Merge.rc resource.h
1436 Src/res new files: change_pane.bmp go_to.bmp language.bmp replace.bmp select_font.bmp
1437 Languages: *.rc resource.h
1438 Languages/res new files: change_pane.bmp go_to.bmp language.bmp replace.bmp select_font.bmp
1439 PATCH: [ 915790 ] Open Contributors.rtf from About dialog
1440 Handle errors if wordpad or associated app couldn't be run.
1444 [Patch 917142] for Installer:
1445 -Now detects whether or not the user requires an updated ComCtl32.dll and if needed updates it.
1446 -Corrupt Shell Extension folder association removed from the registry (no more errors in Windows Explorer)
1447 -Explorer "WinMerge" context menu support added
1448 -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
1449 -Portugese is now listed amongst the other selectable languages in alpahbetic order
1450 -Catalan, Norwegian, Polish, Russian, and Swedish translations have been added to the installer for a total of 17 languages! Way to go
1451 Translators! Eventually we'll all just get lazy and speak Mergish :).
1452 -WinMerge's "User's Guide" and "Read Me" files installed and added to the user's start menu
1453 Program Files\Docs\ created containing:
1457 -The Read Me.rtf was divided into two files: Read Me.rtf and Contributors.rtf
1458 (since this information is non-technical ands considerable bloat to the main Read Me file)
1459 -Obsolete registry settings LeftMax and DirViewMax are now deleted rather than reset
1460 (note: all registry deletions in Inno Setup must have Type set to "None")
1461 -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)
1462 -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)
1465 RFE [ 917196 ] Directory Comparison Results baloon annoyance
1466 Don't show infotip for filename when whole filename is already shown
1468 PATCH: [ 915790 ] Open Contributors.rtf from About dialog
1469 Src: Merge.cpp Merge.rc resource.h
1472 Fix Bulgarian (Cyrillic) spelling of Bulgarian.
1473 Src/Common: LanguageSelect.cpp
1476 RFE: [ 874366 ] Add goto line-number
1477 Scroll line searched to center of view, as suggested by harry mckame
1478 Src: MergeEditView.cpp
1479 Change URLs to point http://winmerge.org
1480 (As discussed in BUG #916674 Hardcoded url to help and website from help-menu)
1481 MainFrm.cpp Merge.cpp
1484 RFE [ 897975 ] Syntax highlighting for INI files
1486 Src/editlib: ini.cpp
1487 Apply icon change (2004-03-13 Seier) to languages
1488 Languages/res: Merge.ico
1489 PATCH: [ 913743 ] Icons for menuitems (RFE 873697)
1490 Submitted by Tim Gerundt
1491 Src: MainFrm.cpp Merge.rc resource.h
1492 Src/res: Toolbar.bmp
1493 Src/res new files: close.bmp
1494 Languages: *.rc resource.h
1496 BUG: [ 916028 ] Deleting unique file does not remove it from view
1500 Add 48*48 icon version (256 & 16 color)
1504 Add User Manual draft to CVS
1505 Docs/Users/Manual: *.*
1506 PATCH: [ 915145 ] Delay automatic close of compare pane
1509 2004-03-13 WinMerge experimental release 2.1.5.15 (cvs)
1512 PATCH: [ 902191 ] Uninline CDiffTextBuffer functions
1513 Src: GhostTextBuffer.cpp MergeDoc.cpp MergeDoc.h
1514 BUG: [ 906467 ] Link error with Visual Studio 2003
1515 Fix submitted by hberni
1518 PATCH: [ 911442 ] Sort folders first when sorting by name
1519 Also fixing grouping doxygen comments for functions
1520 Src: DirViewColItems.cpp
1522 2004-03-11 WinMerge experimental release 2.1.5.14 (installer test)
1525 PATCH: [ 913792 ] Cache color options for MergeView
1526 Src: MergeDoc.cpp MergeEditView.cpp MergeEditView.h
1527 BUG: [ 872882 ] Some selected menu items looks to small
1528 Adds missing handler functions BCMenu needs
1529 Also added code to implement document menus (commented out for now)
1530 Src: MainFrm.cpp MainFrm.h Merge.rc
1531 PATCH: [ 913743 ] Icons for menuitems (RFE 873697)
1532 Submitted by Tim Gerundt
1533 Src: MainFrm.cpp Merge.rc resource.h
1534 Src/res new files: cascade.bmp cut.bmp cut.bmp horizontally.bmp
1535 paste.bmp search.bmp vertically.bmp
1536 Languages: *.rc resource.h
1540 Fix for OptionsMgr bugs when loading string options from registry
1541 UNICODE strings were not handled correctly, incorrect buffer lengths
1542 Src/Common: OptionsMgr.cpp OptionsMgr.h
1543 PATCH: [ 912754 ] Close open MergeDoc before opening new from DirDoc
1544 Src: DirDoc.cpp DirDoc.h DirView.cpp
1545 RFE: [ 874366 ] Add goto line-number
1546 Show few lines of context above line scrolled to
1547 Src: MergeEditView.cpp
1548 PATCH: [ 913073 ] Option to automatically close compare pane
1549 Src: DirView.cpp DirView.h MainFrm.cpp Merge.rc OptionsDef.h
1550 PropGeneral.cpp PropGeneral.cpp resource.h
1551 Languages: *.rc resource.h
1554 PATCH: [ 912297 ] Splashscreen and syntax highlight options
1555 Src: MainFrm.cpp Merge.cpp Merge.h MergeDiffDetailView.cpp
1556 MergeEditView.cpp OptionsDef.h
1557 Fix compile of CShellFileOp with Visual Studio 2003
1558 Fix from original author Michael Dunn
1559 Common: CShellFileOp.cpp
1562 PATCH: [ 911350 ] Restore default compare options
1563 Src: MainFrm.cpp Merge.rc PropCompare.cpp PropCompare.h resource.h
1564 Languages: *.rc resource.h
1565 PATCH: [ 892397 ] Distinguish prediffer from unpacker
1567 Src: DiffWrapper.cpp DirScan.cpp FileTransform.cpp FileTransform.h
1568 MainFrm.cpp MergeDoc.cpp SelectUnpackerDlg.cpp
1569 BUG: [ 909779 ] Uninitialised variable in CGhostTextBuffer::DeleteText()
1570 Fix submitted by Laoran
1571 Src: GhostTextBuffer.cpp
1572 BUG: [ 909796 ] Uninitialised variable on OnSelchangeUnpackerName()
1573 Fix submitted by Laoran
1574 Src: SelectUnpackerDlg.cpp
1575 BUG: [ 909090 ] MainFrm::m_CheckOutMulti not initialized
1576 Also m_bVCProjSync was unitilialised.
1580 PATCH: [ 911114 ] DiffOptions to new system
1581 Src: ConfigLog.cpp ConfigLog.h DiffWrapper.cpp DiffWrapper.h DirDoc.cpp
1582 DirDoc.h MainFrm.cpp MainFrm.h MergeDoc.cpp MergeDoc.h OptionsDef.h
1583 PATCH: [ 906872 ] Change ShellExtension to open directories non-recursive
1584 ShellExtension: ShellExtension.rc WinMergeShell.cpp WinMergeShell.h
1585 RFE: [ 874366 ] Add goto line-number
1586 Improvement: Show file's current line in Goto-dialog as selected
1587 Src: MergeEditView.cpp
1588 Add contributors.txt
1589 Docs: contributors.txt
1591 2004-03-06 WinMerge experimental release 2.1.5.13 (cvs)
1594 PATCH: [ 909980 ] Fix buffer types and descriptions
1595 Src: MergeDoc.cpp MergeDoc.h
1596 Two unrelated lines got removed by checkin of #909980
1600 Fix invalid return in paths_IsPathAbsolute()
1602 PATCH: [ 907898 ] Detect filechange by another app before saving
1603 Src: DiffContext.cpp DiffContext.h Merge.dsp Merge.rc MergeDoc.cpp
1604 MergeDoc.h resource.h
1605 Src new files: DiffFileInfo.cpp DiffFileInfo.h
1606 Languages: *.rc resource.h
1609 fix BUG: [ 902430 ] copy&paste comment bug
1613 PATCH: [ 908606 ] Restore default colors
1614 Add "Defaults" button to Color options page
1615 Src/Common: OptionsMgr.cpp OptionsMgr.cpp
1616 Src: Merge.rc PropColor.cpp PropColors.h resource.h
1617 Languages: recource.h *.rc
1618 PATCH: [ 908211 ] DiffContext.h should not include RegExp.h
1620 Src: DiffContext.h DirDoc.h
1621 BUG: [ 908217 ] MergeDoc has incorrect include
1626 PATCH: [ 907087 ] Allow commandline switches for external editor
1627 Src/Common: coretools.cpp coretools.h
1629 PATCH: [ 907641 ] Convert color options to new system
1630 Src: ColorButton.cpp ColorButton.h MainFrm.cpp Merge.cpp Merge.h
1631 MergeDiffDetailView.cpp MergeEditView.cpp OptionsDef.h
1632 PropColors.cpp PropColors.h
1635 PATCH: [ 906180 ] Use SHBrowseForFolder() to select folder
1636 Src: Merge.cpp Merge.h
1637 FIX wrong checkin comments and wrong patch number and description
1638 in previous checkin.
1639 PATCH: [ 906934 ] Fix filenames in patch-files
1640 Src: DiffWrapper.cpp
1642 2004-02-28 WinMerge experimental release 2.1.5.12 (cvs)
1645 PATCH: [ 906120 ] Improve error handling for dircompare fileoperations
1647 PATCH: [ 906224 ] Convert more options to new system
1648 Src: MainFrm.cpp MainFrm.h MergeDiffDetailView.cpp MergeDoc.cpp
1649 MergeDoc.h MergeEditView.cpp OptionsDef.h
1652 PATCH: [ 905115 ] Put deleted files to Recycle Bin
1653 Also added option to disable it in "System" options
1654 DirActions.cpp MainFrm.cpp Merge.rc OptionsDef.h PropRegistry.cpp
1655 PropRegistry.h resource.h
1656 Fix copy/paste error
1658 Better absolute path check (I thought I already applied this)
1662 PATCH: [ 903670 ] Copy Folder (and convert to CShellFileOp)
1663 Src: DirActions.cpp DirView.h MainFrm.cpp MainFrm.h
1666 PATCH: [ 902738 ] Two errors in resource (Whitespaces and Hilight)
1667 Also RFE [ 837773 ] fix all about boxes
1672 PATCH: [ 896153 ] OptionsManager
1673 Src/Common: new files OptionsMgr.cpp OptionsMgr.h
1674 Src: DirDoc.cpp DirView.cpp MainFrm.cpp MainFrm.h Merge.dsp MergeDoc.cpp
1676 Src: new file OptionsDef.h
1677 PATCH: [ 900718 ] Updated German translation
1678 Submitted by Tim Gerundt
1679 Languages/German: MergeGerman.rc
1682 Fix CopyAll.bat for new directory structure.
1683 Src: Languages\CopyAll.bat
1684 Add GetClipTcharTextFormat (needed by coretools now) to StdAfx.*
1685 MakeResDll: StdAfx.cpp StdAfx.h
1686 Fix MakeResDll.dsp to compile (new directory structure).
1687 MakeResDll\MakeResDll.dsp
1689 2004-02-20 WinMerge experimental release 2.1.5.11 (cvs)
1692 PATCH: [ 899926 ] Write LogErrorString()s to logfile
1693 Src: DiffWrapper.cpp MainFrm.cpp MergeDoc.cpp StdAfx.cpp
1696 BUG: [ 888992 ] 7zip integration: Error deleting file when closing WinMerge
1700 PATCH: [ 899145 ] Check if patch path is absolute
1701 Src: Merge.rc PatchDlg.cpp paths.cpp paths.h resource.h
1702 Languages: *.rc resource.h (incl. changes from #889357)
1703 BUG: [ 893410 ] Typo in IDS_DIFF_FILEOVERWRITE
1706 RFE: [ 897975 ] Syntax highlighting for INI files
1707 Patch submitted by Tim Gerundt
1709 editlib: ccrystaltextview.cpp ccrystaltextview.h
1710 editlib new file: ini.cpp
1713 PATCH: [ 889357 ] Attempt to improve DirScan speed
1714 The VERIFY(::DeleteFile... ) in prepAndCompareTwoFiles() won't fire as long as
1715 the gLog.m_nMaskLevel's LOGLEVEL::LSILENTVERIFY bit is set, which is the case
1717 Common: logfile.cpp logfile.h
1718 Src: stdafx.cpp stdafx.h Merge.rc resource.h Diff.cpp DiffContext.cpp
1719 DiffContext.h DiffWrapper.cpp DiffWrapper.h DirCompStateBar.cpp
1720 DirCompStateBar.h DirScan.cpp DirView.h DirViewColHandler.cpp
1721 DirViewColItems.cpp DirViewColItems.h files.cpp FileTransform.h
1725 BUG: [ 898745 ] Wrong result for folders (non-recursive compare)
1726 Src: DirViewColHandler.cpp
1729 BUG: [ 887280 ] Swap toolbar icon (usability)
1730 Swaps 'Last Diff' and 'First diff' buttons + adds separator before
1732 Src/res: Toolbar.bmp
1734 Languages/res: Toolbar.bmp
1737 PATCH: [ 873151 ] Attempt to fix Help/Configuration
1740 PATCH: [ 891364 ] Enumerated doctype (scratchpads)
1741 Src: MergeDoc.cpp MergeDoc.h
1744 BUG: [ 893287 ] Assign wrong file property when storing changes.
1748 Add header comments to functions lacking such in StdAfx.cpp
1752 PATCH: [ 892509 ] Reset dircompare statuspane before new compare
1753 Src: DirCompStateBar.cpp DirCompStateBar.h DirFrame.cpp
1754 PATCH: [ 890758 ] Fix and tune doxy config file
1756 BUG: [ 887271 ] Weird context menu position if opened from keyboard
1757 Src: MergeEditView.cpp
1760 BUG: [ 892158 ] Empty lines added to end of file
1763 2004-02-07 WinMerge experimental release 2.1.5.9 (cvs)
1766 BUG: [ 892115 ] Directory compare always recursive
1770 Remove doubled entrys from MessageMap
1771 Src: MergeEditView.cpp
1774 BUG: [ 876500 ] OlecharToUTF8 doesn't distinguish UCS-2BE?
1775 Add function header comment to OlecharToUTF8 in multiformatText.cpp
1776 Common: multiformatText.cpp
1779 PATCH: [ 888662 ] Add Editor options page
1780 Src: MainFrm.cpp Merge.dsp Merge.rc PropGeneral.cpp PropGeneral.h resource.g
1781 Src new files: PropEditor.cpp PropEditor.h
1782 Src removed files: PropSyntax.cpp PropSyntax.h
1783 Lanuages: *.rc resource.h
1786 Correcting the path for the original resource.h
1787 Languages: UpdateAll_resource_h.bat
1790 PATCH: [ 882683 ] Combine transform code in DirScan.cpp
1791 Src: DirScan.cpp FileTransform.cpp FileTransform.h MergeDoc.cpp
1792 PATCH: [ 890019 ] Fix diff_flag to bin_flag in CDiffWrapper::RunFileDiff
1793 Src: DiffWrapper.cpp
1796 Fix "Copy Right to.." (copy/paste error)
1798 PATCH: [ 889115 ] Delete transformed temp files in file compare
1799 Src: DiffWrapper.cpp
1800 PATCH: [ 889334 ] Improve and enable logging
1801 Logging is now enabled for debug builds, written to $temp/WinMerge.log
1802 Common: LogFile.cpp LogFile.h
1803 Src: DiffWrapper.cpp DirActions.cpp DirDoc.cpp DirScan.cpp
1804 MainFrm.cpp MergeDoc.cpp StdAfx.cpp
1805 PATCH: [ 887800 ] Add frames around items in dircompare statusbar
1806 Src: DirCompStateBar.cpp DirCompStateBar.h Merge.rc
1810 Cosmetic: fix copy&paste error in UniFile.cpp comment.
1811 Src/Common: UniFile.cpp
1814 PATCH: [ 885496 ] Move compare options to Compare-page
1815 src: MainFrm.cpp Merge.rc PropCompare.cpp PropCompare.h
1816 PropGeneral.cpp PropGeneral.h
1818 PATCH: [ 887085 ] CMergeDoc::TrySaveAs() cleanup
1819 src: MergeDoc.cpp MergeDoc.h
1820 Remove some unused variables
1821 src: DiffWrapper.cpp MergeDoc.cpp PatchDlg.cpp StringDiffs.cpp
1822 src/common: multiformatText.cpp
1823 Initialise all PackingInfo members
1824 src: FileTransform.h
1827 BUG: [ 885018 ] Crash when trying to save scratchpad
1831 PATCH: [ 887283 ] Menu cleanup
1836 BUG: [ 887957 ] Some builds of ShellExtension need include dir fixed
1837 ShellExtension: ShellExtension.dsp
1838 PATCH: [ 882650 ] Move temp build files out of Build into BuildTmp (more)
1839 ShellExtension: ShellExtension.dsp
1840 [ 879536 ] Add MakePatchDirs source to repository
1841 MakePatchDirs: AppVersion.cpp AppVersion.h CDirDialog.cpp CDirDialog.h
1842 CMoveConstraint.cpp CMoveConstraint.h CSubclass.cpp CSubclass.h
1843 ChangeLog.txt DropEdit.cpp DropEdit.h MakeDirs.cpp MakeDirs.h
1844 MakePatchDirs.dsp MakePatchDirs.ico MakePatchDirs.rc MakePatchDirs.rc2
1845 MakePatchDirsApp.cpp MakePatchDirsApp.h MakePatchDirsDlg.cpp
1846 MakePatchDirsDlg.h ReadMe.txt StdAfx.cpp StdAfx.h dist.txt exc.cpp
1849 2004-01-30 WinMerge experimental release 2.1.5.8 (cvs)
1852 BUG: [ 887543 ] Word-diff (No difference) messagebox has Cancel-button
1853 src: MergeDocLineDiffs.cpp
1856 PATCH: [ 885092 ] CMergeDoc::DoSave() cleanup
1857 src: MergeDoc.h MergeDoc.cpp
1860 PATCH: [ 884301 ] Modified Visual Basic syntax highlighting
1861 Submitted by Tim Gerundt
1862 src/editlib: basic.cpp
1864 2004-01-26 Christian
1865 PATCH: [ 883303 ] Upgrade WinMerge Home Page
1866 Web: index.php winmerge.css WinMergePAD.xml images/redswirl.gif
1869 BUG: [ 846034 ] drag and drop files does not set extension
1873 Avoid copying DIFFITEMs
1874 This badly slowed down DirView sorting and navigation.
1875 src: DirViewColHandler.cpp DirView.cpp DirView.h 7zCommon.cpp 7zCommon.h
1876 Fix ASSERT in vc98/mfc/src/olevar.cpp when sorting DirView by date
1877 src: DirViewColItems.cpp
1880 Fix bad default for OPENFILENAME::nFilterIndex
1884 [ 882650 ] Move temp build files out of Build into BuildTmp
1886 MakeResDll: MakeResDll.dsp
1889 PATCH: [ 881602 ] Don't allow canceling saving when its pointless
1890 src: MainFrm.cpp MergeDiffDetailView.cpp MergeDoc.cpp MergeDoc.h MergeEditView.cpp
1891 PATCH: [ 880769 ] Select all in Dir compare
1892 src: DirView.h DirView.cpp Merge.rc
1894 Minor update to 2.2 plan - couple of items completed, two new items (25, 26)
1897 PATCH: [ 880006 ] Code cleanup--old commented out lines in DirView.h
1899 Cleanup stdafx.h; comment includes & declarations, remove unneeded include of afxsock.h
1900 src: StdAfx.cpp StdAfx.h
1901 PATCH: [ 802113 ] strip out spurious tests: _MSC_VER >= 1000 { part #2/2 }
1902 src: CCPrompt.h ColorButton.h DiffViewBar.h DirCompStateBar.h MergeEditView.h
1903 OutputDlg.h PatchDlg.h PropColors.h PropCompare.h PropFilter.h PropRegistry.h
1904 PropSyntax.h SelectUnpackerDlg.h WMGotoDlg.h
1905 src/Common: SplitterWndEx.h
1908 PATCH: [ 848159 ] RFE 826652 : Compare by modified date
1909 Submitted by Tim Musschoot - some modifications by Kimmo
1910 src: DirScan.cpp MainFrm.h MainFrm.cpp Merge.dsp Merge.rc resource.h
1911 src new files: PropCompare.h PropCompare.cpp
1912 Languages: *.rc resource.h
1915 Add some comments before initialization of g_cols
1916 src: DirViewColItems.cpp
1919 PATCH: [ 878631 ] Add generic named properties to DiffContext
1920 src: Diff.cpp DiffContext.cpp DiffContext.h DirDoc.cpp DirScan.cpp
1921 DirView.h DirViewColHandler.cpp DirViewColItems.cpp Merge.dsp
1923 src/Common: varprop.cpp varprop.h
1926 PATCH: [ 880898 ] BCMenu update to v3.034
1927 src: BCMenu.h BCMenu.cpp
1929 2004-01-20 WinMerge experimental release 2.1.5.7 (cvs)
1933 New class CSilentException to be thrown on subsequent failures in proxy linking to merge7z*.dll.
1934 src: 7zCommon.cpp 7zCommon.h MainFrm.cpp
1937 Finish Merge7z integration
1938 src: Merge.rc resource.h DirView.cpp DirView.h DirDoc.cpp MainFrm.cpp Merge.dsp
1939 Merge7z: Merge7z311.dsp Merge7z312.dsp Merge7z313.dsp
1942 PATCH: [ 880046 ] Save every line including last one in SaveToFile
1944 UniStdioFile::OpenCreateUtf8 (shortcut for creating UTF-8 file)
1945 src/Common: UniFile.cpp UnFile.h
1948 PATCH: 876875 Go To -Dialog
1949 Fix crash in GotoDlg. This was in latest patch, but I merged part of older patch :(
1950 MergeEditView.h MergeEditView.cpp
1953 PATCH: [ 878625 ] Simplify and unify file operations calling diff_2_files.
1954 src: Diff.cpp DiffWrapper.cpp DiffWrapper.h
1955 PATCH: [ 847121 ] Code cleanup (remove unneeded AssertValid & Dump implementations)
1956 src: ChildFrm.cpp ChildFrm.h DirDoc.cpp DirDoc.h DirFrame.cpp DirFrame.h
1957 DirView.cpp DirView.h MainFrm.cpp MainFrm.h MergeDiffDetailView.cpp
1958 MergeDiffDetailView.h MergeEditView.cpp MergeEditView.h
1959 PATCH: [ 802113 ] strip out spurious tests: _MSC_VER >= 1000 { part#1/2 }
1960 src: ChildFrm.h DirFrame.h DirView.h EditFile.h FilepathEdit.h
1961 GhostTextBuffer.h GhostTextView.h MainFrm.h Merge.h MergeDoc.h
1962 PropGeneral.h PropVss.h StdAfx.h VssPrompt.h
1963 PATCH: [ 880046 ] Save every line including last one in SaveToFile
1967 PATCH: 876875 Go To -Dialog
1968 src new files: WMGotoDlg.h WMGotoDlg.cpp
1969 src: Merge.dsp Merge.rc MergeEditView.h MergeEditView.cpp resource.h
1970 src/Languages: *.rc resource.h
1971 PATCH: [ 872413 ] UnpackDFM TestStreamFormat
1972 Submitted by Michael Richter
1973 Plugins/Delphi/UnpackFDM: UnpackFDM.dpr UnpackFDMLib_TLB.pas
1975 Plugins/dlls: UnpackFDM.dll
1978 PATCH: [ 871789 ] Add "Copy to..." items to dirview context menu
1979 src/Common: new files CShellOp.h CShellOp.cpp
1980 src: DirActions.cpp DirView.h DirView.cpp Merge.cpp Merge.dsp
1981 Merge.h Merge.rc resource.h
1982 src/Languages: *.rc resource.h
1983 PATCH: [ 876556 ] (Minor) code cleanup for SaveToFile
1988 Fix bug in UniFile::WriteString counting of written bytes.
1989 Src/Common/UniFile.cpp
1991 2004-01-16 WinMerge experimental release 2.1.5.6 (cvs)
1994 PATCH: [ 873940 ] Diff navigation code cleanups
1995 src: MergeEditView.cpp
1996 Remove _T()'s from _RPTF() macros (forgot to do before last checkin)
1997 src: MergeEditView.cpp
2000 Remove rcs/cvs ID line from unicoder.* (because I share these elsewhere)
2001 src/WinMerge/Common: unicoder.cpp unicoder.h
2002 Fix bug in unicoder.cpp: WideCharToMultiByte: lpDefaultChar & lpUsedDefaultChar must be NULL when using UTF-8.
2003 src/WinMerge/Common: unicoder.cpp
2006 PATCH: [ 876546 ] Fix CMergeDoc::CDiffTextBuffer::SaveToFile ghost line detect
2007 src/WinMerge: MergeDoc.cpp
2010 Start Merge7z integration (to be continued)
2011 src: 7zCommon.cpp 7zCommon.h DirView.h
2014 PATCH: [ 875567 ] Compile after reorg
2015 Submitted by Christian to make WinMerge compile again!
2019 PATCH: [ 874451 ] Update lineposition offpane when navigating diffs
2020 Fixes wrong linenumber and cursor position in inactive file
2021 WinMerge: MergeEditView.cpp
2024 PATCH: [ 875237 ] Fix fwrite call in UniStdioFile::WriteString
2025 Fix byte count and argument order when UniStdioFile::WriteString calls fwrite.
2027 PATCH: [ 875215 ] Fix UnicodeFileToOlechar obtaining BOM
2028 common: multiformatText.cpp
2030 2004-01-11 WinMerge experimental release 2.1.5.5 (cvs)
2033 PATCH: [ 860054 ] Reimplement SaveToFile using stream output
2034 common: multiformatText.cpp unicoder.cpp unicoder.h UniFile.cpp UniFile.h
2035 WinMerge: DiffContext.cpp MergeDoc.cpp
2038 Minor update to 2.2 plan
2039 Docs: Planning_2_2.txt
2041 2004-01-11 WinMerge experimental release 2.1.5.4 (cvs)
2044 Update Merge7z project files to build to ../Build directories
2045 in same fashion as WinMerge project
2046 Merge7z: Merge7z311.dsp Merge7z312.dsp Merge7z313.dsp
2049 PATCH: [ 872762 ] Stricter error handling for Plugins
2050 WinMerge: Plugins.cpp
2053 Fix parameter type, CMergeDoc::TrySaveAs() second param is int.
2054 WinMerge: CMergeDoc.cpp
2057 PATCH: [ 872727 ] Fix function comment on lwdisp.c: ReportError
2059 PATCH: [ 862040 ] CAssureScriptsForThread like WaitCursor
2060 WinMerge: DiffThread.cpp FileTransform.cpp Merge.cpp Merge.h
2061 MergeEditView.cpp Plugins.cpp Plugins.h SelectUnpackerDlg.cpp
2062 PATCH: [ 860072 ] Allow singlethreaded diffs
2063 WinMerge: DiffThread.cpp
2067 Updated Russian translation from Dmitriy Aleshkowskiy
2068 Languages/Russian: MergeRussian.rc
2071 PATCH: [ 872032 ] Add SEH around calls to load plugins
2072 WinMerge: Plugins.cpp
2075 Added new module Merge7z
2076 Merge7z: Merge7z.h Merge7z311.cpp Merge7z311.dsp Merge7z312.dsp
2077 Merge7z313.dsp Merge7zCommon.cpp Merge7zCommon.h StdAfx.cpp
2078 StdAfx.h tools.cpp tools.h
2081 PATCH: [ 856396 ] Browse folders in non-recursive directory compare
2082 WinMerge: DirDoc.h DirDoc.cpp DirScan.cpp DirView.h DirView.cpp
2083 DirViewColHandler.cpp Merge.dsp Merge.rc Paths.h Paths.cpp resource.h
2084 WinMerge/res: new file folder.bmp
2085 Languages: *.rc resource.h
2086 Languages/res: new file folder.bmp
2089 Add Polish translation contributed by Pawel Wawrzyszko
2091 Languages: BuildAll.bat UpdateAll_resource_h.bat
2093 2004-01-06 WinMerge experimental release 2.1.5.3 (cvs)
2096 PATCH: [ 869575 ] UniMemFile needs to init charsize to 1
2098 PATCH: [ 869518 ] Fix IO.C to count non-UNIX prefix lines correctly
2102 BUG: [ 869289 ] Typo in XML_html.flt excludes gif files
2103 Filters: XML_html.flt
2106 PATCH: [ 868584 ] Move DIRSEL_TAG to string resource
2107 WinMerge: Merge.rc OpenDlg.cpp resource.h
2108 Languages: *.rc resource.h
2109 Adding missing line in patch [ 868584 ] and fixing one tab
2110 WinMerge: OpenDlg.cpp
2113 PATCH: [ 863738 ] Various Updates in German Translation
2114 Updates to German translation by Tim Gerundt (gerundt), based on 1.73 MergeGerman.rc
2115 Languages: German/MergeGerman.rc
2116 PATCH: [ 860472 ] Fix SuperComboBox to handle its own OLE requirements
2117 common: SuperComboBox.cpp SuperComboBox.h
2118 New Russian translation by Dmitriy Aleshkowskiy
2122 Put ID_POPUP_COPYALLDIFFSFROMOTHERSIDE back into rc file so it parses
2126 BUG: [ 860043 ] binary file detection broken
2127 WinMerge: DiffWrapper.cpp DirScan.cpp
2130 PATCH: [ 861099 ] Dirview context menu cleanup
2131 WinMerge: DirView.cpp Merge.rc resource.h
2132 Languages: *.rc resource.h
2135 PATCH: [ 860988 ] Change File from menu (Adds Window/Change Pane)
2136 WinMerge: Merge.rc MergeEditView.h MergeEditView.cpp resource.h
2137 Languages: *.rc resource.h
2138 PATCH: [ 861813 ] Optimise dircompare statuspane updating
2139 Fixes bug [ 860204 ] Dir compare statuspane flickers on slower machine
2140 WinMerge: DirCompStateBar.h DirCompStateBar.cpp
2143 adapt plugins syntax check, consequence of patch #853147
2144 WinMerge: Plugins.cpp
2147 PATCH: [ 858283 ] Add isResultDiff() to DiffItem
2148 Fix bug in patch (DirDoc.cpp)
2149 WinMerge: DirDoc.cpp
2152 update plugin docs and examples, consequence of patch #853147
2153 plugins: list of sources.txt readme.txt syntax.txt
2154 plugins\dlls: RCLocalizationHelper.dll list.txt
2155 plugins\src_VB\IgnoreTwoFirstCharsOrder: WinMergeScript.cls
2156 plugins\src_VCPP\RCLocalizationHelper: RCLocalizationHelper.idl WinMergeScript.cpp WinMergeScript.h
2159 PATCH: [ 860072 ] Allow singlethreaded diffs
2160 Add unused code to trigger diffs in main thread (for developer to trigger via breakpoint).
2161 WinMerge: DiffThread.cpp
2162 unpatch: Reverse (back out) patch [ 860072 ] Allow singlethreaded diffs
2163 WinMerge: DiffThread.cpp
2166 PATCH: [ 858283 ] Add isResultDiff() to DiffItem
2167 Fixes BUG [ 852998 ] Left Only being filtered out if not view different
2168 WinMerge: DiffContext.h DirDoc.cpp
2171 BUG: [ 833096 ] Left/right-only status overwrites skipped-status
2172 Apply fix for long result too
2173 WinMerge: DirViewColItems.cpp
2174 PATCH: [ 851586 ] Improve Patch generate dialog
2175 Also implements RFE #849890 Disable first line in patch-file
2176 WinMerge: DiffWrapper.h DiffWrapper.cpp Merge.rc PatchDlg.h PatchDlg.cpp
2177 PatchTool.cpp resource.h
2178 Languages: *.rc resource.h
2182 Docs: Planning_2_2.txt
2185 remove files UnicodeUtf8, consequence of patch #853147
2186 WinMerge: FileTransform.cpp Merge.dsp
2187 WinMerge delete: UnicodeUtf8.cpp UnicodeUtf8.h
2188 PATCH: [ 853147 ] New class for text conversion in plugins
2189 common: unicoder.cpp unicoder.h
2190 common add: multiformatText.cpp multiformatText.h
2191 WinMerge: DiffWrapper.cpp DirScan.cpp FileTransform.cpp FileTransform.h Merge.dsp MergeDoc.cpp
2192 Plugins.cpp Plugins.h SelectUnpackerDlg.cpp
2195 Add comment inside CMergeDoc::CDiffTextBuffer::SaveToFile about existing buggy code.
2196 WinMerge: MergeDoc.cpp
2199 PATCH: [ 857003 ] Move linediff messagebox text into resource
2200 WinMerge: Merge.rc MergeDocLineDiffs.cpp resource.h
2201 Languages: *.rc resource.h
2202 PATCH: [ 856974 ] More space for numbers in dir compare statuswindow
2207 BUG: [ 842812 ] Some extension filtering happening by default (fix for *.*)
2208 WinMerge: DirDoc.cpp
2209 Don't preprend a backslash to filename if there is already one (test for filter)
2210 WinMerge: DirDoc.cpp
2213 BUG: [ 836868 ] Search and replace field size limited (apply to languages)
2215 PATCH: [ 848476 ] Wrap end of file in replace dialog
2216 WinMerge: Merge.rc resource.h
2217 editlib: ccrystaleditview.cpp ccrystaltextview.h ceditreplacedlg.cpp ceditreplacedlg.h cfindtextdlg.h
2218 Languages : *.rc resource.h
2220 2003-12-03 WinMerge experimental release 2.1.5.1 (cvs)
2223 reclassing strings in resource.h in same order as in Merge.rc
2224 WinMerge: resource.h
2225 Languages: resource.h
2228 PATCH: [ 852062 ] XML/HTML file filter
2229 Filters: new file XML_html.flt
2232 Added comment giving Unicode for hanguko (Korean in Hangul alphabet)
2233 common: LanguageSelect.cpp: Korean/MergeKorean.rc
2236 PATCH: [ 847884 ] Remove obsolete registry keys
2237 WinMerge: PropRegistry.cpp PropRegistry.h
2238 InnoSetup: WinMerge.iss
2241 Rename folder1.bmp to lfolder.bmp (suggested in PATCH [ 841039 ] Green "binary.bmp")
2242 WinMerge: Merge.dsp Merge.rc
2243 Added WinMerge/res/lfolder.bmp
2244 Removed WinMerge/res/folder1.bmp
2248 Add header and RCS ID
2249 common: lwdisp.h unicoder.cpp unicoder.h FileTransform.h Plugins.h SelectUnpackerDlg.h
2252 BUG: [ 848725 ] Crash trying to generate report
2253 Fix submitted by Perry
2254 WinMerge: DirView.cpp
2257 PATCH: [ 849424 ] Fix worddiffs for whitespace
2258 Handle Sensitive to whitespace in stringdiffs.
2259 WinMerge: MergeDocLineDiffs.cpp stringdiffs.cpp
2260 PATCH: [ 842914 ] Add codepage guessing, and codepage column
2261 Optional codepage column in dirview. Code to check RC & HTML files for codepage
2262 WinMerge: DiffContext.cpp DiffContext.h DirViewColItems.cpp Merge.rc resource.h
2263 Languages: All resource.h and *.rc files.
2266 PATCH: [ 842534 ] Move copy & delete ops to submenus in dirview popup
2267 First part of patch; moved menu items into popup submenus.
2268 WinMerge: DirActions.cpp DirView.cpp DirView.h Merge.rc resource.h
2269 Languages: All resource.h and *.rc files.
2272 PATCH: [ 848955 ] Don't ask about saving after user selects 'Cancel'
2273 WinMerge: MergeDoc.cpp
2276 PATCH: [ 849138 ] Fix stringdiffs for diff in first word
2277 (Code was trying to access word#-1 when diff hit in first word)
2278 WinMerge: stringdiffs.cpp stringdiffs.h
2281 Missed one diff in PATCH: [ 847697 ] Move desc texts into doc classes
2282 WinMerge: MergeDoc.cpp
2284 2003-11-25 WinMerge experimental release 2.1.5.0 (cvs)
2287 PATCH: [ 847134 ] More commenting for DirScan (doxygenize function comments)
2288 WinMerge: DirScan.cpp DirScan.h
2289 [ 846405 ] Highlight individual word diffs in line
2290 (Enhance F4 to compute individual differences, and toggle through them in a cycle)
2291 WinMerge: Merge.dsp MergeDoc.cpp MergeDoc.h MergeDocLineDiffs.cpp
2292 stringdiffs.cpp stringdiffs.h stringdiffsi.h
2295 BUG: [ 848461 ] Toggle 'show different files' is broken (thanks to Kimmo)
2296 WinMerge: DirDoc.cpp
2299 Improvements to language names in LanguageSelect.cpp (and reference URLs), from Laurent.
2300 common: LanguageSelect.cpp
2303 PATCH: [ 847137 ] Report from dir compare results
2304 Submitted by Vikrant
2305 common: coretools.h coretools.cpp
2306 WinMerge: DirView.h DirView.cpp Merge.rc resource.h
2307 Languages: *.rc resource.h
2308 Within PATCH: [ 847137 ] - add space to New File item tooltip
2309 PATCH: [ 847137 ] Report from dir compare results
2310 Missed one diff from DirView.cpp
2311 WinMerge: DirView.cpp
2312 PATCH: [ 847697 ] Move desc texts into doc classes
2313 Fixes bug [ 847635 ] filenames after scratchpad
2314 WinMerge: DirDoc.h DirDoc.cpp MainFrm.h MainFrm.cpp MergeDoc.h MergeDoc.cpp
2317 Fix Exceptions.h for Unicode build
2318 WinMerge: Exceptions.h
2321 PATCH: [ 846237 ] Fix for the maximized/restored state (dirframe, docframe)
2322 WinMerge: ChildFrm.cpp DirFrame.cpp
2323 PATCH: [ 843124 ] Initialize COM in secondary threads
2324 WinMerge: Plugins.cpp Plugins.h
2325 BUG: [ 846622 ] rc files wrongly displayed as identical (fix : no automatic prediffing)
2326 WinMerge: FileTransform.cpp FileTransform.h MainFrm.cpp
2327 cosmetic: replace bUnpackerMode with m_bUnpackerMode
2328 WinMerge: FileTransform.cpp FileTransform.h MainFrm.cpp
2329 PATCH: [ 846523 ] error description for plugins error handler
2330 WinMerge: Merge.dsp Merge.rc Plugins.cpp
2331 WinMerge add: Exceptions.h
2334 PATCH: [ 847638 ] Unused member variables in MainFrm.h
2338 typo in TrySaveAs and merge error in DoSave
2339 WinMerge: MergeDoc.cpp
2342 PATCH: [ 842906 ] Hardcode native language names into LanguageSelection.cpp
2343 Now Merge.rc holds all ASCII language names, and non-ASCII versions (if different)
2344 are in LanguageSelection.cpp, as Unicode strings.
2346 common: LanguageSelection.cpp LanguageSelection.h
2349 PATCH: [ 820676 ] Scratchpad
2350 WinMerge: MainFrm.h MainFrm.cpp Merge.rc MergeDoc.h MergeDoc.cpp resource.h
2351 WinMerge/res: Toolbar.bmp
2352 Languages: *.rc resource.h
2353 Languages/res: Toolbar.bmp
2356 PATCH: [ 844780 ] MergeDoc code cleanup
2357 (removed AssertValid, Dump, and unused Serialize body)
2358 WinMerge: MergeDoc.cpp MergeDoc.h
2359 PATCH: [ 847126 ] Split large function in DirScan into 2 pieces
2360 WinMerge: DirScan.cpp
2361 PATCH: [ 847138 ] Initialize some variables in Plugins functions
2362 WinMerge: Plugins.cpp
2363 PATCH: [ 847149 ] Fix typo in DirScan (i->j)
2364 WinMerge: DirScan.cpp
2367 BUG: [ 846450 ] "Winmerge executable:" label missing from registry options
2370 cosmetic in Dirscan : FilterAdd -> StoreDiffResult
2371 WinMerge: DirScan.cpp
2372 SaveToFile : returned value (BOOL -> int)
2373 cosmetic changes in TrySaveAs/DoSave/OnFileSaveAsLeft/OnFileSaveAsRight
2374 WinMerge: MergeDoc.cpp MergeDoc.h
2376 2003-11-19 WinMerge beta 2.1.4.0 released
2379 BUG: [ 845196 ] UTF-8 files not correctly compared
2380 WinMerge: MergeDoc.cpp MergeDoc.h
2381 BUG: [ 845012 ] SaveToFile does not write BOM
2382 WinMerge: MergeDoc.cpp
2385 PATCH: [ 842817 ] Initialize OpenDlg extension filter to blank
2386 fix proposed by Perry
2387 WinMerge: OpenDlg.cpp
2388 BUG: [ 840759 ] Failed to load library UnpackDFM.dll
2389 fix proposed by Jochen
2393 [ 843526 ] cosmetic changes from the archives patch
2394 WinMerge: DirDoc.cpp DirDoc.h MainFrm.cpp
2397 PATCH: [ 841897 ] Bail out of LoadFromFile if see embedded zeros
2398 WinMerge: MergeDoc.cpp
2401 BUG: [ 818416 ] is stat population missing from RunFileDiff ?
2402 WinMerge: DiffWrapper.cpp
2405 BUG: [ 842746 ] Highlight diff tool button lacks tooltip
2410 PATCH: [ 838290 ] Move inf creation down in RunFileDiff (cosmetic)
2411 WinMerge: DiffWrapper.cpp
2412 PATCH: [ 841878 ] Fix wchar to char conversions at save
2413 WinMerge: MergeDoc.cpp MergeDoc.h
2414 common: unicoder.cpp unicoder.h UniFile.cpp UniFile.h
2416 2003-11-15 WinMerge experimental release 2.1.3.9 (cvs)
2419 PATCH: [ 840296 ] Informative messageboxes when loading files
2420 WinMerge: files.h MainFrm.cpp MainFrm.h Merge.rc MergeDoc.cpp resource.h
2421 Languages: *.rc resource.h
2422 PATCH: [ 841062 ] Alternative icons for PATCH [ 840273 ] (for hilight line diff)
2423 Submitted by Tim Gerundt
2427 Languages/res: Toolbar.bmp
2430 PATCH: [ 841767 ] Store unique item path
2431 Fixes bug: #840547 Copying unique file does not update date and size
2432 WinMerge: DirScan.cpp
2433 PATCH: [ 841889 ] Make long path in CConfigLog::WriteLogFile
2435 WinMerge: ConfigLog.cpp
2436 PATCH: [ 841039 ] Green "binary.bmp"?New binary item icons for dir compare)
2437 Submitted by Tim Gerundt
2438 WinMerge/res: binary.bmp binarydiff.bmp
2439 Languages/res: binary.bmp binarydiff.bmp
2442 BUG: [ 838272 ] corrupt string operations in lwdisp.c
2443 common: lwdisp.c lwdisp.h
2446 BUG: [ 841428 ] WinMerge executable path is deleted
2447 WinMerge: MainFrm.cpp PropRegistry.h
2450 PATCH: [ 838084 ] Add * to newer file's date field in dir compare
2451 WinMerge: DirView.cpp DirViewColHandler.cpp
2452 BUG: [ 840785 ] Menu: Plugins | Automatic/Manual inconsistent
2453 WinMerge: MainFrm.cpp
2454 Code cleanup: use SetDiffCompare() and SetDiffSide()
2455 (I think those functions were designed to be used instead of SetDiffStatus())
2456 WinMerge: DirActions.cpp
2457 Don't update filedata multiple times + comment changes/updates
2458 (In journey to solve BUG: 840547 Copying unique file does not update date and size
2459 WinMerge: DirActions.cpp DirDoc.cpp DirView.cpp
2460 Removing one unneeded function + code cleanups + comment changes/updates
2461 (Hunting reason for BUG: 840547 Copying unique file does not update date and size)
2462 WinMerge: DiffContext.cpp DirDoc.h DirDoc.h
2465 modify the assert in GetText/GetTextWithoutEmptys (see patch #837480)
2467 WinMerge: GhostTextBuffer.cpp
2468 editlib: ccrystaltextbuffer.cpp
2469 Merging lwdisp.c with Jochen's changes (see patch #837480)
2470 common: lwdisp.c lwdisp.h Plugins.cpp
2471 PATCH: [ 838354 ] Revisit Speedup Speed up display of large differences
2472 submitted by Hern Chen (hern_chen)
2473 WinMerge: GhostTextBuffer.cpp MergeDoc.cpp
2474 editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h
2477 avoid double message "no line difference"
2478 WinMerge: MergeDoc.cpp
2479 PATCH: [ 838530 ] Simplify GhostTextBuffer for Undo
2480 WinMerge: GhostTextBuffer.cpp GhostTextBuffer.h MergeDoc.cpp MergeDoc.h
2481 PATCH: [ 839970 ] Moving from LoadFromFile to OpenDocs all view functions
2482 WinMerge: MergeDoc.cpp
2485 PATCH: [ 838545 ] Fix osversion stuff in ConfigLog.cpp
2487 WinMerge: ConfigLog.cpp
2488 WinMerge new file: winnt_supp.h
2489 PATCH: [ 838898 ] Cleanup Registry -optionpage
2490 WinMerge: MainFrm.cpp Merge.rc PropRegistry.h PropRegistry.cpp
2494 PATCH: [ 839243 ] F4 should hilight diff in both files
2495 WinMerge: MergeDoc.cpp MergeDoc.h
2496 fix for syntax highlight in left pane view
2497 WinMerge: MergeDoc.cpp
2498 update global options dialog : 'Allow mixing EOL' -> 'preserve original EOL chars'
2499 update global options dialog : 'ignore EOL' like in 2.0
2500 WinMerge: Merge.rc PropGeneral.cpp PropGeneral.h
2502 PATCH: [ 831308 ] File filter selection text "<None>" hardcoded
2503 WinMerge: FileTransform.h Merge.cpp Merge.rc PropFilter.cpp SelectUnpackerDlg.cpp
2505 Languages : resource.h
2508 PATCH: [ 838574 ] SplitterWndEx OnHScroll
2509 common: SplitterWndEx.cpp SplitterWndEx.h
2510 fixing text alignment in dialogs (right aligned on screen->RTEXT, centered->CTEXT)
2515 PATCH: [ 835198 ] Command line path arguments handling
2516 Submitted by Hern Chen
2517 WinMerge: Merge.cpp Paths.h Paths.cpp
2520 comments for invoke helpers (see BUG[ 838275 ])
2521 WinMerge: Plugins.cpp
2525 PATCH: [ 838283 ] Simplify OnFileSave
2526 WinMerge: MergeDoc.cpp
2528 2003-11-08 WinMerge experimental release 2.1.3.8 (patch demo)
2530 2003-11-08 WinMerge experimental release 2.1.3.7 (cvs)
2533 BUG: [ 838248 ] possible typo in plugin code (cosmetic)
2534 WinMerge: Plugins.cpp
2537 PATCH: [ 836931 ] Move QueryRegMachine into RegKey
2538 common: RegKey.cpp RegKey.h
2539 WinMerge: MainFrm.cpp VssPrompt.cpp
2542 BUG: [ 837980 ] bug in save right as
2543 WinMerge: MergeDoc.cpp
2546 BUG: [ 837760 ] regression since 2.1.3.6 (diff array)
2547 WinMerge: MergeDoc.cpp
2548 PATCH: [ 836927 ] Improved platform detection in ConfigLog
2550 WinMerge: ConfigLog.cpp
2553 Updated Catalan translation (from Jordi Vilar, the translation author)
2554 Languages: Catalan/MergeCatalan.rc
2557 [ 836870 ] Scrollbar "bounces back" in diff pane.
2558 editlib: ccrystaltextview.cpp
2561 BUG: [ 836781 ] File not found: notepad.exe
2562 WinMerge: MainFrm.cpp
2563 PATCH: [ 836714 ] Separate counts of normal and trivial diffs
2564 WinMerge: MergeDoc.h MergeDoc.cpp
2565 Backout PATCH: [ 834230 ] Use PostMessage() to update dir compare status
2566 It caused bug [ 837366 ] Dir compare status panel not drawn correctly
2567 WinMerge: DiffContext.cpp
2570 BUG: [ 836868 ] Search and replace field size limited
2572 BUG: [ 836384 ] File extension wildcards does not work.
2573 WinMerge: OpenDlg.cpp
2576 Typofix: "Wiew Whitespaces" -> "View Whitespace"
2577 WinMerge: ConfigLog.cpp
2578 Update language count mentioned in readme-developers.html
2579 Docs: readme-developers.html
2582 BUG: [ 829435 ] Fix character classification routines for UNICODE
2586 Added doxygen config file. (Subsequently fixed cvs log messages.)
2590 BUG: [ 829435 ] Fix character classification routines for UNICODE
2591 WinMerge: paths.cpp stdafx.cpp
2592 editlib: cregexp.cpp
2594 2003-11-05 WinMerge experimental release 2.1.3.6 (cvs)
2597 change directory name 'Plugins' to 'MergePlugins' (see BUG [ 832090 ])
2598 WinMerge: Plugins.cpp
2601 deleted unused function files_loadLines per Laurent's suggestion
2602 (in PATCH: [ 826250 ] New UniMemFile class for memory-mapping)
2603 WinMerge: files.cpp files.h
2606 PATCH: [ 836186 ] Unicode fix for lwdisp.co
2610 PATCH: [ 831384 ] dir comparison : state bar & stop button
2611 WinMerge: DiffContext.cpp DiffContext.h DiffThread.cpp DirDoc.cpp DirFrame.cpp DirFrame.h
2612 MainFrm.cpp MainFrm.h Merge.dsp Merge.rc resource.h
2613 WinMerge(addition): DirCompStateBar.cpp DirCompStateBar.h
2614 Languages : *.rc and resource.h
2617 adapt plugins filters to the syntax of regular expressions
2618 Plugins\dlls: RCLocalizationHelper.dll
2619 Plugins\src\HideFirstLetter: WinMergeScript.cpp
2620 Plugins\src\HideLastLetter: WinMergeScript.cls
2621 Plugins\src\IgnoreTwoFirstCharsOrder: WinMergeScript.cls
2622 Plugins\src\RCLocalizationHelper: WinMergeScript.cpp
2623 fix to test plugin filter with left & right filenames (instead of just right one)
2624 WinMerge: Plugins.cpp
2625 PATCH: [ 833961 ] Swedish translation 2.1
2626 Submitted by Göran Håkansson
2627 Languages: BuildAll.bat
2628 Languages\Swedish: MergeSwedish.rc MergeSwedish_LastTranslation.rc resource.h
2629 Languages\Swedish\res : all files
2632 PATCH: [ 831052 ] Write version and configuration info
2633 WinMerge: MainFrm.h MainFrm.cpp Merge.dsp Merge.rc resource.h
2634 WinMerge new files: ConfigLog.h ConfigLog.cpp
2635 Languages: *.rc resource.h
2636 PATCH: [ 835220 ] Update default colors
2640 PATCH: [ 834122 ] Add Error Handling around calls to plug-ins
2641 WinMerge: Merge.rc MergeDoc.cpp Plugins.cpp Plugins.h files.h resource.h
2642 common: lwdisp.c lwdisp.h
2643 PATCH: [ 833188 ] clever and explicit error report in TypeLib
2647 PATCH: [ 834526 ] Check that file exist before executing in ShellExtension
2648 ShellExtension: ShellExtension.dsp WinMergeShell.h WinMergeShell.cpp
2651 BUG: (part of) [ 829435 ] Fix character classification routines for UNICODE
2652 WinMerge: MainFrm.cpp MergeDoc.cpp Paths.h Paths.cpp
2653 PATCH: [ 834230 ] Use PostMessage() to update dir compare status
2654 WinMerge: DiffContext.cpp
2657 Creation of directory Docs
2658 WinMerge(moved to Docs): readme-developers.html readme-developers-MakePatchDirs.html
2659 BUG: [ 834490 ] Ignore blank lines disabled when ignore EOL
2663 BUG: [ 833096 ] Left/right-only status overwrites skipped-status
2664 WinMerge: DirViewColItems.cpp
2665 Fix signed/unsigned clashes
2666 WinMerge: MergeDiffDetailView.cpp MergeDoc.cpp MergeEditView.cpp
2667 editlib: ccrystaltextview.cpp
2670 Remove whitespaces from begin and end of ShellExtension.dll path
2671 WinMerge: PropRegistry.cpp
2672 PATCH: [ 833681 ] Fix default editor for external editor
2673 WinMerge: MainFrm.h MainFrm.cpp
2674 Change action.code type to match DIFFITEM.code
2676 Removing unused variables
2677 WinMerge: DiffWrapper.cpp DirActions.cpp DirDoc.cpp DirScan.cpp
2678 DirViewColHandler.cpp MainFrm.cpp Merge.cpp MergeDoc.cpp
2679 BUG: [ 830258 ] Problem compiling with visual .net C++
2680 Submitted with fixes by Steve Beaudoin
2682 WinMerge: ChildFrm.cpp files.cpp
2685 fix Plugins PACK_UNPACK when nothing changes (+ update functions name)
2686 WinMerge: FileTransform.cpp Plugins.cpp Plugins.h
2689 BUG: [ 830911 ] trailing whitespaces not ignored
2691 PATCH: [ 830132 ] open empty file
2693 WinMerge: MergeDoc.cpp files.cpp
2696 Remove SillyTestCrap() from Merge.cpp
2698 Compare filename extensions as lowercase (before calling external editor)
2699 WinMerge: MainFrm.cpp
2700 Comment out GetIP() to fix compiling by including coretools.h
2701 common: coretools.h coretools.cpp
2704 change events PHYSICAL_PREPROCESS and SYNTAX_PREPROCESS to PREDIFFING
2705 WinMerge: FileTransform.cpp FileTransform.h Plugins.cpp Plugins.h
2708 PATCH: [ 830553 ] Finetune scroll to diff
2709 WinMerge: MergeEditView.h MergeEditView.cpp
2712 BUG: [ 830917 ] Rescan effects when validate changes in options
2713 WinMerge: MainFrm.cpp
2716 PATCH: [ 827332 ] detach buffer during load and rescan
2717 WinMerge: GhostTextView.cpp GhostTextView.h MergeDiffDetailView.cpp MergeDiffDetailView.h
2718 MergeDoc.cpp MergeEditView.cpp MergeEditView.h
2719 editlib: ccrystaltextview.cpp ccrystaltextview.h
2720 PATCH: [ 829895 ] Fixed German translation
2721 Submitted by Tim Gerundt
2722 Languages: MergeGerman.rc
2725 PATCH: [ 829570 ] Open patches after creation
2726 WinMerge: DirActions.cpp MainFrm.h MainFrm.cpp Merge.rc PatchDlg.c
2727 PatchDlg.cpp PatchTool.h PatchTool.cpp resource.h
2728 Languages: *.rc resource.h
2731 BUG: [ 830121 ] drag&drop changes ghost lines to real lines
2732 WinMerge: GhostTextView.cpp GhostTextView.h
2733 fix for context menu when the selection is empty
2734 WinMerge: MergeEditView.cpp
2735 fix in PopCursors for ptLastChange
2736 WinMerge: GhostTextView.cpp
2737 BUG: [ 830076 ] Context menu plugins change ghost lines to real lines
2738 WinMerge: GhostTextView.cpp GhostTextView.h MergeEditView.cpp
2739 BUG: [ 830072 ] "Unload script" does not work
2740 WinMerge: FileTransform.cpp MergeEditView.cpp
2743 Fix spelling of "delimiter" in comments.
2744 WinMerge: MainFrm.cpp
2746 2003-10-25 WinMerge experimental release 2.1.3.5 (cvs)
2749 PATCH: [ 828633 ] Abort running scan
2750 WinMerge: DiffThread.cpp DiffThread.h DirDoc.cpp DirDoc.h
2751 DirScan.cpp DirScan.h
2752 PATCH: [ 823924 ] Update about box and copyright year
2756 PATCH: [ 814832 ] Timing traces for loading file
2757 WinMerge: MergeDoc.cpp
2758 Add byte counts, and remove doubled line returns for load timing traces.
2759 WinMerge: MergeDoc.cpp
2760 common: UniMemFile.h
2761 PATCH: [ 826584 ] User-specified codepage conversions
2762 WinMerge: DiffContext.h DirView.cpp MainFrm.cpp MainFrm.h
2763 MergeDoc.cpp MergeDoc.h
2766 PATCH: [ 828283 ] Open Read-only files as such
2767 WinMerge: DirView.cpp files.h files.cpp MainFrm.cpp
2770 BUG: [ 829437 ] Can't compare two files with unicode filenames
2772 Fix typo & mistake, both in comments.
2773 common: SuperComboBox.cpp
2774 WinMerge: DirScan.cpp
2777 PATCH: [ 829266 ] commandline help
2778 WinMerge: Merge.cpp Merge.rc resource.h
2779 Languages: *.rc resource.h
2780 enabling filters in unicode build
2781 WinMerge: Dirdoc.cpp
2782 BUG: [ 829453 ] dropping file in a SuperComboBox, Unicode build
2783 common: SuperComboBox.cpp
2784 Fix unifile code to initialize txtstats.nlosses (see comments in BUG [ 828924 ])
2788 PATCH: [ 828619 ] Prevent closing dir doc whilst scanning
2789 WinMerge: DirDoc.cpp DirDoc.h
2790 PATCH: [ 829306 ] Fix unifile code to append last line
2791 WinMerge: MergeDoc.cpp
2792 Handle lib & includes for MakeResDll (& rearrange globals).
2793 Bump version from 1.0.1.0 to 1.0.2.0.
2794 MakeResDll: MakeResDll.cpp MakeResDll.rc readme.txt
2795 Handle lib & includes for .NET and .NET 2003 in MakeResDll.
2796 Fix location of RegKey.h in MakeResDll.
2797 MakeResDll: MakeResDll.cpp MakeResDll.dsp readme.txt
2798 BUG: [ 827996 ] isspace uses (-> _istspace)
2799 WinMerge: MergeDoc.cpp
2801 asp.cpp basic.cpp batch.cpp ccrystaleditview.cpp ccrystaltextview2.cpp
2802 cplusplus.cpp dcl.cpp fortran.cpp html.cpp is.cpp java.cpp lisp.cpp
2803 pascal.cpp perl.cpp php.cpp python.cpp rexx.cpp rsrc.cpp sgml.cpp
2804 sh.cpp siod.cpp sql.cpp tcl.cpp tex.cpp
2807 BUG: [ 815147 ] Scrollwheel scrolls too far at end of file
2808 editlib: ccrystaltextview.cpp
2809 BUG: [ 826834 ] Text selection startpoint not updated when navigating diffs
2810 WinMerge: MergeEditView.cpp
2813 PATCH: [ 827615 ] Speed up display of large differences - attachment
2814 Submitted by Hern Chen
2815 WinMerge: GhostTextBuffer.cpp MergeDoc.cpp MergeDoc.h
2816 editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h
2817 BUG: [ 828802 ] plugins interface problem
2818 WinMerge: Plugins.cpp
2819 recovering Czech and Slovak custom characters (they were changed to '?')
2820 Languages: Czech.rc Slovak.rc
2823 PATCH: [ 826250 ] New UniMemFile class for memory-mapping
2824 WinMerge: Merge.dsp MergeDoc.cpp
2825 common: unicoder.cpp unicoder.h UniFile.cpp UniFile.h
2828 Fix compile for MakeResDll
2829 common: coretools.cpp
2830 Ran "cvs admin -kb *.bmp *.ico" to fix incorrectly typed resources
2831 Languages: Czech/res Dutch/res French/res German/res
2832 Italian/res Spanish/res
2833 Fix MakeResDll for MSVC.NET & MSVC.NET 2003.
2834 Bump MakeResDll version from 1.0.0.1 to 1.0.1.0.
2835 MakeResDll: MakeResDll.cpp MakeResDll.rc
2836 Add readme.txt to MakeResDll.
2837 MakeResDll: MakeResDll.dsp readme.txt
2838 Fix MakeResDll to not create keys not found.
2839 MakeResDll: MakeResDll.cpp
2841 2003-10-22 WinMerge experimental release 2.1.3.4 (cvs)
2844 BUG: [ 826969 ] Wrong Open-dialog icon
2845 Load WinMerge icon to Open-dialog too
2846 WinMerge: OpenDlg.cpp
2849 Make icons and bitmaps in WinMerge\res directory cvs file type binary (cvs admin -kb)
2850 WinMerge: res\*.bmp res\*.ico
2853 BUG: [ 827064 ] Move "Window" menu after "Plugins" menu
2856 Add a backslash in front of relative path used to test for filter (as in 2.0)
2857 Undo the previous change (it disturbed the display) and make a new one
2858 WinMerge: DirScan.cpp DirDoc.cpp
2859 PATCH: [ 826048 ] headerbar improvements
2860 WinMerge: ChildFrm.cpp ChildFrm.h DirDoc.cpp DirDoc.h DirFrame.cpp DirFrame.h EditorFilepathBar.cpp
2861 EditorFilepathBar.h FilepathEdit.cpp FilepathEdit.h MergeDoc.cpp MergeDoc.h MergeEditView.cpp
2864 PATCH: [ 826149 ] Improved "Merge.ico" and "MergeDoc.ico"
2866 WinMerge/res: Merge.ico MergeDoc.ico
2867 All Languages/res: Merge.ico MergeDoc.ico
2868 PATCH: [ 824987 ] Change binary-file detection (look only for zeros)
2872 BUG: [ 826645 ] Scrolling to diff does not move cursor to diff
2873 WinMerge: MergeEditView.cpp
2874 Fix Patch Generate dialog's comboboxes to really change files
2875 WinMerge: PatchDlg.h PatchDlg.cpp
2876 PATCH: [ 809320 ] Open files with external editor
2877 WinMerge: DirActions.cpp DirView.h DirView.cpp MainFrm.h MainFrm.cpp
2878 Merge.rc PropRegistry.h PropRegistry.cpp resource.h
2879 Languages: *.rc resource.h
2882 Changing unidiff.cpp for DiffThread.cpp as doxygen example
2883 WinMerge: readme-developers.html
2884 'Comparison Summary' not updated after saving (lost in plugin patch)
2885 WinMerge: MergeDoc.cpp
2886 Format for (eol type) must set the asterisk (sign for modified file)
2887 WinMerge: MergeEditView.cpp
2889 2003-10-20 WinMerge experimental release 2.1.3.3 (patch demo)
2892 BUG: [ 826233 ] plugins or unicode bug
2893 WinMerge: UnicodeUtf8.cpp
2896 Add writeup for MakePatchDirs to readme-developers info. Add section on
2897 minor patches and bugfixes. Also make minor grammar fixes. Also update
2898 language count (to 14).
2899 WinMerge: readme-developers.html readme-developers-MakePatchDirs.html
2902 Rearranging strings in .rc (all languages) by growing identifier values
2905 Rearranging strings in English .rc
2909 Added Catalan translation (pre-plugin version)
2910 Languages: BuildAll.bat Catalan/*
2911 Update Catalan.rc for plugins (without stringtable rearrangement)
2912 Languages: Catalan/MergeCatalan.rc resource.h
2913 {Catalan} PATCH: [ 819188 ] Show column number in statusbar
2914 Languages: Catalan/MergeCatalan.rc
2915 PATCH: [ 818427 ] Fix hashing for mac lines and "ignore EOLs"
2916 WinMerge: IO.C MergeDoc.cpp UTIL.C
2917 Reapply PATCH: [ 818865 ] Exponentially grow text line array
2918 I lost it applying PATCH: [ 820364 ] Fix handling of non-ASCII 8-bit files
2919 from files.cpp cvs version 1.13 to 1.14.
2921 PATCH: [ 822451 ] unicoder.cpp update
2922 common: unicoder.cpp unicoder.h
2925 Add a backslash in front of relative path used to test for filter (as in 2.0)
2926 WinMerge: DirScan.cpp
2928 2003-10-17 Christian
2929 New readme-developers.html added
2930 PATCH: [ 825035 ] Updated German translation
2931 Languages: MergeGerman.rc
2933 2003-10-17 WinMerge experimental release 2.1.3.1 (cvs)
2936 RFE: [ 784695 ] Smarter scroll to diff
2937 WinMerge: MergeEditView.cpp
2940 fix for unicode conversion in unicode build
2941 WinMerge: UnicodeUtf8.cpp
2942 fix to delete useless temporary files
2943 WinMerge: FileTransform.cpp
2944 PATCH: [ 807263 ] Preprocessing patch
2945 common: dllproxy.c dllproxy.h lwdisp.c lwdisp.h
2946 Languages: resource.h *.rc
2947 WinMerge: DiffThread.cpp DiffWrapper.cpp DiffWrapper.h DirScan.cpp DirView.cpp DirView.h FileFilterMgr.cpp
2948 FileFilterMgr.h MainFrm.cpp MainFrm.h Merge.cpp Merge.dsp Merge.h Merge.rc MergeDoc.cpp MergeDoc.h
2949 MergeEditView.cpp OpenDlg.cpp OpenDlg.h resource.h
2950 WinMerge Add: FileTransform.cpp FileTransform.h Plugins.cpp Plugins.h SelectUnpackerDlg.cpp
2951 SelectUnpackerDlg.h UnicodeUtf8.cpp UnicodeUtf8.h
2952 WinMerge Remove: unidiff.cpp unidiff.h
2953 PATCH: [ 823556 ] CF_UNICODETEXT format for OLE in unicode build
2954 WinMerge: FilepathEdit.cpp StdAfx.cpp StdAfx.h
2955 editlib: ccrystaleditview.cpp ccrystaltextview2.cpp
2956 PATCH: [ 823074 ] DiffContext not updated
2957 WinMerge: DirDoc.cpp
2960 Get first selected file from directory compare to
2961 Patch Generate dialog
2962 WinMerge: MainFrm.cpp
2963 BUG: [ 813557 ] Selection not visible after find
2964 editlib: cfindtextdlg.cpp
2965 Fix bug: Commandline params for diff were missing from
2966 generated patch-file in unicode build. (Missing conversion)
2967 WinMerge: DiffWrapper.cpp
2970 PATCH: [ 823382 ] Save As should update filename
2971 WinMerge: MergeDoc.h MergeDoc.cpp
2972 BUG: [ 823099 ] RO status not fully implemented when lossy conversions
2973 WinMerge: ChildFrm.cpp
2974 Removed unneeded unlocalisable string from SelectFile() ("Directory selection")
2976 Use SelectFile() from Merge.cpp in Patch Generate dialog
2977 also fixes bug Result-file asked with "Open" dialog
2978 WinMerge: PatchDlg.h PatchDlg.cpp
2979 Use ComboBox with history in Patch Generate -dialog
2980 WinMerge: Merge.rc PatchDlg.h PatchDlg.cpp
2982 Fix bug: File timestamps wrong in patch files
2983 WinMerge: DiffWrapper.cpp
2986 PATCH: [ 819123 ] Half-wait cursor during rescan (new try)
2987 WinMerge: DirDoc.cpp DirDoc.h MainFrm.cpp MainFrm.h WaitStatusCursor.cpp WaitStatusCursor.h
2988 BUG: correcting memory allocation for Unicode build in FilepathEdit.cpp
2989 editlib: FilepathEdit.cpp
2990 BUG: [ 822844 ] Drag & Drop crashes on Unicode build (correcting memory allocation)
2991 editlib: ccrystaltextview.cpp
2994 PATCH: [ 821821 ] Merge multiple diffs
2995 WinMerge: Merge.rc MergeDoc.cpp MergeDoc.h MergeEditView.cpp MergeEditView.h resource.h
2996 editlib: ccrystaltextview.cpp ccrystaltextview.h
2999 PATCH: [ 797502 ] Bugfix and new options for SourceSafe
3000 Submitted by Marvin Gouw
3001 WinMerge: DirActions.cpp MainFrm.h MainFrm.cpp Merge.rc resource.h
3002 VssPrompt.h VssPrompt.cpp
3003 Languages: resource.h *.rc
3006 PATCH: [ 817079 ] New Copy to Left/Right icons
3007 WinMerge/res: Toolbar.bmp
3008 Languages/res: Toolbar.bmp
3010 2003-10-11 WinMerge experimental release 2.1.3.0 (cvs)
3013 PATCH: [ 821532 ] Fix CmpResults After Delete
3014 WinMerge: DiffContext.h DirActions.cpp
3015 PATCH: [ 817875 ] Resizable open dialog
3016 common: CSubclass.h CMoveConstraint.h CSubclass.cpp CMoveConstraint.cpp
3017 Languages: UpdateAll_resource_h.bat *.rc
3018 WinMerge: Merge.rc OpenDlg.cpp OpenDlg.h resource.h
3021 PATCH: [ 820742 ] use extension filter during Rescan in 2.1
3022 DiffContext.cpp DiffContext.h DirDoc.cpp DirDoc.h DirScan.cpp MainFrm.cpp
3025 PATCH: [ 791487 ] Norwegian (bokmål) translation
3026 (Enlarge label in color dialog to avoid clipping text.)
3027 Languages: MergeNorwegian.rc
3028 PATCH: [ 820364 ] Fix handling of non-ASCII 8-bit files
3029 common: unicoder.cpp unicoder.h
3031 PATCH: [ 821431 ] Update SideFlag When Copy file
3032 WinMerge: DirActions.cpp
3035 cosmetic change because I want to use BeSweet with source (delete one space !)
3036 editlib: ccrystaleditview.cpp
3037 PATCH: [ 818198 ] Colors for "ignore blank lines"
3038 Languages: *.rc (except not Brazilian or ChineseSimplified)
3041 PATCH: [ 818865 ] Exponentially grow text line array
3045 PATCH: [ 819219 ] Show only simple EOL char when no mixing EOL modes allowed
3046 WinMerge: MainFrm.cpp MainFrm.h MergeDoc.cpp ccrystaltextview.cpp ccrystaltextview.h
3049 Fix duplicate copy of IDS_LINE_STATUS_INFO (to IDS_LINE_STATUS_INFO_EOL) in most
3050 language files. Fix missing id ID_POPUP_COPYFROMOTHERSIDE in German file
3051 Languages: *.rc (except not Brazilian or ChineseSimplified)
3054 BUG: [ 819793 ] Assert when saving after a Dirdoc session
3055 WinMerge: DirDoc.cpp
3056 PATCH: [ 818198 ] Colors for "ignore blank lines"
3057 WinMerge: MainFrm.cpp Merge.cpp Merge.h Merge.rc MergeDoc.cpp MergeEditView.cpp PropColors.cpp
3058 PropColors.h resource.h
3061 PATCH: [ 819188 ] Show column number in statusbar
3062 WinMerge: ChildFrm.h ChildFrm.cpp Merge.rc MergeEditStatus.h MergeEditView.cpp
3066 PATCH: [ 817502 ] Fix "ignore blank lines"
3067 WinMerge: analyze.c Diff.cpp DIFF.H DiffWrapper.cpp DiffWrapper.h
3068 MergeDiffDetailView.cpp MergeDoc.cpp MergeEditView.cpp MergeEditView.h
3070 PATCH: [ 806277 ] Patch output fix (803299) alternate approach
3072 PATCH: 819633 Fix bug in my "fix ignore blank lines" patch
3076 BUG: [ 803330 ] DirView updated too many times after compare
3077 WinMerge: DiffThread.cpp DirDoc.h DirDoc.cpp
3078 RFE: [ 817859 ] Generate patch from modified files
3079 WinMerge: MainFrm.cpp
3080 Fix Refresh-crash I introduced when fixing BUG [ 803330 ]
3081 WinMerge: DirDoc.cpp
3082 Properly clear display before new dir compare (don't use Redisplay())
3083 WinMerge: DirDoc.cpp
3086 Show text "Identical" on diffnumber panel when files are identical
3089 BUG: [ 817766 ] Dir compare speed drop after 2.0
3090 WinMerge: DiffContext.cpp
3093 PATCH: [ 817269 ] Fix navigation in directory compare
3094 WinMerge: DirView.cpp
3095 PATCH: [ 817394 ] Implement Copy diff and advance to next
3096 WinMerge: Merge.rc MergeEditView.h MergeEditView.cpp resource.h
3097 WinMerge/res: Toolbar.bmp
3098 Languages: resource.h *.rc
3099 Languages/res: Toolbar.bmp
3102 Update dll copy batch file for 4 new build targets
3103 Languages/CopyAll.bat
3106 Undo last changes related to PATCH: [ 813794 ] Fix "ignore blank lines"
3107 Back as of 2003-10-02 23:59
3110 Restore trivial colors originally included in PATCH: [ 813794 ] Fix "ignore blank lines"
3111 WinMerge: MainFrm.cpp Merge.h MergeEditView.cpp PropColors.h
3114 Bugfix for PATCH: [ 813794 ] Fix "ignore blank lines"
3115 (Prevent crashes on identical files dereferencing null script).
3119 two minor changes for PATCH: [ 813794 ] Fix "ignore blank lines"
3120 WinMerge: MergeDiffDetailView.cpp MergeDoc.cpp
3123 PATCH: [ 813794 ] Fix "ignore blank lines"
3124 WinMerge: analyze.c ColorButton.h Diff.cpp DIFF.H DiffWrapper.cpp
3125 DiffWrapper.h MainFrm.cpp Merge.cpp Merge.h MergeDiffDetailView.cpp
3126 MergeDoc.cpp MergeEditView.cpp MergeEditView.h PropColors.cpp
3130 PATCH: [ 815138 ] Commandline filedescriptors
3131 Usage: -dl "description" for left and -dr "description" for right
3132 WinMerge: MainFrm.h Merge.h Merge.cpp MergeDoc.cpp
3135 PATCH: [ 815483 ] Fix file stat structure (lost in dirscan patch)
3136 WinMerge: Diff.cpp DirScan.cpp
3137 PATCH: [ 815523 ] Fix utf8len_of_string
3138 common: unicoder.cpp
3141 PATCH: [ 814829 ] Fix handle bad utf8
3143 PATCH: [ 813847 ] Fix Unicode double copy
3144 WinMerge: MergeDoc.cpp
3147 PATCH: [ 814830 ] Prevent rescan of scanning dirdoc
3149 WinMerge: DirDoc.cpp
3150 PATCH: [ 812581 ] Prevent second scan during first scan
3152 WinMerge: MainFrm.cpp
3155 PATCH: [ 814098 ] More edit-events for delayed rescan
3156 WinMerge: MergeEditView.cpp
3159 BUG In DrawSingleLine, Draw EOL only if there is an EOL in the line
3160 WinMerge: ccrystaltextview.cpp ccrystaltextview.h
3161 BUG [ 814214 ] ASSERT failure with diff at eof
3165 delete NDEBUG from ReleaseMinsize preprocessor definitions
3169 PATCH: [ 809149 ] Handle Unicode files
3170 common: unicoder.cpp unicoder.h
3171 WinMerge: DiffContext.cpp DiffContext.h DirScan.cpp FileFilterMgr.cpp files.cpp
3172 files.h GhostTextBuffer.cpp GhostTextBuffer.cpp.bak GhostTextBuffer.h Merge.dsp
3173 MergeDoc.cpp MergeDoc.h unidiff.cpp unidiff.h
3174 WinMerge/editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h ccrystaltextview2.cpp
3177 PATCH: [ 811039 ] Identify filters by path to solve problems with reused names
3178 common: coretools.cpp coretools.h
3179 WinMerge: FileFilterMgr.cpp FileFilterMgr.h MainFrm.cpp Merge.cpp Merge.h
3180 PropFilter.cpp PropFilter.h
3182 2003-09-26 WinMerge beta 2.1.2.0 released
3184 2003-09-26 WinMerge experimental release 2.1.1.9 (Unicode handling patch)
3187 PATCH: [ 812820 ] Fix regexp for Unicode
3188 common: RegExp.cpp RegExp.h
3189 PATCH: [ 812851 ] Another Unicode fix for PutToClipboard
3190 WinMerge/editlib/ccrystaltextview2.cpp
3191 Fix GetFromClipboard for Unicode (variation on PATCH: [ 812853 ])
3192 WinMerge/editlib/ccrystaltextview2.cpp
3195 PATCH: [ 811371 ] Replace lines when pasting text to ghost lines
3196 WinMerge: GhostTextBuffer.cpp GhostTextBuffer.h
3197 editlib: ccrystaltextbuffer.cpp
3200 fix BUG: [ 812547 ] copy to clipboard crash in WinMergeU.exe
3201 WinMerge/editlib: ccrystaltextview2.cpp
3204 PATCH: [ 811307 ] Open dirview column dialog from menu
3205 WinMerge: DirView.h DirView.cpp Merge.rc resource.h
3206 Languages: resource.h *.rc
3209 fix BUG: [ 811750 ] typo in DirScan.cpp
3210 WinMerge: DirScan.cpp
3211 fix BUG: [ 811747 ] VersionInfo clipping in Unicode ?
3215 BUG: [ 811748 ] Brazilian RC compile failure
3216 Languages/Brasilian: MergeBrasilian.rc
3217 Patch Generate improvements and fixes
3218 WinMerge: DiffWrapper.cpp PatchDlg.h PatchDlg.cpp PatchTool.h
3222 Don't show [0 files selected] in Patch Generate -dialog
3223 WinMerge: PatchDlg.cpp
3226 PATCH: [ 810998 ] Unicode fix for ghosttextbuffer
3227 WinMerge: GhostTextBuffer.cpp
3230 PATCH: [ 809902 ] Show if file is changed
3231 WinMerge: MergeDoc.h MergeDoc.cpp MergeEditView.cpp
3232 PATCH: [ 810066 ] Add Save Left (as...) and Save Right (as...)
3233 WinMerge: Merge.rc MergeDoc.h MergeDoc.cpp MergeEditView.h
3234 MergeEditView.cpp resource.h
3235 Languages: resource.h *.rc
3238 BUG: [ 807766 ] File filter rules not applied to unique items (2.1)
3239 WinMerge: DirScan.cpp
3240 Optimise CFilePathEdit to not change text when same text given again
3241 By Laoran (PATCH "#809902 Show if file is changed" comments)
3242 WinMerge: FilePathEdit.cpp
3243 Remove unused function GetPathOnly() from DirDoc.cpp -
3244 its really defined in coretools.cpp and
3245 WinMerge: DirDoc.cpp
3247 2003-09-20 WinMerge experimental release 2.1.1.7 (Unicode handling patch)
3250 Make directory compare Window to remember maximized state
3251 WinMerge: DirFrame.h DirFrame.cpp
3254 Actualizing the GnuC filter *.o -> \.o
3255 filter: Merge_GnuC_loose.flt
3258 PATCH: [ 809253 ] New release minsize mode
3260 Modifications in patch-dialog to compile in Unicode
3261 WinMerge: PatchDlg.cpp
3264 Select compared files when opening Generate patch-dialog
3265 WinMerge: MainFrm.cpp PatchDlg.cpp
3268 PATCH: [ 803904 ] Create patches
3269 WinMerge: DiffWrapper.h DiffWrapper.cpp MainFrm.h MainFrm.cpp Merge.dsp
3270 Merge.rc resource.h util.cpp
3271 WinMerge new files: PatchDlg.h PatchDlg.cpp PatchTool.h PatchTool.cpp
3272 Languages: *.rc resource.h
3273 BUG: [ 800256 ] Hilight line diff does not scroll to difference
3274 WinMerge: MergeDoc.cpp
3276 2003-09-17 WinMerge experimental release 2.1.1.6 (Preprocessing patch)
3279 fix BUG: [ 807420 ] assert when saving a modified doc
3280 WinMerge: DiffContext.cpp
3283 BUG: [ 807402 ] ListCopy problem for Unix Files
3284 WinMerge: MergeDoc.cpp
3287 PATCH: [ 781013 ] 256 Color icon
3288 Applying to languages
3289 Languages/res: Merge.ico
3290 PATCH: [ 806785 ] Add menuitem to show/hide skipped files
3291 WinMerge: MainFrm.h MainFrm.cpp Merge.rc resource.h
3292 Languages: *.rc resource.h
3295 BUG: [ 806552 ] DirView icons missing?
3296 Adding icons for skipped files and folders
3297 WinMerge: DirView.cpp Merge.rc resource.h
3298 WinMerge/res: new files fileskip.bmp folderskip.bmp
3299 Languages: resource.h *.rc new files /res fileskip.bmp folderskip.bmp
3300 Don't color skipped items filenames in directory compare
3301 WinMerge: DirView.cpp
3302 PATCH: [ 804493 ] Read filter files from users profile directory
3303 NOTE: Filters are read from %profiledir%/Application Data/WinMerge/Filters
3304 common: coretools.h coretools.cpp
3305 WinMerge: FileFilterMgr.cpp Merge.cpp
3308 PATCH: [ 805875 ] Switch to diffcode flags
3309 WinMerge: DiffContext.cpp DiffContext.h DirActions.cpp DirDoc.cpp DirDoc.h
3310 DirScan.cpp DirView.cpp DirView.h DirViewColHandler.cpp DirViewColItems.cpp
3311 MainFrm.cpp MainFrm.h
3312 PATCH: [ 805427 ] Delete unused CStdioFile variable in PrimeTextBuffers
3313 WinMerge: MergeDoc.cpp
3314 PATCH: [ 805888 ] Unicode compile of WinMerge
3315 common: coretools.cpp dllproxy.c LanguageSelect.cpp LanguageSelect.h
3316 LogFile.cpp lwdisp.c lwdisp.h RegExp.cpp RegExp.h StatLink.cpp
3317 SuperComboBox.cpp SuperComboBox.h
3318 WinMerge: ChildFrm.cpp Diff.cpp DiffWrapper.cpp DirDoc.cpp DIRENT.C DirFrame.cpp
3319 DirView.cpp DirViewColHandler.cpp EditorFilepathBar.cpp FilepathEdit.cpp
3320 MainFrm.cpp MainFrm.h Merge.cpp Merge.dsp MergeDoc.cpp MergeEditView.cpp
3321 OpenDlg.cpp paths.cpp PropColors.cpp
3324 Widen label IDC_PRIVATEBUILD on about box.
3327 PATCH: [ 802120 ] Fix for VC.NET
3328 WinMerge: DiffContext.cpp DiffContext.h DirScan.cpp DirView.cpp
3329 DirView.h DirViewColItems.cpp EditorFilepathBar.cpp MainFrm.cpp
3330 MainFrm.h MergeEditView.cpp
3331 editlib: ccrystaleditview.cpp ccrystaleditview.h
3333 2003-09-13 WinMerge experimental release 2.1.1.5 (patch demos)
3334 2003-09-13 WinMerge experimental release 2.1.1.4 (cvs)
3337 effects of patch [ 797821 ]
3338 WinMerge: Merge.rc resource.h
3339 Languages: resource.h *.rc
3342 PATCH: [ 804408 ] Fixes to help compile release version
3344 PATCH: [ 797821 ] GUI for the file EOL option
3345 WinMerge: ChildFrm.cpp GhostTextBuffer.cpp MainFrm.cpp MainFrm.h Merge.rc MergeDoc.cpp
3346 MergeDoc.h MergeEditView.cpp MergeEditView.h PropGeneral.cpp PropGeneral.h resource.h
3347 editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h
3350 PATCH: [ 802762 ] Optimise printc() in diffutils
3354 FIX ASSERT in GetAllViews during a merge session
3355 WinMerge: MainFrm.cpp MainFrm.h
3358 PATCH: [ 799633 ] context menu with scriptlet, from Jochen Tucht
3359 WinMerge: Merge.dsp MergeEditView.cpp MergeEditView.h
3360 common new files: dllproxy.c dllproxy.h lwdisp.c lwdisp.h
3361 PATCH: [ 802373 ] undo/redo/onEditOperation when RO (2.1)
3362 WinMerge: MergeEditView.cpp
3363 PATCH: [ 802359 ] display in diff pane when no diff (2.1)
3364 WinMerge: MergeDiffDetailView.cpp
3367 PATCH: [ 802096 ] Fix diff navigation when first/last diff selected
3368 WinMerge: MergeEditView.cpp
3371 PATCH: [ 802066 ] diff pane when OnDisplayDiff(-1) (2.1)
3372 WinMerge: MergeDiffDetailView.cpp
3375 PATCH: [ 802132 ] Resort dir columns after redisplay
3376 WinMerge: DirView.h DirView.cpp DirDoc.cpp
3377 Fix bug [ 798404 ] Reordering dirview columns does not preserve sorting column
3378 WinMerge: DirView.cpp
3381 PATCH: [ 799464 ] preserve positions during Rescan (2.1)
3382 WinMerge: GhostTextBuffer.cpp GhostTextView.cpp GhostTextView.h MergeDoc.cpp
3383 editlib: ccrystaleditview.cpp ccrystaleditview.h ccrystaltextbuffer.cpp ccrystaltextbuffer.h
3384 ccrystaltextview.cpp ccrystaltextview.h
3387 BUG: [ 802063 ] files_analyzeFile bug for UNIX file (2.1)
3390 2003-09-07 WinMerge experimental release 2.1.1.3 (cvs)
3393 PATCH: [ 800420 ] Fix recursive compare and cleanup recursive usage
3394 WinMerge: DiffThread.h DiffThread.cpp DirDoc.h DirDoc.cpp MainFrm.cpp
3395 Use constant values for whitespace compare setting
3396 WinMerge: DiffWrapper.h DiffWrapper.cpp
3397 Change default diff colors to more eye friendly ones (not so bright ones)
3399 Tweak more yellow diff color
3403 PATCH: [ 795082 ] Display Private Build version in about box
3404 WinMerge: Merge.cpp Merge.rc resource.h
3405 Languages: resource.h *.rc
3408 PATCH: [ 793900 ] Editable file filters
3410 WinMerge: FileFilterMgr.h FileFilterMgr.cpp Merge.h Merge.cpp Merge.rc
3411 PropFilter.h PropFilter.cpp Resource.h
3412 Languages: resource.h *.rc
3415 PATCH: [ 800175 ] skip custom draw if comctl32.dll < 4.71
3416 WinMerge: DirView.cpp
3418 2003-09-07 WinMerge experimental release 2.1.1.2 (cvs)
3421 PATCH: [ 797957 ] correct line number for last real line (in statusbar)
3422 WinMerge: MergeEditView.cpp
3425 PATCH: [ 798272 ] save settings for the dockable diff bar
3426 WinMerge: ChildFrm.cpp ChildFrm.h MainFrm.cpp
3429 Improve 256-color icon
3430 WinMerge/res: Merge.ico
3433 correction for the patch [797741] in CMergeDoc::CDiffTextBuffer::LoadFromFile
3434 WinMerge: MergeDoc.cpp
3437 PATCH: [ 797741 ] Faster file loading
3438 WinMerge: files.h files.cpp MergeDoc.h MergeDoc.cpp
3439 PATCH: [ 784302 ] Implement Read-only for files and dirs
3441 WinMerge: ChildFrm.cpp DirFrame.cpp DirView.h DirView.cpp Merge.rc
3442 MergeEditView.h MergeEditView.cpp Resource.h
3443 Languages: resource.h *.rc
3444 Fix ASSERT when opening files for merging.
3445 Submitted by laoran (PATCH [ 784302 ] comments)
3446 WinMerge: ChildFrm.cpp
3449 PATCH: [ 797797 ] OnOptions must exchange diffOptions with the registry
3450 Submitted by Laoran.
3451 WinMerge: MainFrm.cpp
3454 PATCH: [ 784109 ] layout with two new horizontal panels
3455 common new files: sizecbar.cpp sizecbar.h sizecbarg.cpp sizecbarg.h
3456 common: SplitterWndEx.cpp SplitterWndEx.h
3457 WinMerge: ChildFrm.cpp ChildFrm.h MainFrm.cpp Merge.dsp Merge.rc MergeDoc.cpp
3458 MergeDoc.h MergeEditView.cpp resource.h
3459 Winmerge new files: DiffViewBar.cpp DiffViewBar.h MergeDiffDetailView.cpp MergeDiffDetailView.h
3460 editlib: ccrystaltextview.h
3463 PATCH: [ 779818 ] Fix number display to be locale & user-pref aware
3464 (extended to handle larger numbers than 32 bit, for size)
3465 WinMerge: DirView.cpp DirViewColItems.cpp locality.cpp locality.h Merge.dsp
3468 PATCH: [ 796756 ] Diff API
3469 WinMerge: DiffWrapper.h DiffWrapper.cpp DirDoc.h DirDoc.cpp DirView.cpp
3470 MainFrm.h MainFrm.cpp MergeDoc.h MergeDoc.cpp
3473 PATCH: [ 794345 ] make visible the changed text when undo/redo
3474 WinMerge: MergeEditView.cpp
3477 i18n effects of patch#781529: new popup menu, new dialog, alter existing col header strings
3478 Languages: Czech, Danish, Dutch
3479 i18n effects of patch#781529: new popup menu, new dialog, alter existing col header strings
3480 Languages: French, German, Italian, Korean, Norwegian, Slovak, Spanish
3483 PATCH: [ 784302 ] Implement Read-only for files and dirs
3484 Only background changes, no UI changes
3485 WinMerge: DirDoc.h DirDoc.cpp DirView.cpp MainFrm.h MainFrm.cpp
3486 MergeDoc.h MergeDoc.cpp MergeEditView.h MergeEditView.cpp
3489 Add new colhdrs from patch#781529 to Brazilian.
3490 Reorder ChineseSimplified string tables to match English, and add missing entries.
3491 Reorder ChineseTraditional string tables to match English, and add missing entries.
3492 Languages: Brazilian, ChineseSimplified, ChineseTraditional
3495 Implement fix for BUG#794514: 'Comparison Summary' not updated properly
3496 WinMerge: DirDoc.cpp
3497 i18n effects of patch#781529: new popup menu, new dialog, alter existing col header strings
3498 Languages: Brazilian, ChineseSimplified, ChineseTraditional
3501 [ 783507 ] normalize replaceSelection and ListCopy
3502 WinMerge: GhostTextBuffer.cpp GhostTextBuffer.h MergeDoc.cpp MergeDoc.h
3503 editlib : ccrystaleditview.cpp ccrystaltextbuffer.cpp ccrystaltextbuffer.h
3506 [ 794081 ] Error when dropping a column out of WinMerge
3507 WinMerge: DirView.cpp
3510 Fix paths_GetLongPath to handle trailing . or ..
3511 (BUGFIX: [ 792074 ] Directory mnemonics . and .. are not honored properly)
3513 Fix DIFFITEM::getLeftFilepath & DIFFITEM::getRightFilepath
3514 (BUGFIX: [ 794319 ] Assert when save after merging)
3515 WinMerge: DiffContext.cpp
3518 PATCH: [ 792668 ] Move file load code to CMergeDoc
3519 WinMerge: MainFrm.cpp MergeDoc.h MergeDoc.cpp
3522 PATCH: [ 791487 ] Norwegian (bokmål) translation
3523 Corrections#2 Avbrytt->Avbryt and #3 Opdater->Oppdater
3524 Languages\Norwegian: MergeNorwegian.rc
3525 Correction#0 Bokmal->Bokmål
3527 Correction#1 værktøylinje(n)->verktøylinje(n)
3528 Languages\Norwegian: MergeNorwegian.rc
3529 PATCH: [ 781529 ] Make column info array, and add new columns
3530 common: version.cpp version.h
3531 WinMerge: DiffContext.cpp DiffContext.h DirActions.cpp DirDoc.cpp DirDoc.h
3532 DirScan.cpp DirView.cpp DirView.h MainFrm.cpp Merge.dsp Merge.rc
3533 MergeDoc.cpp resource.h
3534 WinMerge new files: DirColsDlg.cpp DirColsDlg.h DirViewColHandler.cpp
3535 DirViewColItems.cpp DirViewColItems.h
3536 Bugfix: CDiffContext::AddDiff was not setting diff context subdir from argument.
3537 WinMerge:: DiffContext.cpp
3538 Bugfix: Don't prefix subdirectories with dot in ColPathGet.
3539 WinMerge: DirViewColItems.cpp
3540 Bugfix: FILE_SKIP & DIR_SKIP are being labelled as errors
3541 WinMerge: DirViewColItems.cpp Merge.rc resource.h
3542 Bugfix: Fix CDirView::GetItemFileNames to get path properly (as before 2003-08-07).
3543 WinMerge: DirActions.cpp
3544 Bugfix: Remove several memsets of structures whose size varies with common control versions
3545 WinMerge: DirView.cpp DirViewColHandler.cpp
3548 PATCH: [ 787495 ] Create diffutils class (CDiffWrapper)
3549 WinMerge: Merge.dsp MergeDoc.h MergeDoc.cpp
3550 Added: DiffWrapper.h DiffWrapper.cpp
3551 Adding licence text and comments
3552 WinMerge: files.h files.cpp
3553 Adding licence text and comments
3554 WinMerge: DiffThread.h DiffThread.cpp DiffWrapper.h
3557 PATCH: [ 791924 ] Fix sorting when columns are reordered
3558 WinMerge: DirView.cpp
3559 Fix color dialog in Norwegian (Earlier today I forgot to move down the previous labels).
3560 Languages\Norwegian: Norwegian/MergeNorwegian.rc
3561 Updated color property page in Korean (patch#768740).
3562 Languages\Korean: MergeKorean.rc
3565 PATCH: [ 791263 ] Remove CStringEx from OpenDlg (and from WinMerge?)
3566 WinMerge: Merge.dsp OpenDlg.cpp
3567 Common: removed StringEx.h StringEx.cpp
3570 Added Norwegian to batch build file
3571 Languages: BuildAll.bat
3572 Updated two property pages in Norwegian
3573 IDD_PROPPAGE_REGISTRY (patch#789504) and IDD_PROPPAGE_COLORS (patch#768740).
3574 Languages\Norwegian: resource.h Norwegian/MergeNorwegian.rc
3575 Updated color property page in Brazilian (patch#768740).
3576 Languages\Brazilian: MergeBrazilian.rc
3577 Updated color property page in Simplified Chinese (patch#768740 not quite complete).
3578 Languages\ChineseSimplified: MergeChineseSimplified.rc
3579 Updated color property page in ChineseTraditional (patch#768740).
3580 Languages\ChineseTraditional: MergeChineseTraditional.rc
3582 2003-08-20 Christian
3583 PATCH: [ 791487 ] Norwegian (bokmål) translation
3584 Languages: Norwegian added
3586 2003-08-19 WinMerge beta 2.1.0.1 released
3589 Change versions in Merge.rc to "000.000.000.000" as recommended by stampver
3590 (http://www.elphin.com/products/stampver.html).
3594 Updated comments for ShellExtension: added comment about used registry values etc
3596 ShellExtension.cpp WinMergeShell.h WinMergeShell.cpp
3597 Removed two generated files from CVS (Christian spotted those)
3599 ShellExtension.h DllData.cp
3602 PATCH: [ 789204 ] Color dir compare based on left/right newer
3603 WinMerge: DirView.h DirView.cpp
3604 PATCH: [ 789504 ] Remove unneeded old dir shell assoc
3605 WinMerge: Merge.rc PropRegistry.h PropRegistry.cpp resource.h
3606 Languages: resource.h *.rc
3608 2003-08-12 Christian
3609 PATCH: [ 786618 ] Brazilian Portuguese translation
3610 Languages: BuilAll.bat and resurrected directory Brazilian
3611 PATCH: [ 782820 ] Updated Traditional Chinese for 2.0
3612 Languages\ChineseTraditional: MergeChineseTraditional.rc
3613 PATCH: [ 782824 ] Add languages to installer
3614 InnoSetup: WinMerge.iss Info.txt
3617 PATCH: [ 785288 ] Overwrite Read-Only file
3618 WinMerge: MainFrm.h MainFrm.cpp Merge.rc MergeDoc.cpp
3622 PATCH: [ 781013 ] 256 Color icon
3623 editlib/res: Merge.ico
3624 PATCH: [ 783593 ] Add Merge-menu
3629 Fix GetItemFileNames to not pull its data from listview (b/c columns may be reordered).
3630 (Various const fixes needed.)
3631 WinMerge: DiffContext.cpp DiffContext.h DirActions.cpp DirView.cpp DirView.h
3634 PATCH: [ 781582 ] Timer for FlushAndRescan
3635 WinMerge: MergeDoc.cpp MergeDoc.h MergeEditView.cpp MergeEditView.h
3638 PATCH: [ 782866 ] round off in CMergeDoc::RescanIfNeeded
3639 WinMerge: MergeDoc.cpp
3642 PATCH: [ 780359 ] Open identical files
3643 WinMerge: DirView.cpp MainFrm.cpp
3645 2003-08-03 WinMerge release 2.0
3648 PATCH: [ 780827 ] Tooltips for DirView
3650 WinMerge: DirView.cpp DirView.h
3653 PATCH: [ 780508 ] Convert Line Length array to CArray
3654 WinMerge: ccrystaltextview.cpp ccrystaltextview.h
3657 PATCH: [ 780067 ] SUndoRecord::SetText must free previous text
3658 WinMerge: ccrystaltextbuffer.cpp ccrystaltextbuffer.h
3661 PATCH: [ 779470 ] disable unwanted options in PropGeneral
3662 WinMerge: PropGeneral.cpp PropGeneral.h
3665 PATCH: [ 777871 ] New headerbar for the file paths
3666 WinMerge: ChildFrm.cpp ChildFrm.h dllver.cpp dllver.h Merge.dsp Merge.rc resource.h
3667 WinMerge new files : EditorFilepathBar.cpp EditorFilepathBar.h FilepathEdit.cpp FilepathEdit.h
3670 PATCH: [ 778379 ] Drag&drop reordering columns
3671 WinMerge: DirDoc.cpp DirView.cpp DirView.h Merge.dsp dllver.cpp dllver.h
3672 Annotate UpdateResources methods
3673 WinMerge: DirDoc.cpp MainFrm.cpp MergeEditView.cpp
3676 PATCH: [ 779224 ] Fix sort bug in right date
3677 WinMerge: DirView.cpp
3678 bugfix for PATCH: [ 765225]
3679 editlib: ccrystaltextview.cpp ccrystaltextview.h
3682 PATCH: [ 779172 ] Saving fix for 2.0 and 2.1
3683 WinMerge: MergeDoc.cpp
3684 PATCH: [ 779005 ] No temp files when saving local temp files
3685 WinMerge: MergeDoc.cpp
3686 Fix Register.bat comments. Batch files use ":" for comments...
3687 ShellExtension: Register.bat
3690 Some fixes to MergeChineseTraditional.rc from Koko
3691 Languages\ChineseTraditional\MergeChineseTraditional.rc
3694 PATCH: [ 778234 ] Fix DirScan ASSERT when run out of right list
3695 WinMerge: DirScan.cpp
3696 PATCH: [ 765225 ] Convert parse cookie array to be CArray
3697 editlib: ccrystaltextview.cpp ccrystaltextview.h
3700 PATCH: [ 778144 ] Use CopyFile instead of DeleteFile() and MoveFile()
3701 WinMerge: MainFrm.cpp
3702 PATCH: [ 778384 ] Sync OnDropFiles() from MainFrame to SuperComboBox
3703 common: SuperComboBox.cpp
3704 PATCH: [ 778403 ] Fix accel keys in lang files
3705 Languages: ChineseSimplified, ChineseTraditional
3708 PATCH: [ 778290 ] Typo in comment
3709 WinMerge: MergeDoc.cpp
3712 BUG: [ 778166 ] Shell integration missing quotes (2.1)
3713 ShellExtension: WinMergeShell.cpp
3716 [ 776114 ] french keyboard shortcut
3717 Languages: french.rc
3720 PATCH: [ 773296 ] Add shell integration
3721 Added new module ShellExtension
3722 WinMerge: Merge.rc PropRegistry.h PropRegistry.cpp resource.h
3723 Languages: all *.rc and resource.h files
3726 PATCH: [ 776106 ] Fix for TEMP dir error
3728 WinMerge: MergeDoc.cpp
3731 PATCH: [ 766287 ] Use our own dir traversal (instead of diff's)
3732 WinMerge: Diff.cpp DiffContext.h DiffThread.cpp DirDoc.cpp Merge.dsp
3733 DirScan.h DirScan.cpp
3734 PATCH: [ 773981 ] Modify language build process to eliminate msgboxes
3735 (also added a version resource to MakeResDll, as it lacked one)
3736 Languages: BuildAll.bat BuildDll.bat
3737 MakeResDll: MakeResDll.cpp MakeResDll.rc
3738 Added F4 accelerator to all languages besides English
3739 Languages: all *.rc files
3742 PATCH: [ 776525 ] Close doc after failed load
3743 WinMerge: MainFrm.cpp
3746 PATCH: [ 776046 ] Fixes for <Highlight Line Diff> menu item
3747 WinMerge: Merge.rc MergeEditView.cpp
3748 Languages: All Merge*.rc files and resource.h files
3749 PATCH: [ 771666 ] Fix for English descriptions of Chinese
3750 common: LanguageSelect.rc
3754 Added ChineseTraditional, ChineseSimplified, Korean, translations.
3755 PATCH: [ 775000 ] Improve const correctness in crystaltextbuffer
3756 editlib: crystaltextbuffer.cpp crystaltextbuffer.h
3759 PATCH: [ 767147 ] Don't clear existing dirdoc until user saves
3760 WinMerge: DirDoc.cpp
3761 PATCH: [ 763616 ] New menu item: Highlight line diff
3762 WinMerge: Merge.rc MergeDoc.cpp MergeDoc.h MergeEditView.cpp MergeEditView.h resource.h
3763 editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h ccrystaltextview.cpp ccrystaltextview.h
3766 PATCH: [ 772843 ] Remember custom colors
3767 WinMerge: PropColors.h PropColors.cpp
3770 PATCH : [ 771587 ] Undo/Redo functions
3771 WinMerge: MainFrm.cpp MergeDoc.cpp MergeDoc.h MergeEditView.cpp
3772 editlib: ccrystaleditview.cpp ccrystaleditview.h ccrystaltextbuffer.cpp ccrystaltextbuffer.h
3775 PATCH : [ 772908 ] ResetView must reset m_nTopSubLine
3776 editlib: ccrystaltextview.cpp
3779 PATCH : [ 769535 ] Preserve cursor during Rescan
3780 WinMerge: MergeDoc.cpp
3781 editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h ccrystaltextview.cpp ccrystaltextview.h
3784 PATCH: [ 767878 ] Better handling of ghost flag and EOL
3785 WinMerge: MergeDoc.cpp MergeEditView.cpp
3786 editlib: ccrystaleditview.cpp ccrystaltextbuffer.cpp ccrystaltextbuffer.h
3789 PATCH: [ 772228 ] Quick bin check for 2.0
3790 WinMerge: files.h files.cpp MainFrm.cpp MergeDoc.cpp
3793 PATCH: [ 765926 ] Merge empty last line to the last diffrange (change)
3795 WinMerge: MergeDoc.cpp
3798 PATCH: [ 771525 ] Updating cursor in ListCopy
3799 WinMerge: MergeDoc.cpp MergeDoc.h
3800 editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h
3803 PATCH: [ 771503 ] correct UpdateView context in internalInsertText
3804 editlib: ccrystaltextbuffer.cpp
3807 PATCH: [ 768740 ] Additional color options
3808 Submitted by Gilbert Wellisch
3809 WinMerge: MainFrm.cpp Merge.cpp Merge.h Merge.rc MergeEditView.cpp
3810 PropColors.cpp PropColors.h resource.h
3811 Updated other languages
3814 PATCH: [ 771625 ] regression for patch [765399]
3815 WinMerge: MergeEditView.cpp
3818 PATCH: [ 770361 ] Slovak translation
3819 Languages: New Slovak subdirectory
3822 PATCH: [ 765399 ] Careful view initialization in PrimeListWithFile
3823 WinMerge: MergeDoc.cpp MergeEditView.cpp
3824 editlib: ccrystaltextview.cpp
3827 PATCH: [ 769122 ] Keep top screen line within the shorter panel
3828 WinMerge: MergeEditView.cpp
3831 PATCH: [ 765150 ] Fix char count in edit view bottom status line
3832 WinMerge: ChildFrm.cpp ChildFrm.h Merge.rc MergeEditStatus.h
3833 MergeEditView.cpp resource.h
3834 editlib: ccrystaltextview.cpp ccrystaltextview.h
3835 Languages: Updated all resource.h and rc files to include two new strings
3838 PATCH: [ 769295 ] Fix for threaded dir compare crash
3839 WinMerge: DiffThread.h DiffThread.cpp DirDoc.h DirDoc.cpp DirView.h DirView.cpp
3842 PATCH: [ 766727 ] Threaded dir compare
3843 WinMerge: DiffContext.h DiffContext.cpp DirDoc.h DirDoc.cpp
3844 DirView.h DirView.cpp MainFrm.h MainFrm.cpp Merge.dsp
3845 New files: DiffThread.h DiffThread.cpp
3848 PATCH: [ 768378 ] use Rescan Timer for Replace All
3849 WinMerge: MergeEditView.cpp
3852 PATCH: [ 765768 ] Only one Rescan on AllToLeft
3854 WinMerge: MergeDoc.h MergeDoc.cpp MergeEditView.cpp
3857 PATCH: [ 766473 ] Update identical files
3858 WinMerge: MergeDoc.cpp
3861 PATCH: [ 767159 ] merge LF_RIGHT_ONLY and LF_LEFT_ONLY -> LF_GHOST
3862 WinMerge: MergeDoc.cpp MergeEditView.cpp
3863 editlib: ccrystaltextbuffer.h ccrystaltextview.cpp
3866 PATCH: [ 767051 ] code cleanup for GetTextWithoutEmptys
3867 WinMerge: MergeDoc.cpp MergeDoc.h MergeEditView.cpp
3868 editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h
3871 PATCH: [ 765165 ] Log error string if CreateFile fails (to debug window)
3872 WinMerge: files.cpp MainFrm.cpp MainFrm.h MergeDoc.cpp StdAfx.cpp StdAfx.h
3875 PATCH: [ 767204 ] Fix for assert when rescanning with selection
3876 Submitted by Gilbert Wellisch
3877 editlib: ccrystaltextview.cpp
3880 PATCH: [ 765399 ] resize m_pdwParseCookies before GoToLine
3881 WinMerge: MergeDoc.cpp MergeEditView.cpp
3884 PATCH: [ 765926 ] Merge empty last line to the last diffrange (change)
3885 WinMerge: MergeDoc.cpp
3888 PATCH: [ 766038 ] stay in the viewing area during OnFirstdiff
3889 WinMerge: MergeEditView.cpp
3892 PATCH: [ 765463 ] Simplify temp path handling a little
3893 WinMerge: MergeDoc.h MergeDoc.cpp
3896 PATCH: [ 764571 ] Ask about saving when closing with esc
3897 WinMerge: MainFrm.cpp MergeDoc.cpp MergeEditView.cpp
3898 PATCH: [ 763499 ] update french language
3903 PATCH: [ 763265 ] Fix handling of .. and . components
3907 PATCH: [ 764789 ] Fix Private Build string in rc file
3911 PATCH: [ 763817 ] Hilight diffs when syntax hilight is off
3912 WinMerge: MergeEditView.cpp
3913 PATCH: [ 762531 ] Inproper globals in editlib/cs2cs.cpp
3916 PATCH: [ 762529 ] Dirframe trying to clear non-existing pane
3918 WinMerge: DirFrame.cpp
3920 2003-06-30 WinMerge beta 2.1.0.0 released
3923 [ 762394 ] update german language
3924 Languages: German\MergeGerman.rc
3927 PATCH: [ 762835 ] Display line number etc beneath editor
3928 WinMerge: ChildFrm.cpp ChildFrm.h DirFrame.cpp Merge.cpp Merge.dsp
3929 MergeEditStatus.h MergeEditView.cpp MergeEditView.h
3930 editlib: ccrystaltextbuffer.h ccrystaltextview.cpp ccrystaltextview.h
3933 PATCH: [ 758912 ] Combine duplicated code in CMergeEditView::OnEditCopy
3934 WinMerge: MergeEditView.cpp
3935 PATCH: [ 762533 ] Stdafx.h has dublicated and unneeded includes
3937 PATCH: [ 762271 ] Alter ListCopy to copy eol chars
3938 WinMerge: MergeDoc.cpp MergeDoc.h
3939 editlib: ccrystaltextbuffer.h ccrystaltextbuffer.cpp
3942 PATCH: [ 762749 ] Forced rescan after options changed
3943 WinMerge: MainFrm.cpp
3946 PATCH: [ 761874 ] Fix unlocalisable acceskeys
3949 Updated language files too
3950 PATCH: [ 761827 ] Current diff item to select inactive diff
3951 WinMerge: MergeDoc.h MergeDoc.cpp MergeEditView.cpp
3952 PATCH: [ 762098 ] Code cleanups from Jochen
3954 WinMerge: MainFrm.h MainFrm.cpp MergeDoc.cpp MergeEditView.cpp
3957 PATCH: [ 758930 ] Display EOL chars with View Whitespace
3958 WinMerge: MainFrm.cpp
3959 editlib: ccrystaltextview.h ccrystaltextview.cpp
3960 PATCH: [ 762268 ] Fix typo in comment (wenn -> when)
3961 editlib: ccrystaltextview.cpp
3964 PATCH: [ 761951 ] Fix scrolling corruption
3966 editlib: ccrystaltextview.cpp
3969 PATCH: [ 760745 ] Fix empty search field detection and better history in FindDlg and EditReplaceDlg
3970 editlib : ccrystaleditview.cpp ccrystaltextview.cpp ceditreplacedlg.cpp ceditreplacedlg.h
3971 cfindtextdlg.cpp cfindtextdlg.h memcombo.cpp memcombo.h
3973 2003-06-26 Christian
3974 PATCH: [ 754001 ] 2.0 doc link points to 1.7 docs
3975 WinMerge: MainFrm.cpp
3978 PATCH: [ 755918 ] Fix typo in CCrystalTextView extension list
3979 Added more filename extensions
3980 editlib: ccrystaltextview.cpp
3981 PATCH: [ 757180 ] Update Open OK on dropped file
3983 common: SuperComboBox.cpp
3986 PATCH: [ 759755 ] Better rescan error reporting
3987 WinMerge: MainFrm.cpp MergeDoc.h MergeDoc.cpp
3988 PATCH: [ 760441 ] Fix recursive d&d compare
3989 WinMerge: MainFrm.cpp
3992 PATCH: [ 759778 ] Minor cleanup of crystaltextbuffer.cpp
3993 editlib: ccrystaltextbuffer.cpp
3994 PATCH: [ 760077 ] Omit final ghostline if last line unterminated
3995 WinMerge: MergeDoc.cpp
3996 PATCH: [ 760129 ] Wipe Undo stack if Undo fails, and fix Undo check
3997 editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h
4000 PATCH: [ 759533 ] Fix InternalInsertText & InternalDeleteText
4001 editlib: ccrystaltextbuffer.cpp
4002 PATCH: [ 759569 ] Fix Undo/Redo & line mappings
4003 editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h ccrystaleditview.cpp
4006 PATCH: [ 759344 ] Add Copy, Cut & Paste to Edit menu
4008 Updated other languages too - translations from Perry and Christian
4011 PATCH: [ 758870 ] Return filesize+1 rather than 0 for new lines at end
4012 editlib: crystaltextbuffer.cpp crystaltextbuffer.h
4013 PATCH: [ 758900 ] Fix bug in pasting contiguous empty lines.
4014 editlib: crystaltextbuffer.cpp
4015 PATCH: [ 756218 ] Fix copy & paste typo in comment in Merge.cpp
4019 PATCH: [ 716456 ] Update Undo/Redo info with rescan line mapping
4020 WinMerge: MergeDoc.cpp MergeEditView.h
4021 editlib: crystaltextbuffer.cpp crystaltextbuffer.h
4024 PATCH: [ 728153 ] If opening first file fails, don't open second
4025 WinMerge: MainFrm.cpp
4028 PATCH: [ 755918 ] Fix typo in CCrystalTextView extension list
4029 editlib: ccrystaltextview.cpp
4031 2003-06-16 Christian
4032 PATCH [ 754015 ] WinMerge installer imrovements
4033 InnoSetup: Info.txt WinMerge.iss WinMergeIcon.bmp WinMergeLarge.bmp
4036 PATCH: [ 753284 ] Fix cursor slowdown after rescan
4037 editlib: ccrystaltextview.cpp
4040 PATCH: [ 750160 ] Char width fix
4041 editlib: ccrystaltextview.cpp
4044 PATCH: [ 750302 ] Allow *.flt filter files
4048 Updated filter file from patch [ 742041 ] Improvements to file/directory filters
4049 Filters: Merge_VC_loose.flt
4050 BUG: [ 749007 ] "Highlighting" is misspelled as "Hilighting"
4053 2003-06-05 WinMerge 2.0.0 Release Candidate 1 released
4055 2003-06-05 Christian
4056 PATCH: [ 749566 ] Updated resource files
4057 Languages: all resource.h files and all Merge*.rc files
4059 2003-06-04 Christian
4060 Updated Czech and Danish resources
4061 Languages: Czech\resource.h Czech\MergeCzech.rc Danish\resource.h Danish\MergeDanish.rc
4064 PATCH: [ 747090 ] Fix scroll handling
4065 editlib: ccrystaltextview.cpp
4068 PATCH: [ 746319 ] Adjust horiz scrolling width
4069 editlib: ccrystaltextview.cpp
4072 PATCH: [ 745654 ] Draw long lines
4073 WinMerge: MergeEditView.cpp
4074 editlib: ccrystaltextview.cpp
4075 PATCH: [ 742041 ] Improvements to file/directory filters
4076 WinMerge: FileFilterMgr.h FileFilterMgr.cpp Merge.cpp
4077 PATCH: [ 738557 ] Allow "Open Left" for directories
4078 WinMerge: DirActions.cpp DirView.h DirView.cpp
4080 2003-05-29 Christian
4081 PATCH: Applied [ 745223 ] Fix pasting different EOL types
4082 edilib: ccrystaltextbuffer.cpp
4083 BUG: [ 744990 ] Pasting to the right
4086 Made new folder \Filters for filter files. Added Perry's original filter files
4087 working with beta 1.9.2.2
4090 PATCH: [ 744872 ] Use CopyFile()
4091 WinMerge: files.h files.cpp MergeDoc.cpp
4094 PATCH: [ 743284 ] String fixes
4095 WinMerge: DirDoc.cpp DirView.cpp MainFrm.cpp MergeDoc.h paths.cpp
4096 editlib: ccrystaleditview.cpp ccrystaltextview.cpp registry.cpp
4099 PATCH: [ 742735 ] Fix CCrystalTextBuffer::InsertLine()
4100 edilib: ccrystaltextbuffer.cpp
4102 2003-05-23 Christian
4103 Made new folder \InnoSetup\ for files related to making WinMerge installer using InnoSetup
4106 PATCH: [ 741265 ] Fix for bug#741263: 1.9.2.2 crash on refresh
4107 WinMerge: Diff.cpp DiffContext.cpp DiffContext.h DirDoc.cpp MainFrm.cpp
4109 2003-05-19 WinMerge beta 1.9.2.2 released
4112 PATCH: [ 739529 ] project file & directory filters
4113 WinMerge: Diff.cpp DiffContext.cpp DiffContext.h FileFilterMgr.cpp
4114 FileFilterMgr.h MainFrm.cpp MainFrm.h Merge.cpp Merge.dsp Merge.h
4115 Merge.rc PropFilter.cpp PropFilter.h resource.h
4118 PATCH: [ 737709 ] Remove unneeded UpdateAllViews()
4119 WinMerge: MergeDoc.cpp
4120 PATCH: [ 738467 ] Enable/disable save items
4121 WinMerge: MergeEditView.h MergeEditView.cpp
4124 PATCH: [ 737692 ] Scrolling optimisation - significant speedup
4125 editlib: ccrystaltextview.cpp
4128 PATCH: [ 736443 ] Prpoper Esc fix
4129 WinMerge: DirView.h DirView.cpp Merge.cpp MergeEditView.h MergeEditView.cpp
4132 PATCH: [ 735127 ] German Translation
4133 Updated German language file submitted by Jörg Schneider
4134 PATCH: [ 734787 ] Disable ESC closing window
4135 NOTE: This is to fix BUG [ 734554 ] ESC closes dialog + document
4137 BUG: [ 711961 ] shift-tab in editor moved block then deselects
4138 WinMerge: MergeEditView.cpp
4141 PATCH: [ 733383 ] Enable Find- and Replace- dialogs
4142 WinMerge: Merge.rc resource.h
4143 editlib: ceditreplacedlg.h ceditreplacedlg.cpp cfindtextdlg.h
4144 cfindtextdlg.cpp editcmd.h editres.rc
4145 Removed: editlib/resource.h
4146 Updated other languages
4147 PATCH: [ 733926 ] Fix find dialog text selection
4148 editlib: ccrystaltextview.cpp
4151 PATCH: [ 732775 ] Add support for MAC files
4152 WinMerge: MergeDoc.cpp MergeEditView.h
4155 BUG: [ 731486 ] Crash after save
4156 WinMerge: MergeDoc.cpp
4157 PATCH: [ 731533 ] Temp path fix
4158 WinMerge: MergeDoc.h MergeDoc.cpp
4159 editlib: ccrystaltextbuffer.h ccrystaltextbuffer.cpp
4162 BUG: [ 724726 ] Status bar says "Rescanning" the first time
4166 PATCH: [ 730738 ] Update BCMenu (to v3.033)
4167 WinMerge: BCMenu.h BCMenu.cpp
4168 Updates BCMenu to v3.033, http://www.codeproject.com/menu/bcmenu.asp
4171 PATCH: [ 728542 ] Automatic rescan enable/disable
4172 WinMerge: MainFrm.h MainFrm.cpp Merge.rc MergeEditView.h MergeEditView.cpp
4173 PropGeneral.h PropGeneral.cpp resource.h
4174 Updated other languages too
4177 PATCH: [ 726330 ] Saving before refresh - backout saving - see bug [ 723412 ]
4178 WinMerge: MergeDoc.cpp MergeEditView.cpp
4179 PATCH: [ 728228 ] Rename properties to options and rearrange
4180 Renaming "Properties" to "Options"
4181 WinMerge: MainFrm.h MainFrm.cpp Merge.rc resource.h
4182 Updated .rc and resource.h for other languages
4183 BUG: [ 718133 ] Inconsistent user keyword list for C/C++ syntax hiligth
4184 editlib: cplusplus.cpp
4187 BUG: [ 728173 ] Autoscroll first diff breaks syntax hilight
4188 WinMerge: MergeDoc.cpp
4191 PATCH: [ 726330 ] Saving before refresh
4192 WinMerge: MergeDoc.h MergeDoc.cpp MergeEditView.cpp
4193 PATCH: [ 727455 ] Autoscroll first diff for dir compare
4194 WinMerge: DirView.h MainFrm.cpp
4197 PATCH: [ 727104 ] Disable margins for unknown filetypes
4198 editlib: ccrystaltextview.h ccrystaltextview.cpp
4201 PATCH: [ 721939 ] Wider horiz scroll + more space after last char
4202 editlib: ccrystaltextview.cpp
4203 PATCH: [ 726390 ] Last diff shown incorrectly sometimes
4204 WinMerge: MergeDoc.cpp
4207 Changed dynamic array to be CArray based
4208 editlib: ccrystaltextview.cpp
4209 PATCH: [ 724309 ] Add WaitStatusCursors
4210 WinMerge: DirDoc.cpp DirView.cpp MainFrm.cpp Merge.dsp MergeDoc.cpp MergeEditView.cpp
4211 WaitStatusCursor.cpp WaitStatusCursor.h
4212 PATCH: [ 724473 ] Move WaitStatusCursor strings into RC
4213 WinMerge: DirDoc.cpp DirView.cpp MainFrm.cpp MergeDoc.cpp MergeEditView.cpp resource.h StdAfx.cpp StdAfx.h
4214 PATCH: [ 724479 ] Fix Refresh crash in empty dir view
4215 WinMerge: DirDoc.cpp
4216 bugfix: Add new files that were part of patch#724309
4217 WinMerge: WaitStatusCursor.cpp WaitStatusCursor.h
4218 PATCH: [ 724493 ] WaitStatusCursor for MergeDoc rescans
4219 WinMerge: MergeDoc.cpp
4222 [ 724280 ] Could use wait cursors at OpenSelection calls
4223 WinMerge: DirView.cpp
4226 PATCH: [ 722083 ] refresh button (menu item, accelerator)
4227 WinMerge: DirView.cpp DirView.h Merge.rc MergeEditView.cpp MergeEditView.h resource.h res/Toolbar.bmp
4228 Also updated resource files (resource.h, *.rc, Toolbar.bmp) to all languages
4231 PATCH: [ 720613 ] CDirView leaks imagelist
4232 WinMerge: DirView.cpp
4233 PATCH: [ 720701 ] Use memory-mapped files when saving files
4234 WinMerge: files.h files.cpp MergeDoc.h MergeDoc.cpp
4237 PATCH: [ 716475 ] Reduce edtlib.h coupling
4238 WinMerge: MergeEditView.h StdAfx.h editlib/ccrystaleditview.inl
4241 PATCH: [ 719872 ] Use memory-mapped files when loading files
4242 WinMerge: files.h files.cpp Merge.dsp MergeDoc.h MergeDoc.cpp
4245 PATCH: [ 717688 ] CrystalEditor optimisations and memleaks
4247 editlib: ccrystaltextview.cpp
4250 PATCH: [ 717688 ] CrystalEditor optimisations and memleaks
4251 editlib: ccrystaltextview.cpp
4254 PATCH: [ 716744 ] Fix CrystalEditor memory leaks
4255 editlib: ccrystaltextbuffer.cpp ccrystaltextview.cpp
4258 PATCH: [ 716308 ] Disable italic text
4259 editlib: ccrystaltextview.cpp
4260 PATCH: [ 715553 ] Add commandline options to not add paths to MRU
4261 Usage: -ur to ignore rigth, -ul to ignore left and -ub to ignore both
4262 WinMerge: MainFrm.h MainFrm.cpp Merge.cpp
4265 PATCH: [ 715457 ] LoadFromFile() rewrote
4266 WinMerge: MergeDoc.h MergeDoc.cpp
4269 PATCH: [ 716088 ] Fix bin same/diff bug in Diff.cpp & analyze.c
4270 WinMerge: analyze.c Diff.cpp
4272 2003-04-04 Christian
4273 PATCH: [ 711843 ] Allow backspace at beginning of line
4274 WinMerge: MainFrm.cpp
4277 BUG: [ 714570 ] Sensitive to EOL -setting not saved
4278 WinMerge: MainFrm.cpp
4281 PATCH: [ 713322 ] Save whole buffer not line by line
4282 WinMerge: MergeDoc.cpp
4283 PATCH: [ 713416 ] MergeEditView optimisations
4284 WinMerge: MergeEditView.cpp
4287 PATCH: [ 711437 ] Don't copy/cut removed lines
4288 WinMerge: MergeDoc.h MergeDoc.cpp MergeEditView.h MergeEditView.cpp
4291 PATCH: [ 712429 ] Fix UpdateItemStatus bug 712093
4292 WinMerge: DirActions.cpp DirView.cpp paths.cpp paths.h
4295 PATCH: [ 712417 ] Fix save of open doc before next merge
4296 WinMerge: ChildFrm.cpp ChildFrm.h DirDoc.cpp DirDoc.h DirFrame.cpp DirFrame.h
4297 DirView.cpp DirView.h MainFrm.cpp MainFrm.h MergeDoc.cpp MergeDoc.h
4300 PATCH: [ 710347 ] Fix crash of winmerge c:\ d:\
4301 WinMerge: DiffContext.h DirDoc.cpp MainFrm.cpp Merge.cpp OpenDlg.cpp OpenDlg.h paths.cpp paths.h
4302 PATCH: [ 687177 ] Handle more errors during copy/creation
4303 WinMerge: MainFrm.cpp
4304 PATCH: [ 689884 ] Revise doc/view code (allow multiple docs)
4305 WinMerge: ChildFrm.cpp DirActions.cpp DirDoc.cpp DirDoc.h DirView.cpp MainFrm.cpp MainFrm.h
4306 Merge.cpp MergeDoc.cpp MergeDoc.h MergeEditView.cpp
4307 NB: This broke two things in MainFrm--search for TODO: 2003-03-29
4308 BUGFIX: [ 711975 ] CMainFrame::GetAllViews crashes
4309 WinMerge: MainFrm.cpp
4310 BUGFIX: [ 711983 ] ClearMergeDoc causing ASSERT
4311 WinMerge: DirDoc.cpp MergeDoc.cpp
4313 2003-03-26 WinMerge beta 1.9.1.4 released
4316 PATCH: [ 709575 ] Fix sanity check in CChildFrame::UpdateHeaderSizes()
4317 WinMerge: ChildFrm.cpp
4318 PATCH: [ 708542 ] Make splash & about show language-independent version
4319 common: version.cpp version.h
4320 WinMerge: Merge.cpp Splash.cpp
4322 2003-03-25 Christian
4323 Replace COPYING with corrected version from http://www.gnu.org/licenses/gpl.txt
4326 PATCH: [ 708893 ] Don't ask to save file compare
4327 WinMerge: MergeDoc.h MergeDoc.cpp
4328 PATCH: [ 703069 ] Fix undo crash
4329 editlib: crystaltextbuffer.cpp
4330 PATCH: [ 709502 ] Fix missing/existing EOL at end of file
4331 WinMerge: MergeDoc.h MergeDoc.cpp
4334 PATCH: [ 706006 ] Suppress Rescan during Merge
4335 Merge.cpp Merge.h MergeDoc.cpp MergeDoc.h MergeEditView.cpp
4338 PATCH: [ 707753 ] Delayed rescan - fix
4339 WinMerge: MergeEditView.cpp
4342 PATCH: [ 707753 ] Delayed rescan
4343 WinMerge: MergeEditView.h MergeEditView.cpp
4346 PATCH: [ 707152 ] Delay path check in opendialog
4347 WinMerge: OpenDlg.h OpenDlg.cpp
4350 PATCH: [ 703234 ] Use stricmp
4351 WinMerge: DIFF.C diffmain.c SDIFF.C
4354 Deleted unused res files: bitmap1.bmp, bmp00001.bmp, ScreenShot.gif, WinMerge.gif
4356 2003-03-11 Christian
4357 PATCH: [ 700872 ] Esc to close crashes WinMerge
4361 PATCH: [ 699839 ] Add same binaries to dir compare status
4362 WinMerge: MainFrm.h MainFrm.cpp
4363 PATCH: [ 699893 ] Add drag&drop of files/paths to main window
4364 Note: Press down Ctrl when dropping dirs for recursive compare
4365 WinMerge: MainFrm.h MainFrm.cpp Merge.cpp paths.h paths.cpp
4367 2003-03-07 WinMerge beta 1.9.1.3 released
4370 PATCH: [ 699580 ] Fix paths.cpp
4374 PATCH: [ 698754 ] Update filetimes after save
4375 WinMerge: DiffContext.h DiffContext.cpp DirDoc.h DirDoc.cpp MergeDoc.cpp
4377 2003-03-06 Christian
4378 Update Danish language file with new strings in MergeDanish.rc
4379 Removed duplicate dialog in French language file in MergeFrench.rc
4380 Added Czech to BuildAll.bat
4381 PATCH: [ 698346 ] Use full path for directory context menu option
4382 WinMerge: PropRegistry.cpp
4385 PATCH: [ 696695 ] DirDoc Redisplay optimisation
4386 WinMerge: DirDoc.h DirDoc.cpp
4389 Added new subdir Languages/Danish/res
4390 PATCH: [ 695857 ] Fix directory handling, & UNC paths, & shortnames
4391 Fix Danish language files: Update resource.h and update language dialogbox to use IDC_LANGUAGE_LIST.
4394 BUG: [ 684622 ] Escape key closes whole program
4395 Nikki Locke's patch slightly modified
4397 PATCH: [ 696588 ] Multimonitor + virtual screens support
4398 WinMerge: MainFrm.cpp Merge.dsp multimon.h
4399 BUG: [ 697320 ] Saving enabled when comparing directories
4400 WinMerge: DirView.h DirView.cpp
4403 BUG: [ 693932 ] Trailing \ on path crashes WinMerge
4404 WinMerge: OpenDlg.h OpenDlg.cpp
4407 BUG: [ 693820 ] Typed path failed to compare
4408 WinMerge: OpenDlg.cpp
4409 BUG: [ 693004 ] Keyboard does not work for accessing menus
4410 Add missing WM_MENUCHAR handler from www.codeguru.com
4411 WinMerge: MainFrm.h MainFrm.cpp
4414 BUG: [ 683753 ] Rescan is not prompting to save dirty
4419 2003-02-26 Christian
4420 [ 70970 ] Translate Merge.rc into danish
4421 BuildAll.bat and added directory Languages/Danish
4424 [ 692922 ] Don't try to compare file & directory
4427 [ 686699 ] Check & return file saving success
4428 Fix2: Do not return save success of "Save As"
4433 [ 687574 ] Navigate in directory view (fix bug in patch)
4436 [ 686699 ] Check & return file saving success - fix
4438 MergeDoc.h Mergedoc.cpp
4441 [ 650356 ] suggest commenting out several functions
4442 [ 684416 ] is_all_whitespace is bad
4443 Removed bad unused functions in common/coretools.cpp (& .h)
4444 (Did not remove all unused functions, only ones with bugs)
4447 Sync'ed all language resources to English version.
4448 [ 684300 ] Stringified Diffitems
4449 + combined & modularized code in DirDoc.cpp
4451 DiffContext.cpp DiffContext.h DirDoc.cpp DirView.cpp DirView.h
4454 [ 689876 ] Patch to fix bug # 689869 (ASSERT on Rescan)
4456 MainFrm.cpp & new resource IDS_ERROR_FILE_NOT_FOUND
4457 [ 687574 ] Navigate in directory view
4459 DirView.cpp DirView.h
4460 [ 690176 ] Cmdline param for ESC closing
4461 (and updated all obsolete French & German accelerators as well)
4463 Merge.cpp Merge.h Merge.rc
4465 Czech\MergeCzech.rc Dutch\MergeDutch.rc French\MergeFrench.rc
4466 German\MergeGerman.rc Italian\MergeItalian.rc Spanish\MergeSpanish.rc
4467 [ 689896 ] Update to sync Czech resource
4470 2003-02-18 Christian
4471 Removed annoying SourceSafe path from Merge.dsp
4474 [ 684737 ] Fix Language Box to handle dblclick
4476 LanguageSelect.h LanguageSelect.cpp
4479 [ 687039 ] View whitespaces on editor
4481 MainFrm.h MainFrm.cpp Merge.rc resource.h
4483 ccrystaltextview.cpp
4486 [ 686699 ] Check & return file saving success
4487 Merge.rc MergeDoc.h Mergedoc.cpp resource.h
4490 [ 685491 ] Saving fixes: SaveToFile() rewrite part
4491 + Missing NULL check for mf->m_pDirDoc in CMergeDoc
4492 MergeDoc.h MergeDoc.cpp
4495 [ 685816 ] Recommend deleting unlocalized translations
4496 [ 684290 ] improved bin test:
4498 [ 686090 ] Show/hide binary files
4500 DirDoc.cpp MainFrm.cpp MainFrm.h Merge.rc readme.txt
4503 Spanish/MergeSpanish.rc Spanish/resource.h
4508 Some updates to align Dutch rc towards English rc.
4509 [ 685637 ] CMainFrame::SyncFiles GPF bug
4511 2003-02-12 Christian
4512 [ 630286 ] WinMerge crashes/fails in WinCVS
4513 [ 683752 ] Add option to be listed on Directory context menu
4516 Fixing recent SplitFilename & directory concat problems.
4517 [ 683924 ] Same binaries for directory compare.
4520 Kimmo's fix for crash due to NULL doc pointer in MergeDoc::SaveHelper.
4521 [ 470013 ] Spanish Orthography and Semantics
4524 [ 683120 ] splitfilename changed to CStrings
4525 Move new SplitFilename from Chris Mumford into coretools, remove old
4526 versions, add test chassis, and fix some minor cases.
4529 DirDoc.*: Changed from strftime to COleDateTime::Format (respects user prefs).
4530 First half of [ 679692 ] Update after editing (with code combination).
4531 [ 682505 ] API changes for CLog, CDirView and CDirDoc
4532 2nd half of [ 679692 ] Update after editing
4534 2003-02-07 WinMerge beta 1.9.1.1 released
4536 2003-02-07 Christian
4537 Added 24 missing languages
4538 Fixed duplicated strings in Italian rc.
4541 Updated Brazilian, Italian, Spanish resources to sync with English/main resources.
4543 2003-01-28 Christian
4544 Committed [ 424579 ] Escape to exit
4546 2003-01-27 Christian
4547 [ 668654 ] Tabtype selection feature
4548 [ 672554 ] Update DirView after individual merge
4549 Fixed [ 225571 ] After individual merge, dirView not updated
4550 [ 672879 ] Propose clarifying change in ccrystaleditview.cpp
4551 [ 672885 ] Fix for ASSERT from CChildFrame::UpdateHeaderSizes
4552 [ 673063 ] Modification check before close
4553 [ 675526 ] Waitcursors and merging all
4555 2003-01-21 Christian
4556 [ 671037 ] Changes for MSVC.NET
4557 [ 671810 ] Tempfiles to temp dir
4559 2003-01-20 Christian
4560 [ 671034 ] operator precedence bug in SplitterWndEx.cpp
4562 2003-01-15 Christian
4563 [ 650384 ] Fix for false equals for binary files
4564 [ 651689 ] Add OpenLeft, OpenLeftWith, ... context
4565 [ 650293 ] Implement context menus with multiselect
4567 2003-01-14 Christian
4568 [ 665993 ] Little optimisation
4570 2002-12-17 WinMerge beta 1.7.2.11 released
4573 Implemented recursive directory delete
4574 Fix bug in EOL handling in crystaltextbuffer, and add optional EOL sensitivity.
4575 Added optional EOL insensitivity to gnu diff IO.c.
4576 Added status bar progress (file count) indicator during scanning
4577 Fixed tooltips of toolbar buttons to list correct hotkeys
4578 Split "Show Unique" option into "Show Left Unique" and "Show Right Unique"
4581 Added left files, left dirs, right files, right dirs to status bar feedback
4583 2002-11-18 WinMerge beta 1.7.2.1 released