WinMerge

This is an old version of WinMerge, for the latest version go to the main site.

Change History

2005-05-31 2.2.4 Stable Release

2005-05-26 Kimmo
 BUG: [ 1198263 ] MergeKorean translation credit wrong?
  Src/Languages/Korean: MergeKorean.rc

2005-05-20 Kimmo
 PATCH: [ 1203680 ] Fix tab adding spaces in unicode builds
  Src/editlib: ccrystaltextview.cpp

2005-05-18 Perry
 Update language count (19->21, three occurrences)
  Docs/Developers/readme-developers.html.
 Note that sourceforge tracker doesn't display tabs.
  Docs/Developers/readme-developers.html.

2005-05-15 Perry
 PATCH: [ 1201961 ] Japanese translation update
  (typo fix for earlier version of same patch, IDC_EOL_SENSITIVE)
  Src/Languages/Japanese: MergeJapanese.rc

2005-05-14 Perry
 PATCH: [ 1199600 ] Minor update to text encoding docs in manual
  Docs/Users/Manual/Text_encoding.xml
 PATCH: [ 1201961 ] Japanese translation update
  Src/Languages/Japanese: MergeJapanese.rc
 PATCH: [ 1107484 ] Fix broken version columns
  Src: DiffContext.cpp DiffContext.h DiffFileInfo.cpp DiffFileInfo.h 
   DirViewColItems.cpp
 BUG: [ 1157554 ] MergeKorean IDD_FILEFILTERS not DIALOGEX
  Src/Languages/Korean: MergeKorean.rc

2005-05-12 Kimmo
 BUG: [ 1198435 ] Comma missing from ID_LOCBAR_GOTODIFF menuitem
  Src: Merge.rc
  Src/Languages: *.rc
 PATCH: [ 1175065 ] Use view lines when scrolling from location pane
  Src: LocationView.cpp LocationView.h MergeEditView.cpp

2005-05-12 Perry
 BUG: [ 1193163 ] "Gerenate Patch" deletes the original files if UTF-8/16
  Added argument (areTempFiles) to method SetCompareFiles, and used in RunFileDiff.
 (also BUG [ 1197527 ] Patch Generator browse button not defaulting correctly)
  Src: DiffWrapper.cpp DiffWrapper.h MergeDoc.cpp PatchDlg.cpp PatchTool.cpp

2005-05-11 Kimmo
 Update Contributors list
  Docs/Users: Contributors.txt

2005-05-11 Perry
 BUG [ 1198622 ] Generated patch is broken when comparing UTF8 files
  Bail out of OlecharToUTF8 if BOM not UCS-2 (to avoid scrambling text).
  Src/Common: multiformatText.cpp
 Improve comments heading & in OlecharToUTF8
  Src/Common: multiformatText.cpp

2005-05-09 Perry
 BUG [ 1197964 ] MergeBulgarian string versioninfo translated
  Src/Languages: MergeBulgarian.rc MergeGerman.rc
 BUG [ 1193561 ] v2.2, version copyrights not all up-to-date
  Adjusted all to say 1996-2005 just as English
  Src/Languages: Merge*.rc

2005-05-08 Perry
 PATCH: [ 1188063 ] UTF-8 file saving problem, the file header BOM missing.
  Src/Common: UniFile.cpp
 BUG [ 1197527 ] Patch Generator browse button not defaulting correctly)
  Src: PatchDlg.cpp

2005-05-07 Perry
 Synchronizing MergeTurkish.rc to Merge.rc
  (removing obsolete keywords, accepting DS_SETFONT from Merge.rc, 
  removing trailing spaces, bitmap ids to symbolic, 
  adding stringtable comments)
  Src/Languages/Turkish: MergeTurkish.rc

2005-05-05 Kimmo
 PATCH: [ 1195530 ] Fix hiding sorted column
  Src: DirViewColHandler.cpp

2005-05-03 Kimmo
 PATCH: [ 1189875 ] Small cleanup for line replace code
  Src: MergeDoc.cpp
 PATCH: [ 1193447 ] Optimise location pane update.
  Src: LocationView.cpp
 BUG: [ 1181399 ] When a modified file is locked, Retry should be an option
  Don't close unsaved documents when 'No' button is selected
  Src: MergeDoc.cpp

2005-05-01 Perry
 PATCH: [ 1188377 ] all of the menu contents is translated in turkish
 Initial upload of Turkish rc (menus translated) exactly as submitted by Ozkan.
  New Src/Languages/Turkish
 Add appropriate AFX_TARG_TRK and LANG_TURKISH declarations to MergeTurkish.rc
  Src/Languages/Turkish: MergeTurkish.rc
 Convert Turkish Merge.rc2 from English one to translated one (no editlib include)
 Add Turkish to BuildAll.bat
  Src/Languages: BuildAll.bat
  Src/Languages/Turkish/res: Merge.rc2
 Fix language code in version info in Turkish (needed for LanguageSelect).
  Src/Languages/Turkish/MergeTurkish.rc
 PATCH: [ 1193560 ] v2.2: MergeHungarian doesn't compile (IDS_VCS_NONE)
  Synch Hungarian resource.h to German resource.h, to get new IDS strings.

2005-04-28 Tim
 PATCH: [ 1190544 ] Translated Read Me-German.rtf
  Docs/Users/Languages: Read Me-German.rtf

2005-04-28 Kimmo
 BUG: [ 1181883 ] Inconsistent behavior: select font vs. Use default
  Src: MainFrm.cpp MainFrm.h

2005-04-25 Kimmo
 BUG: [ 1179790 ] ReadMe-Hungarian.rtf file is missing
  docs/Users/Languages new file: Read Me-Hungarian.rtf

2005-04-24 Kimmo
 BUG: [ 1183031 ] Shared file give "parameter not correct error"
  Additional fix from Perry
  Src/Common: UniFile.cpp

2005-04-23 Kimmo
 BUG: [ 1183031 ] Shared file give "parameter not correct error"
  Fix from Robin Sandlin and Perry
  Src/Common: UniFile.cpp

2005-04-22 Kimmo
 Correct Polish translator name in Contributors list
  Docs/Users: Contributors.txt
 PATCH: [ 1183772 ] Update Italian translation + readme
  Submitted by Andrea Decorte
  Docs/users/Languages: Read Me-Italian.rtf
 PATCH: [ 1184023 ] Syntax highlighting for Inno Setup files
  Submitted by Tim
  Src: Merge.dsp
  Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
  Src/editlib new file: innosetup.cpp

2005-04-18 Kimmo
 PATCH: [ 1183669 ] Updated ReadMe-ChineseTraditional.rtf
  From Koko
  Docs/users/Languages: Read Me-Chinese_Traditional.rtf
 PATCH: [ 1183481 ] Updated Polish translation
  From Pawel Wawrzysko
  Src/Languages/Polish: MergePolish.rc
  Docs/users/Languages: Read Me-Polish.rtf
  InnoSetup/Languages: Pölish.isl

2005-04-17
 PATCH: [ 1179941 ] Syntax highlighting for NSIS files
  Submitted by Tim
  Src: Merge.dsp
  Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
  Src/editlib new file: nsis.cpp

2005-04-13 Kimmo
 PATCH: [ 1180768 ] Russian translation update
  Submitted by Dmitriy Aleshkowskiy
  Src/Languages/Russian: MergeRussian.rc
 PATCH: [ 1181157 ] Swedish translation update
  Submitted by Hans Eriksson
  Src/Languages/Swedish: MergeSwedish.rc

2005-04-13 Perry
 PATCH: [ 1145016 ] i18n the version control strings
  Src: Merge.rc PropVss.cpp PropVss.h resource.h
  Languages: resource.h Merge*.rc

2005-04-05 Kimmo
 PATCH: [ 1176574 ] catalan translation update (setup)
  Submitted by Jordi Vilar
  InnoSetup: WinMerge Localized.iss
  InnoSetup/Languages: Catalan.isl
  Docs/Users/Languages: Read Me-Catalan.rtf
 PATCH [ 1176741 ] Swedish ReadMe-Swedish.rtf file
  Submitted by Hans Eriksson
  Docs/Users/Languages: Read Me-Swedish.rtf
 Update contributors file (Add Dutch and French translators)
  Docs/Users: Contributors.txt

2005-04-03 Perry
 PATCH: [ 1155977 ] Log scriptlet plugin errors
  Src: Plugins.cpp

2005-04-02 Kimmo
 PATCH: [ 1172679 ] French translation
  Submitted by: Jean-F Jolin
  Src/Languages/French: MergeFrench.rc
 PATCH: [ 1174935 ] Russian translation update
  Submitted by Dmitriy Aleshkowskiy
  Src/Languages/Russian: MergeRussian.rc
 PATCH: [ 1175319 ] Dutch translation update
  Submitted by Michel Coene
  Src/Languages/Dutch: MergeDutch.rc

2005-04-01 Kimmo
 PATCH: [ 1173072 ] hungarian translation for current beta (2.3.2.0)
  Submitted by Márton Balázs
  Src/Languages/Hungarian: MergeHungarian.rc

2005-03-29 Kimmo
 PATCH: [ 1171805 ] Update italian translation
  Submitted by Andrea Decorte
  InnoSetup/Languages: Italian.isl
 PATCH: [ 1159465 ] Add Jesus (Mack) to contributors/Spanish
  Submitted by Perry
  Users/Docs: Contributors.txt
 PATCH: [ 1172427 ] Norwegian translation for 2.2.2 / CVS head
  Submitted by Hans Fr. Nordhaug
  Src/Languages/Norwegian: MergeNorwegian.rc

2005-03-23 2.2.2 Stable Release

2005-03-22 Kimmo
 BUG: [ 1143619 ] Unicode chars in filename display as '_'
  Src: Merge.rc
  Src/Languages: Merge*.rc
 BUG: [ 1162037 ] Missing localization (German)
  Add couple of accel keys (patch from Tim)
   Src/Languages/German: MergeGerman.rc
 PATCH: [ 1165515 ] Improve drawing location pane moved block lines
  Src: LocationView.cpp LocationView.h
 BUG: [ 1154153 ] Poor font choice for default font
  Fix submitted by Takashi Sawanaka
  Src: MainFrm.cpp

2005-03-21 Kimmo
 PATCH: [ 1160064 ] Undo for Copy All
  Src: MergeDoc.cpp MergeDoc.h

2005-03-19 Perry
 PATCH: [ 964676 ] rc file lacks bytes after DIALOGEX defs
  Src: Merge.rc
  Src/Languages: Merge*.rc

2005-03-18 Perry
 PATCH: [ 967230 ] Initialize default language from locale
  Src/Common: LanguageSelect.cpp LanguageSelect.h

2005-03-17 Jochen
 Pass LANGID to Merge7z::Initialize as HIWORD(dwFlags)
  Src: 7zCommon.cpp

2005-03-16 Kimmo
 PATCH: [ 1147039 ] experimental patch for colored word diff
  Merge some translated strings from trunk (from Takashi Sawanaka)
   Languages: Japanese/MergeJapanese.rc
 PATCH: [ 1158136 ] Spanish translation revised
  Submitted by Jesus M. Delgado 'Mack'
   Languages/Spanish: MergeSpanish.rc

2005-03-16 Tim
 PATCH: [ 1156198 ] Non-standard html in developer docs
  Docs/Developers: readme-developers-*.html

2005-03-14 Kimmo
 BUG: [ 1162374 ] Recent WinMerge doesn't support NT4
  Src/Common: UniFile.cpp
 PATCH: [ 1159112 ] Swedish translation revision
  Submitted by Hans Eriksson
  Languages/Swedish: MergeSwedish.rc

2005-03-13 Jochen
 Read 7-Zip version from 7zip_pad.xml
 Add archive support related stuff to ConfigLog
 Provide substitute for DlgDirList, which does not handle long filenames on Windows 98
  (should fix BUG [1090513])
  Src new files: dllpstub.cpp dllpstub.h markdown.cpp markdown.h
  Src: Merge.dsp 7zCommon.cpp 7zCommon.h ConfigLog.cpp ConfigLog.h paths.cpp paths.h
  Src/common: version.cpp version.h

2005-03-13 Perry
 PATCH: [ 1103542 ] Declare _MBCS in ANSI builds
  Src: Merge.dsp

2005-03-11 Kimmo
 Fix invalid compare for VSS dialog returnvalue
  Src: MainFrm.cpp

2005-03-10 Kimmo
 PATCH: [ 1158456 ] Fix setting font for headerbar editcontrols
  Src: EditorFilepathBar.cpp EditorFilepathBar.h
 PATCH: [ 1158484 ] Fix assert from headerbar-setactive() when closing views
  Src: EditorFilepathBar.cpp EditorFilepathBar.h

2005-03-09 Kimmo
 PATCH: [ 1153870 ] Disable redrawing dir compare view while adding items
  Src: DirDoc.cpp

2005-03-08 Kimmo
 Merge UniFile file open/stat changes from trunk:
 PATCH: [ 1124380 ] Use _tstati64() in UniLocalFile::DoGetFileStatus()
  Common: UniFile.cpp UniFile.h
 PATCH: [ 1144059 ] Allow getting filestatus from open file in UniXXXFile
  Common: UniFile.cpp UniFile.h
 Remove line missed in patch [ 1144588 ] Remove show bak files setting from configlog
  Src: MainFrm.cpp

2005-03-08 Perry
 PATCH [ 1151951 ] Alter getRightFilepath for root paths
  Src: DiffContext.cpp
 PATCH [ 1151949 ] Fix CDirDoc::FindItemFromPaths for root
  Src: DirDoc.cpp

2005-03-05 Perry
 PATCH [ 1157015 ] Spanish translation update
  (Backport from cvs trunk)
  Languages: MergeSpanish.rc

2005-03-03 Kimmo
 BUG: [ 975226 ] Editor: Always refresh with Del-Key
  Fix submitted by Takashi Sawanaka
  Src: MergeEditView.cpp

2005-03-02 Kimmo
 PATCH: [ 1153091 ] Fix selecting default font from View menu
  Src: MainFrm.cpp MainFrm.h OptionsDef.h

2005-02-28 Perry
 BUG [ 1144425 ] German: Options/codepage dlg needs adjust
  (Fix by Tim Gerundt)
  Languages: MergeGerman.rc

2005-02-27 Perry
 PATCH: [ 1152967 ] Fix re_match_2 declaration warnings
  Src/diffutils/lib: REGEX.C

2005-02-26 Jochen
 PATCH: [ 1152256 ] UniFile may fail to read last line
  Src/Common: UniFile.cpp

2005-02-25 Kimmo
 PATCH: [ 1123539 ] Small improvement for code creating backup copy
  Src: MainFrm.cpp

2005-02-24 Kimmo
 PATCH: [ 1149365 ] Check linenumber to goto for upper limit
  Src: MergeEditView.cpp
 PATCH: [ 1149388 ] Check for previous compare text before find again
  Src/editlib: ccrystaltextview.cpp

2005-02-22 Kimmo
 PATCH: [ 1145522 ] fix crash on search
  Submitted by Takashi Sawanaka
  Src/editlib: ccrystaltextview.cpp

2005-02-20 Kimmo
 PATCH: [ 1144588 ] Remove show bak files setting from configlog
  Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp OptionsDef.h

2005-02-11 Kimmo
 PATCH: [ 1112111 ] Confusing message for identical scratchpads
  Src: MergeDoc.cpp

2005-02-08 Kimmo
 PATCH: [ 1117375 ] Rememer status/toolbar visible status
  Src: MainFrm.cpp MainFrm.h OptionsDef.h

2005-01-30 Jochen
 PATCH: [ 1062082 ] Fix bug [1057997] (long lines issue) UniFile part
  Src: MergeDoc.cpp
  Src/common: UniFile.cpp UniFile.h

2005-01-30 Kimmo
 Merge Location Pane improvements from CVS trunk/2.3
 PATCH: [ 1094474 ] Visible area indicator for location pane
 PATCH: [ 1105640 ] Properly update locationpane visible area indicator
  Src: LocationView.cpp LocationView.h MergeEditView.cpp MergeEditView.h

2005-01-27 Kimmo
 PATCH: [ 1106383 ] Show few chars of 'context' when horizontal scrolling lines
  Src/editlib: ccrystaltextview.cpp
 PATCH: [ 1062082 ] Fix bug [1057997] (long lines issue)
  View scrolling optimisation from Takashi Sawanaka
  Src/editlib: ccrystaltextview.cpp

2005-01-23 Kimmo
 Update MASM filter file
  Submitted by Matt Bossard (to forum)
  Filters: MASM.flt

2005-01-21 Perry
 PATCH: [ 1048412 ] Log font info in configuration
  Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
 Also remove old variable bDetectCodepage in MISCSETTINGS struct.

2005-01-20 Kimmo
 PATCH: [ 1086745 ] Find- and Replace-dialogs to remember strings too
  Src/editlib: ccrystaltextview.cpp ceditreplacedlg.cpp ceditreplacedlg.h
   cfindtextdlg.cpp cfindtextdlg.h
 Add new MASM filter file
  Submitted by Matt Bossard (to forum)
  Filters new file: MASM.flt

2005-01-14 Kimmo
 PATCH: [ 1101919 ] Russian Readme.rtf
  Submitted by Dmitriy S. Aleshkowskiy
  Docs/Users/Languages: Read Me-Russian.rtf
  InnoSetup: WinMerge Localized.iss

2005-01-13 Kimmo
 PATCH: [ 1100462 ] Center find result in file compare
  Src/editlib: ccrystaltextview.cpp

2005-01-11 Kimmo
 PATCH: [ 1053475 ] Exponentially grow long lines when reading
  Submitted by Perry
  Src/Common: UniFile.cpp UniFile.h
  Src: Merge.dsp MergeDoc.cpp
 BUG: [ 1064942 ] Copyright notice????
  Bumped copyright year to continue through 2005
   Src: Merge.rc

2005-01-08 Kimmo
 PATCH: [ 1098340 ] crash rarely when starting many winmerge continuously
  Anonymous submission
  Src: FileFilterMgr.cpp
 PATCH: [ 1088049 ] Ask about saving when Window/Close is selected
  Src: MergeEditView.cpp MergeEditView.h

2005-01-05 Kimmo
 PATCH: [ 1094467 ] Update contributors: Tim is now developer
  Docs/Users: Contributors.txt

2004-12-27 Tim
 RFE: [ 1085099 ] 'fileskip.bmp' looks to similar like 'equal.bmp'
  Src/res: fileskip.bmp
  Languages: fileskip.bmp

2004-12-19 Kimmo
 PATCH: [ 1065462 ] Show all skipped items when selected so
  Src: DirDoc.cpp

2004-12-17 Kimmo
 PATCH: [ 1086601 ] Dircompare statepane miscounting skipped items
  Src: DirCompStateBar.cpp
 PATCH: [ 1068011 ] Partial French translation
  Submitted by Matthieu Pupat
  Src/Languages/French: MergeFrench.rc
  Docs/Users: Contributors.txt
 PATCH: [ 1058142 ] update coloring of batch file
  Submitted by Andre Arpin
  Src/editlib: batch.cpp
 PATCH: [ 1057062 ] Separate Skipped flags from compare result flags
  Src: DiffContext.h DirCompStateBar.cpp DirDoc.cpp DirScan.cpp
   DirView.cpp DirViewColItems.cpp

2004-12-04 Kimmo
 PATCH: [ 1078505 ] Use DOS eol as filename/pathname clipboard separator
  Src: DirView.cpp

2004-12-03 Kimmo
 PATCH: [ 1062082 ] Fix bug [1057997] (long lines issue)
  Additional optimisation from Takashi Sawanaka
  Src/editlib: ccrystaltextview.cpp

2004-12-01 Kimmo
 PATCH: [ 1075591 ] Disable file filter edit button for no filter selection
  Src: FileFiltersDlg.cpp FileFiltersDlg.h

2004-11-17 Kimmo
 PATCH: [ 1067374 ] Norwegian translation for 2.2.0
  Submitted by Hans Fr. Nordhaug
  Src/Languages/Norwegian: MergeNorwegian.rc


2004-11-10 2.2 Stable Release

2004-11-10 Kimmo
 PATCH: [ 1063342 ] Fix problem in XML syntax highlight and backslash
  Src/editlib: xml.cpp
 BUG: [ 1063100 ] Files with a space not handled (Clearcase integration)
  Src: MainFrm.cpp

2004-11-09 Perry
 PATCH: [ 1050329 ] readme-developers-InnoSetup.html
  Docs/Developers: readme-developers-InnoSetup.html

2004-11-08 Kimmo
 PATCH: [ 1062082 ] Fix bug [1057997] (long lines issue)
  Submitted by Jochen
  Src/editlib: ccrystaltextview.cpp ccrystaltextview.h

2004-11-07 Kimmo
 BUG: [ 828065 ] More overlapping letters in Dansk/Norsk
  Fix from Christian
  Src/Languages/Danish: MergeDanish.rc 

2004-11-06 Perry
 BUG: [ 1048439 ] UNICODE build calling IsDBCSLeadByte (shouldn't)
  Src/editlib: ccrystaltextview.cpp

2004-11-06 Kimmo
 PATCH: [ 1061155 ] Updated danish translation
  Submitted by Christian
  Src/Languages/Danish: MergeDanish.rc

2004-11-05 2.2 Release Candidate 3 (2.1.12.0)

2004-11-05 Kimmo
 PATCH: [ 1059604 ] Fix bug [1048997] archive popup interferes with Help menu
  Submitted by Jochen
  Src: 7zCommon.cpp

2004-11-04 Kimmo
 BUG: [ 1058947 ] Filter files sensitive to spaces
  Add new file filter for ADAMulti (from jpizzi)
  Filters new file: ADAMulti.flt

2004-11-03 Kimmo
 PATCH: [ 1053282 ] Korean translation
  Submitted by Sukjoon, Hwang
  Src/Languages/Korean: MergeKorean.rc
 PATCH: [ 1058992 ] More flexible whitespaces for file filter files
  Src: FileFilterMgr.cpp

2004-11-02 Kimmo
 PATCH: [ 1058293 ] The finished german language file
  Submitted by Tim Gerundt
  Src/Languages/German: MergeGerman.rc
 BUG: [ 1052762 ] WinMerge VERY slow to startup
  Src: BCMenu.cpp

2004-11-01 Kimmo
 PATCH: [ 1057719 ] Add Hungarian translator to Contributors list
  Docs/Users: Contributors.txt

2004-10-31 Perry
 PATCH: [ 1036683 ] unicoder.cpp always use GetACP codepage
  Src/Common/unicoder.cpp
 PATCH: [ 1049688 ] Fix caret handling of displayable whitespace
  Src/editlib/ccrystaltextview.cpp

2004-10-30 Perry
 PATCH: [ 1055624 ] The finished hungarian language file
  Src/Languages: BuildAll.bat Hungarian/*

2004-10-29 Jochen
 PATCH: [ 1043909 ] Add support for 7-Zip 4.09, plus DSPs for 4.07, 4.08, and 4.10
 Leave decision whether to recurse into folders to enumerator
 Fix leading zero in 7-Zip minor version numbers shown in "archive support disabled" message
  Merge7z: Merge7z.def Merge7z.h Merge7z311.cpp Merge7z407.dsp Merge7z408.dsp Merge7z409.cpp
   Merge7z409.dsp Merge7z410.dsp Merge7zCommon.cpp Merge7zCommon.h revision.txt StdAfx.h
  Src: 7zCommon.cpp 7zCommon.h

2004-10-28 Kimmo
 PATCH: [ 1055551 ] Move cursor to begin of previous line when deleting diff
  Src: MergeDoc.cpp MergeDoc.h MergeEditView.cpp
 PATCH: [ 1053234 ] Suggested expansions for Organization.txt
  Submitted by Perry
  Docs/Developers: Organisation.txt

2004-10-28 Perry
 PATCH: [ 1055067 ] Add Hungarian support
  Src/Common: LanguageSelect.cpp
 PATCH: [ 1053421 ] Changing warning level to 3 in release targets
  Src: Merge.dsp

2004-10-25 Kimmo
 PATCH: [ 1052757 ] File loading traces only for debug build
  Src: MergeDoc.cpp

2004-10-24 Kimmo
 BUG: [ 1052283 ] after edit, asks TWICE for rewriting the original file (-e switch)
  Src: MergeDoc.cpp
 PATCH: [ 1048288 ] Fixes to Organization.txt
  Submitted by Perry
  Docs/Developers/Organisation.txt

2004-10-18 Kimmo
 PATCH: [ 1048838 ] German translation updated for RC
  Submitted by Tim Gerundt
  Src/Languages/German: MergeGerman.rc

2004-10-17 Perry
 PATCH: [ 1043819 ] Fix recent compiler warnings in src/util.c
  Src/diffutils/src/util.c

2004-10-16 Perry
 PATCH:[ 1037449 ] Fix char width computation for displayable whitespace
  Src/editlib: ccrystaltextview.cpp ccrystaltextview.h

2004-10-16 Kimmo
 PATCH: [ 1046583 ] Improved 48x48 icon
  Submitted by Tim Gerundt
  Src/res: Merge.ico
  Src/Languages/*/res: Merge.ico
 BUG: [ 1047812 ] number of differences not recalculated (merging whole files)
  Src: DirActions.cpp

2004-10-15 Kimmo
 PATCH: [ 1047670 ] Catalan translation update
  Submitted by Jordi Vilar
  Src/Languages/Catalan: MergeCatalan.rc

2004-10-14 Kimmo
 PATCH: [ 942447 ] CVS organisation doc
  Docs/Developers new file: Organisation.txt
 PATCH: [ 1046546 ] Open new manual locally
  Src: MainFrm.cpp

2004-10-13 Kimmo
 PATCH: [ 1045473 ] Disable Ctrl+Arrow merging in Mergemode
  Src: MergeEditView.cpp
 Additional change for patch [ 1045473 ]
  Src: MergeEditView.cpp

2004-10-12 Kimmo
 PATCH: [ 1044636 ] Italian translation update (from Andrea Decorte)
  Src/Languages/Italian: MergeItalian.rc

2004-10-10 Kimmo
 BUG: [ 1035227 ] Selected font change won't be applied... when not needed
  Src: MainFrm.cpp
 PATCH: [ 1043246 ] Fix problem selecting  as filefilter
  Src: FileFilterHelper.cpp FileFiltersDlg.cpp
 PATCH: [ 1043367 ] Change brace indentation automation for C/C++
  Src/editlib: ccrystaltextview.cpp
  
2004-10-07 2.2 Release Candidate 2 (2.1.10.0)

2004-10-07 Kimmo
 PATCH: [ 1040041 ] [ 1039640 ] reproducible tooltip ASSERT in debug
  Submitted by Takashi Sawanaka
  Src: MergeEditView.cpp

2004-10-06 Kimmo
 PATCH: [ 1039495 ] Trap diffutils errors with SEH
  Src: DiffWrapper.cpp DiffWrapper.h
  Src/diffutils/src: UTIL.C

2004-10-05 Kimmo
 PATCH: [ 1039552 ] Italian translation updated for RC
  Submitted by Andrea Decorte
  Src/Languages/Italian: MergeItalian.rc
 PATCH: [ 1034854 ] Use "Terminal" font instead of "Courier" as default font.
  Submitted by Takashi Sawanaka
  Src: MainFrm.cpp
 
2004-10-04 Kimmo
 PATCH:  PATCH: [ 1039372 ] Save mixed EOL option when changed during file loading
  Src: MergeDoc.cpp
 BUG: [ 1037587 ] XML Syntax highlighting: Problems with numbers
  Src/editLib: xml.cpp

2004-10-03 Kimmo
 PATCH: [ 1039096 ] Save ignore EOL option when changed during file loading
  Src: MergeDoc.cpp

2004-10-02 Kimmo
 PATCH: [ 1038361 ] Left/Right read-only cmdline arguments wrong way around
  Submitted by markanthony
  Src: MainFrm.cpp
 PATCH: [ 1039001 ] Swedish translation update
   Submitted by Hans Eriksson
  Src/Languages/Swedish: MergeSwedish.rc

2004-10-01 Perry
 PATCH: [ 1038749 ] Fix whitespace display
  Src/editlib: ccrystaltextview.cpp

2004-10-01 Kimmo
 PATCH: [ 1038091 ] Various Updates in German Translation
  Submitted by Tim Gerundt
  Src/Languages/German: MergeGerman.rc

2004-09-30 R2_2 branch created for 2.2 release
2004-09-30 2.2 Release Candidate 1 (2.1.8.0)

2004-09-30 Perry
 Fix bracketing mistake in PATCH: [ 1034810 ]
  Src/editlib: ccrystaltextview.cpp
 PATCH: [ 1034754 ] Fix demoGuessEncoding's default
  Src: codepage.cpp codepage.h DiffWrapper.cpp
 PATCH: [ 1037418 ] Fix whitespace for Unicode non-1252
 PATCH: [ 1037424 ] fix non-unicode initialization loop in ViewableWhitespace
  Src: ViewableWhitespace.cpp

2004-09-29 Perry
 PATCH: [ 1034810 ] fix whitespace for other encodings
  Src: Merge.dsp ViewableWhitespace.cpp ViewableWhitespace.h
  Src/editlib: ccrystaltextview.cpp

2004-09-29 Kimmo
 PATCH: [ 1036134 ] Show error about invalid linefilter regexps
  Src: MainFrm.cpp MainFrm.h Merge.rc resource.h
  Src/diffutils/lib: REGEX.C REGEX.H
  Src/Languages: *.rc resource.h

2004-09-28 Kimmo
 PATCH: [ 1034719 ] IDS_SUGGEST_IGNORECODEPAGE change?
  Submitted by Perry
  Src: Merge.rc
  Src/Languages: *.rc (except MergeCatalan.rc, MergeItalian.rc & MergeSwedish.rc)
 PATCH: [ 1002247 ] Remove unneeded CDirView::OnCustomDraw()
  Src: DirView.cpp DirView.h

2004-09-27 Kimmo
 Add links to DocBook DSSL customisation
  Docs/Developers: readme-developers.html

2004-09-27 Perry
 PATCH: [ 968285 ] DBCS fixes from Sawanaka
  The crystaltextview.cpp portion of patch, with a new method (GetCharWidthFromChar) to reduce ifdefs.
  Src/EditLib: ccrystaltextview.cpp

2004-09-25 Kimmo
 PATCH: [ 1034550 ] Catalan translation update
  Submitted by Jordi Vilar
  Src/Languages/Catalan: MergeCatalan.rc
 PATCH: [ 1034557 ] Swedish translation update
  Submitted by Hans Eriksson
  Src/Languages/Swedish: MergeSwedish.rc
 PATCH: [ 1034642 ] Updated Japanese Translation
  Submitted by Takashi Sawanaka
  Src/Languages/Japanese: MergeJapanese.rc

2004-09-24 Kimmo
 PATCH: [ 1033678 ] Better description for 'Reset messageboxes'
  Src: Merge.rc
  Src/Languages: *.rc
 Open WinMerge manual from http://winmerge.org/2.2/manual/index.html
  Src: MainFrm.cpp
 BUG: [ 1034019 ] Italian: language list unsorted
  Src/Languages/Italian: MergeItalian.rc

2004-09-23 Kimmo
 PATCH: [ 1032841 ] Add 'DiffEngine' filegroup to project file
  Src: Merge.dsp

2004-09-22 Kimmo
 BUG: [ 1029646 ] (Norwegian) Options/Editor text chopped off
  Fix all languages
  Src: Merge.rc
  Src/Languages: *.rc
 BUG: [ 1029637 ] (Italian) Options/Codepage detect codepage label cut-off
  Fix all languages
  Src: Merge.rc
  Src/Languages: *.rc

2004-09-21 Kimmo
 Widen space for text in language change dialog
  Src: Merge.rc
  Src/Languages: *.rc

2004-09-20 Kimmo
 PATCH: [ 1030752 ] Set focus to file view when goto line in location pane
  Src: LocationView.cpp
 BUG: [ 1026833 ] WinMergeU.exe build to dir MergeUnicodeReleaseMinsize
  Build WinMergeU.exe to Build\MergeUnicodeRelease\
  Src: Merge.dsp

2004-09-19 Kimmo
 PATCH: [ 1030490 ] Updated Swedish Translation
  Submitted by Hans Eriksson
  Src/Languages/Swedish: MergeSwedish.rc
 BUG: [ 1029644 ] (English) Options/System wording fix
  Src: Merge.rc
 More space for texts in Options/System
  Src: Merge.rc
  Src/Languages: *.rc

2004-09-17 Kimmo
 PATCH: [ 1029538 ] Reverse 'Ignore carriage return differences' when resetting
  Src: PropCompare.cpp
 BUG: [ 1029647 ] (English) Options/General text cut-off
  Fixed other languages also
  Src: Merge.rc
  Src/Languages: *.rc (except MergeCatalan.rc)

2004-09-16 Perry
 Fix Italian editor property page (tabs section) & widen corresponding English controls
  Src: Merge.rc
  Src/Languages: Italian/MergeItalian.rc

2004-09-15 WinMerge experimental release 2.1.7.14 (cvs)

2004-09-15 Kimmo
 PATCH: [ 1027936 ] Fix statusbar display for ghost lines
  Src: MergeEditView.cpp
 PATCH: [ 1027994 ] Use current filename and path as defaults for SaveAs dialog
  Src: MergeDoc.cpp
 BUG: [ 1027605 ] Esc (as indicated by File Exit) doesn't quit app
  Remove ESC from menuitem. Also fix merge-mode shortcut to F9.
  Src: Merge.rc
  Src/Languages: *.rc
 PATCH: [ 1026619 ] Fix bug [ 1017264 ] Location pane contextmenu items...
  Submitted by Jochen (jtuc)
  Src: LocationView.cpp

2004-09-14 Kimmo
 PATCH: [ 1027118 ] Separate items for Copy Path in dircompare context menu
  Src: DirView.cpp DirView.h Merge.rc resource.h
  Src/Languages: *.rc resource.h
 PATCH: [ 1027382 ] Customised Save As dialog captions
  Src: Merge.rc MergeDoc.cpp resource.h
  Src/Languages: *.rc resource.h
 Add Lee Jae-Hong as Korean translator contributor
  Docs/Users: Contributors.txt
 Remove declaration of non-existent function DeleteFileOrError()
  Src: MainFrm.h
 Remove declaration of non-existent function CleanupFileBufs()
  Src: MainFrm.h
 Don't hide rescan result for binary file compare
  Src: MergeDoc.cpp

2004-09-13 Kimmo
 PATCH: [ 1026894 ] More space for translations in Goto-dialog
  Src: Merge.rc
  Src/Languages: *.rc
 PATCH: [ 1027086 ] Catalan translation Update
  Submitted by Jordi Vilar
  Src/Languages/Catalan: MergeCatalan.rc
 Add note about changed commandline when using docbook2html in SF.net
  Docs/Developers: readme-developers.html
 PATCH: [ 1027183 ] Swedish Translation Update
  Submitted by Hans Eriksson
  Src/Languages/Swedish: MergeSwedish.rc
 Fix couple of lang names in Swedish translation
  Submitted by Hans Eriksson
  Src/Languages/Swedish: MergeSwedish.rc

2004-09-12 Kimmo
 Fix Italian lang file build error and remove unneeded \n
  Src/Languages/Italian: MergeItalian.rc

2004-09-10 Kimmo
 PATCH: [ 1025411 ] Cleanup PropVSS.cpp
  Src: PropVss.cpp
 PATCH: [ 1025443 ] Add '1 Difference Found' text
  Src: Merge.rc MergeDoc.cpp resource.h
  Src/Languages: *.rc resource.h
 Add instructions for compiling lang files (using MakeResDll.exe)
  Docs/Developers: readme-developers.html

2004-09-09 Kimmo
 PATCH: [ 1025052 ] Italian translation updated for latest experimental version
  Submitted by Andrea Decorte
  Src/Languages/Italian: MergeItalian.rc
 PATCH: [ 1023074 ] Fix and cleanup version control options dialog
  Src: Merge.rc
  Src/Languages: *.rc

2004-09-08 Kimmo
 PATCH: [ 1023917 ] Don't close dirview when mergedocs closed by reusing code
  Fixes bug #1023412 Crash in WinMerge.exe 2.1.7.13
  Src: DirDoc.cpp DirDoc.h

2004-09-03 WinMerge experimental release 2.1.7.13 (cvs)

2004-09-03 Kimmo
 PATCH: [ 1021153 ] Fix ansi files EOL detection in unicode builds
  Src/Common: UniFile.cpp
 BUG: [ 986708 ] Wrong EOL character
  DOS EOL was inserted when editing unix or mac files
  Src/editlib: ccrystaleditview.cpp
 PATCH: [ 1021478 ] Korean Resource file update
  Submitted by Lee Jae-Hong
  Src/Languages/Korean: MergeKorean.rc

2004-09-02 Kimmo
 PATCH: [ 1020403 ] Allow WinMerge to open files write-locked by another app
  Src/Common: UniFile.cpp
 Fix for patch #1019108: update rescan info also after saving
  Src: MergeDoc.cpp
 BUG: [ 1021003 ] Unicode builds do not read ansi files properly (UniFile.cpp)
  Fix what seems to be invalid #ifdef'ing for unicode build
  Src/Common: UniFile.cpp
 PATCH: [ 1014455 ] more explicit error message if archive support not available
  Submitted by Jochen
  Src: 7zCommon.cpp 7zCommon.h MainFrm.cpp MainFrm.h Merge.rc resource.h
  Src/Languages: *.rc resource.h

2004-09-01 Kimmo
 PATCH: [ 1019759 ] Allow D&D projectfile to main window
  Src: MainFrm.cpp
 PATCH: [ 1019945 ] Don't fail configlog writing silently
  Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp
 PATCH: [ 1019393 ] Inform user about missing archive support (Zip* menuitems)
  Src: 7zCommon.cpp 7zCommon.h DirView.cpp Merge.rc resource.h
  Src/Languages: *.rc resource.h

2004-08-31 Kimmo
 PATCH: [ 1019108 ] Warn if file changed on disk between rescans
  Src: Merge.rc MergeDoc.cpp MergeDoc.h resource.h
  Src/Languages: *.rc resource.h
 Add note about overwriting WinMerge executable path for ShellExtension
  Docs/Developers: readme-developers.html

2004-08-27 WinMerge experimental release 2.1.7.12 (cvs)

2004-08-27 Kimmo
 PATCH: [ 1017294 ] When closing file compare close also empty directory compare
  Src: DirDoc.cpp

2004-08-26 Kimmo
 BUG: [ 1016056 ] Panes don't remember settings when new file is opened
  Src: ChildFrm.cpp
 PATCH: [ 1016282 ] Add GetDefault() to COptionsMgr
  Src: PropColors.cpp
  Src/Common: OptionsMgr.cpp OptionsMgr.h
 Convert Compare options dialog for GetDefault()
  Src: PropCompare.cpp

2004-08-25 Kimmo
 PATCH: [ 1008755 ] avoid flickering when diff view opens
  Don't update desktop icon (from Takashi Sawanaka)
  Src: ChildFrm.cpp
 PATCH: [ 1015330 ] Better file saving error message
  Src: Merge.rc MergeDoc.cpp MergeDoc.h
  Src/Common: UniFile.cpp
  Src/Languages: *.rc
 PATCH: [ 1015393 ] Strip whitespaces from paths in Open-dialog
  Src: OpenDlg.cpp OpenDlg.h

2004-08-23 Kimmo
 PATCH: [ 1013715 ] Catalan translation update
  Submitted by Jordi Vilar
  Src/Languages/Catalan: MergeCatalan.rc
 Check path length in VSS integration
  Src: VSSHelper.cpp
 PATCH: [ 1012328 ] Simpler Zip* menuitems
  Src: DirView.cpp Merge.rc
  Src/Languages: *.rc

2004-08-20 Kimmo
 PATCH: [ 1012291 ] Open Find-dialog for F3 if no previous find
  Src/editlib: ccrystaltextview.cpp
 PATCH: [ 1012192 ] Show selected items count in dir compare statusbar
  Src: DirView.cpp DirView.h Merge.rc resource.h
  Src/Languages: resource.h *.rc

2004-08-19 Kimmo
 PATCH: [ 982140 ] Merge7z : compress folders
  Submitted by Laoran
  Merge7z: Merge7z311.cpp Merge7z311.dsp Merge7z312.dsp Merge7z313.dsp
 PATCH: [ 981788 ] modify UI to compress folders
  Submitted by Laoran
  Src: DirView.cpp
 RFE: [ 953630 ] Ctrl+Shift+Z for Redo in file comparison
  Src: Merge.rc
  Src/Languages: *.rc

2004-08-18 Kimmo
 RFE: [ 952959 ] split Are you sure you want to copy into more lines
  Src: Merge.rc
  Src/Languages: *.rc
 PATCH: [ 1011066 ] Better error message for failed file loading
  Src: MergeDoc.cpp MergeDoc.h
  Src/Common: UniFile.cpp
 PATCH: [ 1002432 ] codepage UI version 2
  Patch by Perry and Laoran
  Src: ConfigLog.cpp ConfigLog.h DirDoc.cpp DirScan.cpp MainFrm.cpp Merge.dsp
   Merge.rc OptionsDef.h PropGeneral.cpp PropGeneral.h resource.h
  Src new files: codepage.cpp codepage.h PropCodepage.cpp PropCodepage.h
  Src/Common: LanguageSelect.cpp multiformatText.cpp unicoder.cpp unicoder.h unifile.cpp
  Src/Languages: resource.h *.rc

2004-08-17 WinMerge experimental release 2.1.7.11 (cvs)

2004-08-17 Kimmo
 PATCH: [ 1010387 ] Updated MergeSwedish.rc file
  Submitted by Hans Eriksson
  Src/Languages/Swedish: MergeSwedish.rc
 PATCH: [ 975840 ] Cleanup VCS/VSS code part 2
  Src: MainFrm.cpp MainFrm.h Merge.dsp 
  Src new files: VSSHelper.cpp VSSHelper.h

2004-08-16 Kimmo
 BUG: [ 1002035 ] Crash with locked files (WM v2.1.7.10)
  Src: MainFrm.cpp
 BUG: [ 1002035 ] Crash with locked files (WM v2.1.7.10)
  Src: MergeDoc.cpp
 BUG: [ 1009918 ] Binary files not detected (unicode builds)
  Src/Common: UniFile.cpp

2004-08-14 Kimmo
 PATCH: [ 1008755 ] avoid flickering when diff view opens
  Submitted by Takashi Sawanaka
  Src: ChildFrm.cpp DiffViewBar.cpp
 Don't post ID_FORCE_REDRAW in CCrystalTextView::OnSize()
  Suggested by Takashi Sawanaka in patch item #1008755
  Src/editlib: ccrystaltextview.cpp

2004-08-13 Kimmo
 BUG: [ 1007320 ] VB Syntax highlighting: Wrong masking from "
  Src/editlib: basic.cpp

2004-08-12 Kimmo
 PATCH: [ 1007212 ] Make extension matching in Open-dialog case insensitive
  Src: FileFilterHelper.cpp
 PATCH: [ 1007216 ] Allow '*.' to match files without extension in Open-dialog
  Src: FileFilterHelper.cpp
 PATCH: [ 1007627 ] Filter selection fixes
  Src: FileFilterHelper.cpp FileFilterHelper.h MainFrm.cpp OpenDlg.cpp
   OpenDlg.h OptionsDef.h

2004-08-11 Kimmo
 PATCH: [ 1006475 ] Don't save editor settings to different key in registry
  Src/editlib: editreg.h
 PATCH: [ 1006870 ] Don't add '\' to filenames for regexp filtering
  Src: FileFilterHelper.cpp
 Backout PATCH: [ 999738 ] Gray out moved block menuitems when moved blocks disabled
  Those menuitems didn't work like I expected
  Src: LocationView.cpp

2004-08-10 Kimmo
 BUG: [ 1006164 ] accelerator conflict
  Src: Merge.rc
 PATCH: [ 1003181 ] Move filter options to OptionsManager
  Src: MainFrm.cpp MainFrm.h OptionsDef.h

2004-08-04 Kimmo
 PATCH: [ 1001981 ] Italian translation updated
  Submitted by Andrea Decorte
  Src/Languages/Italian: MergeItalian.rc
 PATCH: [ 1002585 ] Update dir compare statepane counts when reopening
  Src: DirView.cpp
 PATCH: [ 1002887 ] Enable Change Pane menuitem for Diff Pane
  Src: MergeDiffDetailView.cpp MergeDoffDetailView.h
 PATCH: [ 1000020 ] Simple project files (no GUI)
  Src: MainFrm.cpp MainFrm.h Merge.cpp Merge.dsp Merge.h OpenDlg.cpp OpenDlg.h
  Src new files: ProjectFile.cpp ProjectFile.h
 Option OPT_HIDE_BACKUP didn't get removed when UI was removed, remove it now
  Src: ConfigLog.cpp ConfigLog.h DirDoc.cpp MainFrm.cpp OptionsDef.h
 Backout previous 'Option OPT_HIDE_BACKUP didn't get removed..' checkin.
  It caused build with VC6 to crash in dir compare -- really weird why
  Src: ConfigLog.cpp ConfigLog.h DirDoc.cpp MainFrm.cpp OptionsDef.h

  
2004-08-03 Kimmo
 PATCH: [ 1002333 ] Set default filter to *.* when starting WinMerge
  Src: Merge.cpp
 PATCH: [ 1002280 ] Don't show dircompare statepane if no dircompare results
  Src: DirView.cpp
 Remove GPL licence from coretools.cpp/h - that code is mostly freeware, not GPL
  Src/Common: coretools.cpp coretools.h
 PATCH: [ 1001974 ] Allow ESC to stop dir compare
  Src: DirCompStateBar.cpp
 PATCH: [ 1000423 ] Try to fix invisible find result
  Updated patch
  Src/editlib: ccrystaltextview.cpp

2004-08-02 Kimmo
 PATCH: [ 1001111 ] Warn if user selected binary files for patch creating
  Src: MainFrm.cpp Merge.rc PatchTool.cpp resource.h
  Src/Languages: *.rc resource.h
 PATCH: [ 999804 ] Fix setting recursive for Open-dialog
  New patch fixing bug #1001301 recursive not getting remembered
  Src: MainFrm.cpp MainFrm.h Merge.cpp

2004-08-01 Perry
 PATCH: [ 967405 ] Add Japanese satellite dll to MakePatchDirs
  MakePatchDirs: MakePatchDirs.dsp MakePatchDirs.rc
   MakePatchDirsApp.cpp MakePatchDirsDlg.cpp MakePatchDirsDlg.h
   resource.h StdAfx.h
 PATCH: [ 967405 ] Add Japanese satellite dll to MakePatchDirs
 (Adding new files forgotten at first check-in)
  MakePatchDirs: MakePatchDirs_ja.dsp MakePatchDirs_ja.rc 
  MakePatchDirs_sat.cpp Satellites.cpp Satellites.h

2004-07-31 Perry
 PATCH: [ 989288 ] Inno Setup Localization: Italian
  InnoSetup\Languages: Italian.isl
 PATCH: [ 963429 ] Fix language in floating status bar
  Src: DirCompStateBar.cpp DirCompStateBar.h DirDoc.cpp DirFrame.cpp DirFrame.h 
   DirView.cpp

2004-07-31 Kimmo
 PATCH: [ 1000714 ] Don't create difflist or patch file for binary files
  Src: DiffWrapper.cpp
 PATCH: [ 1000772 ] Fix focus in SaveClosing dialog
  Src: SaveClosingDlg.cpp

2004-07-30 Kimmo
 PATCH: [ 999738 ] Gray out moved block menuitems when moved blocks disabled
  Src: LocationView.cpp
 PATCH: [ 1000117 ] Hide only skipped subfolders in non-recursive compare
  Fixes bug #922718 'show different files' off : subdirs not displayed
  Src: DirDoc.cpp DirDoc.h
 PATCH: [ 1000308 ] Add GotoLine() to CMergeEditView and use it
  Src: LocationView.cpp LocationView.h MergeEditView.cpp MergeEditView.h
 Add icons to Find and Replace result messageboxes.
  Src/editlib: ceditreplacedlg.cpp cfindtextdlg.cpp
 PATCH: [ 1000423 ] Try to fix invisible find result
  Bug: #951584 Find: word found not visible or badly placed
  Src: MergeDocLineDiffs.cpp
  Src/editlib: ccrystaltextview.cpp ccrystaltextview.h

2004-07-29 Kimmo
 PATCH: [ 999681 ] Accept filter name from commandline
  Src: FilterHelper.cpp FilterHelper.h Merge.cpp Merge.rc
  Src/Languages: *.rc
 PATCH: [ 999804 ] Fix setting recursive for Open-dialog
  Src: MainFrm.cpp OpenDlg.cpp OpenDlg.h

2004-07-28 Kimmo
 Remove suppressing checkbox from commandline help messagebox
  Src: Merge.cpp

2004-07-23 Perry
 PATCH: [ 988505 ] updated email address for catalan translator
  Update email address for Jordi Vilar (Catalan translator)
   Web\developer\l10n: status.xml
 PATCH: [ 988503 ] Inno Setup Localization: Catalan
  InnoSetup\Languages: Catalan.isl

2004-07-23 WinMerge experimental release 2.7.1.10 (cvs)

2004-07-19 Perry
 BUG: [ 993402 ] Need review of native language names
  Removed asterisks from Nederlands & Svenska (thanks to A. Decorte).
   Src/Common: LanguageSelect.cpp
   
2004-07-18 Perry
 BUG: [ 969933 ] 'discriminated' language names
  Capitalized native language names to make consistent in language selection box
   Src/Common: LanguageSelect.cpp

2004-07-17 Kimmo
 PATCH: [ 992218 ] Add -f commandline switch for filemask
  Usage: WinMerge -f "*.ext1 *.ext2" (like in Open-dialog)
  Src: FileFilterHelper.cpp FileFilterHelper.h MainFrm.cpp Merge.cpp
   Merge.rc OpenDlg.cpp OpenDlg.h
  Src/Languages: *.rc
 
2004-07-16 Kimmo
 PATCH: [ 990976 ] FileFilterHelper (filter code cleanup)
  Src: DiffContext.cpp DiffContext.h DirDoc.cpp DirDoc.h DirScan.cpp
   FileFiltersDlg.cpp FileFilterDlg.h MainFrm.cpp Merge.cpp Merge.dsp
   Merge.h OpenDlg.cpp
  Src new files: FileFilterHelper.cpp FileFilterHelper.h
 PATCH: [ 986393 ] Lose '(debug)' from 'Reload plugins'
  Src: Merge.rc
  Src/Languages: *.rc
 PATCH: [ 941621 ] widen find/replace dialog
  Find-dialog
  Src: Merge.rc
  Src/Languages: *.rc
 PATCH: [ 941621 ] widen find/replace dialog
  Replace-dialog
  Src: Merge.rc
  Src/Languages: *.rc
 PATCH: [ 990901 ] Add Move to DirView Context menu commands.
  Submitted by Vladimir Lukianov
  Src: DirActions.cpp DirView.cpp DirView.h Merge.rc resource.h
  Src/Languages: *.rc resource.h

2004-07-15 Kimmo
 PATCH: [ 991181 ] Disable 'Goto Line' outside reduced locationpane bars
  Src: LocationView.cpp
 PATCH: [ 990365 ] Dialog to ask about saving modified files
  Src: Merge.dsp Merge.rc MergeDoc.cpp resource.h
  Src new files: SaveClosingDlg.cpp SaveClosingDlg.h
  Src/Languages: *.rc resource.h

2004-07-14 Kimmo
 PATCH: [ 988494 ] Catalan translation update
  Submitted by Jordi Vilar
  Src/Languages/Catalan: MergeCatalan.rc 
  Src/Languages/Catalan/res: splash1.bmp

2004-07-08 Kimmo
 PATCH: [ 987122 ] Horizontal scroll for dirview columns dialog listboxes
  Src: DirColsDlg.cpp DirColsDlg.h Merge.dsp Merge.rc
  Src/Common new files: HScrollListBox.cpp HScrollListBox.h
  Src/Languages: *.rc

2004-07-08 Kimmo
 PATCH: [ 986794 ] Hide 'Apply' button from filters dialog
  Src: MainFrm.cpp
 PATCH: [ 986785 ] Improve location pane with short files
  Src: LocationView.cpp LocationView.h
 PATCH: [ 986873 ] Allow recursive compares for archive files
  Src: OpenDlg.cpp

2004-07-07 Kimmo
 PATCH: [ 983265 ] Italian translation updated for latest experimental version
  Src/Languages/Italian: MergeItalian.rc

2004-07-04 WinMerge experimental release 2.1.7.9 (cvs)

2004-07-04 Perry
 Add lost piece of PATCH: [ 982960 ] Rescan when saving to update dir compare status
  Src: DirDoc.cpp

2004-07-03 Kimmo
 PATCH: [ 984520 ] Don't add '...' items as fileaction targets
  Src: DirActions.cpp

2004-07-02 Kimmo
 PATCH: [ 982960 ] Rescan when saving to update dir compare status
  Src: DiffContext.cpp DiffContext.h DirDoc.cpp DirDoc.h MergeDoc.cpp
   MergeDoc.h MergeEditView.cpp
 PATCH: [ 983410 ] Warn that New clears dircompare results
  Src: MainFrm.cpp Merge.rc resource.h
  Src/Languages: *.rc resource.h
 PATCH: [ 983721 ] Remove 'don't show again' checkbox from saving messages
  Src: MergeDoc.cpp
 PATCH: [ 984059 ] Disable merge actions for '...' item in dir compare
  Src: DirView.cpp

2004-07-01 Kimmo
 PATCH: [ 982683 ] Clear results only after user chooses new files or folders
  Src: MainFrm.cpp
 PATCH: [ 982703 ] Open manual when user presses F1
  Src: MainFrm.cpp MainFrm.h Merge.cpp Merge.h Merge.rc
  Src/Languages: *.rc

2004-06-29 Laoran
 BUG: [ 981796 ] Dir compare : rescan clears "auto-prediffer"
  Src: DirView.cpp
 PATCH: [ 981529 ] remove hide .BAK from menu
  Filters: Merge_GnuC_loose.flt Merge_VB_loose.flt Merge_VC_loose.flt
  Src: MainFrm.cpp MainFrm.h Merge.rc resource.h
  Src/Languages: *.rc resource.h

2004-06-29 Kimmo
 PATCH: [ 981468 ] Properly handle different commentstyles for Pascal
  Src/editlib: pascal.cpp
 PATCH: [ 981526 ] Don't ignore one-char lines in syntax highlight
  Src/editlib: asp.cpp basic.cpp batch.cpp cplusplus.cpp csharp.cpp dcl.cpp
   fortran.cpp html.cpp ini.cpp is.cpp java.cpp lisp.cpp pascal.cpp perl.cpp
   php.cpp python.cpp rexx.cpp rsrc.cpp siod.cpp sql.cpp tex.cpp xml.cpp

2004-06-28 Laoran
 PATCH: [ 981290 ] Updated Swedish MergeSwedish.rc file
 Submitted by Hans Eriksson 
  Src/Languages/Swedish: MergeSwedish.rc

2004-06-28 Kimmo
 PATCH: [ 980851 ] Don't save VSS password
  Src: MainFrm.cpp
 PATCH: [ 978987 ] [RFE 976364] Expand Environment Strings in paths
  Submitted by Jordi Vilar - minor tweak by Kimmo
  Src: Paths.cpp

2004-06-23 WinMerge experimental release 2.1.7.8 (cvs)

2004-06-23 Kimmo
 PATCH: [ 977587 ] Fix fileattrib handling and show all attribs in dir compare
  Src: DiffFileInfo.cpp DiffFileInfo.h DirScan.cpp DirView.cpp
 PATCH: [ 977796 ] Make dir compare column cust. dialog usable from keyboard
  Src: DirColsDlg.cpp DirColsDlg.h
 BUG: [ 936525 ] RO not removed in refresh
  Don't set files/dirs with RO fileflag RO in UI - this was bad idea!
  Src: DirView.cpp MainFrm.cpp
 BUG: [ 978062 ] VSS support broken
  Src: MainFrm.cpp
 PATCH: [ 978393 ] Better VSS errormessages
  Src: MainFrm.cpp MainFrm.h Merge.rc resource.h
  Src/Languages: *.rc resource.h

2004-06-22 Kimmo
 PATCH: [ 977475 ] Log DeleteFile() failure in FileTransform.cpp
  Src: FileTransform.cpp
 PATCH: [ 977479 ] Delete non-functional line in CPatchDlg::SaveSettings()
  Src: PatchDlg.cpp

2004-06-21 Kimmo
 BUG: [ 974662 ] Inconsistent menutexts for dircompare column dialog
  Scr: DirView.cpp Merge.rc resource.h
  Src/Languages: *.rc resource.h

2004-06-21 Laoran
 PATCH: [ 975187 ] getDefaultCodepage, use UI language only when UI not english
  Src/common: unicoder.cpp

2004-06-20 Kimmo
 PATCH: [ 972500 ] Italian translation updated
  Submitted by Andrea Decorte
  Src/Languages/Italian: MergeItalian.rc
 PATCH: [ 975025 ] Fix column number in file compare statusbar
  Src: MergeEditView.cpp
 RFE: [ 891123 ] Short format for line info in file compare
  Src: Merge.rc
  Src/Languages: *.rc
 PATCH: [ 976255 ] Add total columns and current char to lineinfo
  Src: ChildFrm.cpp ChildFrm.h Merge.rc MergeEditStatus.h MergeEditView.cpp
  Src/Languages: *.rc

2004-06-19 Kimmo
 PATCH: [ 975432 ] Add codepage detection option to configlog
  Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp

2004-06-19 Laoran
 PATCH: [ 974714 ] detect codepage when open documents directly, small update
  Src: MainFrm.cpp
 PATCH: [ 974714 ] detect codepage when open documents directly
  Src: DiffContext.cpp MainFrm.cpp MainFrm.h
  Src/Common: UniFile.cpp UniFile.h
 PATCH: [ 975213 ] warn when codepages differ
  Src: MainFrm.cpp Merge.rc resource.h
  Src/Languages: *.rc resource.h

2004-06-18 Kimmo
 BUG: [ 930574 ] Remove old and unused undo-code
  Src: MergeDoc.h MergeDoc.cpp

2004-06-17 Kimmo
 Remove commented out functions ExpandTabs() and Tabify()
  Src: MergeDoc.h MergeDoc.cpp

2004-06-17 Laoran
 PATCH: [ 972108 ] use getDefaultCodepage for document with no codepage
  Src: MainFrm.cpp
  Src/Common: UniFile.cpp unicoder.cpp unicoder.h
 PATCH: [ 973029 ] Scroll when more than 65536 characters
  Src/Common: SplitterWndEx.cpp
  Src/editlib: ccrystaltextview.cpp
 widen labels in colors dialog
  Src: Merge.rc
  Src/Languages: *.rc

2004-06-15 Kimmo
 PATCH: [ 972575 ] Goto real line from location pane
  Src: LocationView.cpp LocationView.h
 Add instructions for generating HTML documentation using SF.net shell server
  Docs/Developers: readme-developers.html

2004-06-14 Kimmo
 PATCH: [ 972188 ] Add More Pascal comments styles to syntax highlight
  Src/editlib: pascal.cpp

2004-06-14 Laoran
 PATCH: [ 972290 ] In LoadFromFile, free the handle before deleting temp files
  Src: MergeDoc.cpp
 PATCH: [ 972296 ] GetLineCount in MergeDoc must test validity of buffers
  Src: LocationView.cpp MergeDoc.cpp MergeDoc.h
 declare GetLeftView()/GetRightView()/GetLeftDetailView()/GetRightDetailView() as const
  Src: MergeDoc.h

2004-06-13 Laoran
 PATCH: [ 972007 ] Japanese translation update(2) ; submitted by Takashi Sawanaka
  Src/Languages: UpdateAll_resource_h.bat
  Src/Languages/Japanese: MergeJapanese.rc
 PATCH: [ 971862 ] Various Updates in German Translation ; submitter : Tim Gerundt
  Src/Languages/German: MergeGerman.rc

2004-06-12 WinMerge experimental release 2.1.7.7 (cvs)

2004-06-11 Laoran
 BUG: [ 970936 ] Cannot merge last diff
  Src: MergeDiffDetailView.cpp
 PATCH: [ 970991 ] Force redraw after changing moved block option
  Src: LocationView.cpp
 PATCH: [ 970221 ] Keep overlay mode after Rescan
  Src/editlib: ccrystaltextview.cpp

2004-06-11 Kimmo
 BUG: [ 969922 ] inconsistent 'options' dialog behavior
  Fix enabling/disabling 'Apply to unrecognized side' checkbox in Editor options
  Src: PropEditor.cpp
 BUG: [ 970940 ] Location pane bars not shown if syntax highlight disabled
  Src: LocationView.cpp
 BUG: [ 969922 ] inconsistent 'options' dialog behavior
  Fix enabling/disabling 'Enable advanced menu' checkbox in System options
  Src: PropRegistry.cpp PropRegistry.h

2004-06-10 Kimmo
 BUG: [ 969922 ] inconsistent 'options' dialog behavior
  Remove 'Apply' button from options-dialog
  Src: MainFrm.cpp
 BUG: [ 826560 ] CVssPrompt::OnInitDialog neglects to notice failure in open
  Also inform user if VSS databases not found
  Src: Merge.rc resource.h VssPrompt.cpp
  Src/Languages: *.rc resource.h
 PATCH: [ 970478 ] Cleanup VCS/VSS code part 1
  Src: MainFrm.cpp MainFrm.h Merge.rc resource.h
  Src/Languages: *.rc resource.h

2004-06-10 Laoran
 PATCH: [ 968887 ] UI for codepage detection
  Src: DiffContext.cpp DiffContext.h DiffWrapper.cpp DiffWrapper.h DirDoc.cpp
   MainFrm.cpp Merge.rc OptionsDef.h PropGeneral.cpp PropGeneral.h resource.h
  Src/Languages: *.rc resource.h

2004-06-09 Kimmo
 PATCH: [ 969277 ] Color options for moved blocks
  Src: MainFrm.cpp Merge.rc MergeEditView.cpp MergeEditView.h OptionsDef.h
   PropColors.cpp PropColors.h resource.h
  Src/Languages: *.rc resource.h

2004-06-08 Kimmo
 PATCH: [ 968504 ] Add Goto Line to location pane context menu
  Src: LocationView.cpp LocationView.h Merge.rc resource.h
  Src/Languages: *.rc resource.h
 PATCH: [ 968960 ] Add moved blocks setting to configlog
  Src: ConfigLog.cpp ConfigLog.h MainFrm.cpp

2004-06-08 Perry
 [ 967406 ] Add .clw to filtered out files in MakePatchDirs
 Filter out also clw files in MSVC filter. Bump version to 1.2.2.0.
  MakePatchDirs: MakePatchDirs.rc MakePatchDirsDlg.cpp
 [ 967315 ] Remove needless cast in unicoder.cpp:CrossConvert
  Src/Common: unicoder.cpp

2004-06-07 Kimmo
 BUG: [ 967899 ] Ignore carriage return differences logic backwards
  Src: MainFrm.cpp
 PATCH: [ 968255 ] Rename EOL sensitive in configlog
  Src: ConfigLog.cpp
 PATCH: [ 967700 ] Add Goto-items to location pane context menu
  Src: LocationView.cpp Merge.rc MergeEditView.h resource.h
  Src/Languages: *.rc resource.h

2004-06-07 Laoran
 PATCH: [ 966693 ] set scroll width in diffpane for widest view
  Src: MergeDiffDetailView.cpp MergeDiffDetailView.h
  Src\editlib: ccrystaltextview.h
 PATCH: [ 963124 ] better name for variable for Undo/deleteText
  Src: GhostTextBuffer.cpp GhostTextBuffer.h

2004-06-07 Perry
 Updated Catalan translation from Jordi Vilar
  Src/Languages: Catalan/MergeCatalan.rc

2004-06-06 Kimmo
 BUG: [ 959729 ] View menu show-items disabled in mergeview
  Second try, renumber items in editlib/editcmd.h
  Src/editlib/editcmd.h

2004-06-06 Laoran
 update for MergeSwedish.rc ; contribution from Hans Eriksson
  Language/Swedish: MergeSwedish.rc

2004-06-04 WinMerge experimental release 2.1.7.6 (cvs)

2004-06-04 Kimmo
 PATCH: [ 965950 ] Simplify and fix Open-dialog extension parser
  Src: OpenDlg.cpp

2004-06-03 Laoran
 BUG: [ 964242 ] WinMerge getting slower loading and showing files
  Src/Common: unicoder.cpp

2004-06-03 Kimmo
 PATCH: [ 963814 ] Cosmetic: fix call in OpenDlg to LoadPosition
  Submitted by Perry
  Src: OpenDlg.cpp

2004-06-02 Perry
 PATCH: [ 964665 ] And another unneeded include in DirDoc.h
  Src: DirDoc.h

2004-06-02 Laoran
 PATCH: [ 964497 ] fix display of moved block in detail pane
  Src: MergeDiffDetailView.cpp

2004-06-02 Kimmo
 BUG: [ 964885 ] ColExtGet() returns extension converted to lowercase
  Src: DirViewColItems.cpp

2004-06-02 Perry
 PATCH: [ 964678 ] New MergeJapanese.rc file
  Src/Languages: Japanese/MergeJapanese.rc etc
 Update "18 languages" to "19 languages"
  Docs\Developers: readme-developers.html
 PATCH: [ 964661 ] Remove unneeded include from DirDoc.h
  Src: 7Common.cpp DirDoc.h
 PATCH: [ 964664 ] Remove another unneeded include from DirDoc.h
  Src: 7Common.h DirDoc.h

2004-06-01 Kimmo
 BUG: [ 963820 ] Cutting off trailing chars in opendlg
  Submitted by Perry
  Src/Common: CoreTools.cpp

2004-06-01 Laoran
 PATCH: [ 948368 ] display moved blocks in location bar
  Src: DiffWrapper.cpp DiffWrapper.h LocationView.cpp LocationView.h MainFrm.cpp
   Merge.rc MergeDoc.cpp MergeDoc.h OptionsDef.h resource.h
  Src/Languages: *.rc resource.h
 PATCH: [ 960455 ] Clip text in DrawLineHelperImpl
  Src/editlib: crystaltextview.cpp

2004-05-31 Perry
 PATCH: [ 963804 ] Report also thread codepage in config
  Src: ConfigLog.cpp

2004-05-31 Kimmo
 Backout patch for BUG: [ 959729 ] View menu show-items disabled in mergeview
  It caused bug #963299 Can't execute 2.1.7.5 under Windows 98
  Src/editlib/editcmd.h

2004-05-31 Perry
 PATCH: [ 963092 ] Cannot compile LanguageSelect.cpp using MSVC Japanese Ver.
  Src/Common: LanguageSelect.cpp
  Src/editlib: crystaltextview.cpp cs2cs.cpp
 PATCH: [ 962460 ] Add codepage & locale info to config log
  Src: ConfigLog.cpp
 PATCH: [ 962538 ] In Rescan, set status to binary if caller said so
  Src: MergeDoc.cpp
 PATCH: [ 963438 ] Fix selection of language in dialog
  Src/Common: LanguageSelect.cpp

2004-05-30 Kimmo
 PATCH: [ 963019 ] keyboard shortcuts in replace dialog
  Submitted by Takashi Sawanaka
  Src: Merge.rc
  Src/Languages: *.rc
 PATCH: [ 913743 ] Icons for menuitems (RFE 873697) - 16-color icons, 3 new icons
  Submitted by Tim Gerundt
  Src: MainFrm.cpp Merge.rc
  Src/res: cascade.bmp change_pane.bmp close.bmp error.bmp exit.bmp
   go_to.bmp horizontally.bmp language.bmp replace.bmp select_font.bmp
   unknown.bmp vertically.bmp
  Src/res new files: customize_columns.bmp filters.bmp select_all.bmp
  Src/languages: *.rc resource.h
  Src/languages/res: same changes than in Src/res
 PATCH: [ 962509 ] Copy pathnames and filenames from directory compare
  Src: DirView.cpp DirView.h Merge.rc resource.h
  Src/languages: *.rc resource.h
 BUG: [ 962449 ] Zip* items in dircompare context menu don't have help text
  Src: Merge.rc
  Src/languages: *.rc

2004-05-30 Laoran
 BUG: [ 909779 ] Uninitialised variable in CGhostTextBuffer::DeleteText() ; fix the fix !
  Src: GhostTextBuffer.cpp
 PATCH: [ 963118 ] variable name fix in CGhostTextBuffer::Undo
  Src: GhostTextBuffer.cpp

2004-05-30 Perry
 PATCH: [ 962558 ] Some MBCS fixes from sawanaka
  Src: paths.cpp paths.h StdAfx.cpp StdAfx.h
  Src/Common: coretools.cpp
 PATCH: [ 962539 ] Add ResetInit which handles partly full buffers
  Src: MergeDoc.cpp
  Src/editlib: ccrystaltextbuffer.h

2004-05-29 Kimmo
 PATCH: [ 961810 ] Store path for ShellExtension
  ShellExtension: resource.h ShellExtension.cpp ShellExtension.rc
   WinMergeShell.cpp WinMergeShell.h
 PATCH: [ 961780 ] ShellExtension advanced menu - UI
  Src: Merge.rc PropRegistry.cpp PropRegistry.h resource.h
  Src/Languages: *.rc resource.h
 PATCH: [ 962348 ] Center OpenDialog to MainFrame
  Src: OpenDlg.cpp OpenDlg.h

2004-05-29 Perry
 Updated WinMerge Localized.iss from seier (manifest & plugins.txt changes)
  InnoSetup: WinMerge Localized.iss
 PATCH: [ 945759 ] Move to location when double-click location view
  Src/Common: LocationView.cpp LocationView.h
 BUG: [ 961901 ] Possible overflow bug in SplitFilename
  Src/Common: coretools.cpp
 New InnoSetup/Languages/Japanese.isl from sawanaka
  From url posted in discussion in BUG [ 958805 ] 2 bytes display error
  (I removed the entry for English before checking it in, as there is no English satellite DLL)
  InnoSetup: Languages/Japanese.isl

2004-05-29 WinMerge experimental release 2.1.7.5 (cvs)

2004-05-28 Kimmo
 BUG: [ 959729 ] View menu show-items disabled in mergeview
  Src/editlib: editcmd.h

2004-05-28 Laoran
 PATCH: [ 960771 ] disable .. in dirview if upward move is not reversible
  Src: DirView.cpp DirView.h Merge.rc resource.h
  Src/res Add: folderup.bmp folderup_disable.bmp
  Src/Languages: *.rc resource.h
  Src/Languages/res Add: folderup.bmp folderup_disable.bmp
 PATCH: [ 961304 ] WinDiff-compatible (F7/F8) keybindings for next/prev diff
 submitted by Krzysztof Kowalczyk
  Src: Merge.rc
  Src/Languages: *.rc

2004-05-27 Laoran
 PATCH: [ 960996 ] 'backspace' key in dirview for parent directory
  Src: DirView.cpp DirView.h

2004-05-27 Perry
 PATCH: [ 959843 ] Fix codepage initialization to thread default
  Src: DiffWrapper.cpp DiffWrapper.h DirScan.cpp DirScan.h Merge.cpp
  Src/Common: unicoder.cpp
 Localized some language names into Catalan
  Src/Languages: MergeCatalan.rc

2004-05-26 Perry
 Added a few more native or ASCII language names (Albanian, Arabic, Armenian
  Belarusian, Croatian, Estonian, Farsi, Georgian, Greek, Urdu)
  Src/Common: LanguageSelect.cpp

2004-05-27 Kimmo
 PATCH: [ 960265 ] Don't show size for folder or non-existing file
  Src: DiffFileInfo.cpp DiffFileInfo.h DirScan.cpp DirViewColItems.cpp

2004-05-26 Perry
 PATCH: [ 959468 ] A patch for "Bug [ 958805 ] 2 bytes display error".
  Src: StdAfx.cpp
  Src/editlib: ccrystaltextview.cpp ccrystaltextview.h

2004-05-25 Perry
 (cosmetic) Update edit dates in file headers
  Src/Common: unicoder.cpp unicoder.h
 Localized language names into Russian
  Src/Languages: MergeRussian.rc
 Localized language names into Bulgarian
  Src/Languages: MergeBulgarian.rc

2004-05-25 Kimmo
 PATCH: [ 959627 ] Fix crash when opening context menu for '..' item in dirview
  Src: DirActions.cpp DirView.cpp
 BUG: [ 880104 ] CCCPrompt--does it work at all?
  Disable "Save as..." button since its not used
  Src: Merge.rc
  Src/Languages: *.rc
 RFE [ 950290 ] Use MS Shell Dlg font in dialogs
  Convert Chinese and Korean translations too
  Src/Languages: MergeChineseSimplified.rc MergeChineseTraditional.rc MergeKorean.rc
 PATCH: [ 959503 ] Enable word deletion function(Ctrl+Del)
  Submitted by Takashi Sawanaka
  Src/editlib: editcmd.h editres.rc

2004-05-25 Perry
 PATCH: [ 950243 ] 2 minor updates to developers docs
  Docs/Developers: readme-developers.html
 Localized language names into Italian
  Src/Languages: MergeItalian.rc

2004-05-24 Perry
 PATCH: [ 958973 ] CDiffTextBuffer::LoadFromFile wrong return
  Src: MergeDoc.cpp

2004-05-24 Kimmo
 PATCH: [ 959111 ] Optionally don't disable Open-dialog OK-button
  Src: MainFrm.cpp Merge.rc OpenDlg.cpp OptionsDef.h PropGeneral.cpp
   PropGeneral.h resource.h
  Src/Languages: *.rc resource.h

2004-05-24 Perry
 Fix compilation (trailing comma in CCrystalTextView::m_SourceDefs)
  Src/editlib: ccrystaltextview.cpp

2004-05-24 Kimmo
 PATCH: [ 958938 ] Better way to close WinMerge with ESC (-e switch)
  Src: MainFrm.cpp MainFrm.h Merge.cpp Merge.h
 PATCH: [ 959035 ] Registry value for enabling logging
  Src: MainFrm.cpp OptionsDef.h
 Add note about logging (patch #959035]
  Docs/Developers: readme-developers.html
 RFE: [ 934419 ] Syntax highlighting *.cls with Visual Basic (basic.cpp)
  Submitted by Tim Gerundt
  Src/editlib: ccrystaltextview.cpp

2004-05-24 Perry
 PATCH: [ 893202 ] Bug fixed for DBCS text edit (Attach again)
 Src\editlib: ccrystaleditview.cpp ccrystaltextview.cpp

2004-05-23 WinMerge experimental release 2.1.7.4 (cvs)

2004-05-23 Laoran
 PATCH: [ 957317 ] Broken menu in Winmerge 2.1.7.3
  Src: Merge.cpp
  Src/Common: LanguageSelect.cpp
 typo in russian language : APTION -> CAPTION
  Src/Languages/Russian: MergeRussian.rc

2004-05-23 Kimmo
 PATCH: [ 958478 ] Allow ESC close WinMerge if no open docs
  Src: MainFrm.cpp MainFrm.h

2004-05-23 Perry
 Localized language names into Portuguese
  Src/Languages: MergeBrazilian.rc

2004-05-22 Kimmo
 PATCH: [ 958122 ] Add C# syntax highlight
  Src: Merge.dsp
  Src/editlib: crystaltextview.cpp crystaltextview.h
  Src/editlib new file: csharp.cpp
 RFE: [ 950290 ] Use MS Shell Dlg font in dialogs
  Src: Merge.rc
  Src/Languages: *.rc, except MergeChineseSimplified.rc
   Merge ChineseTraditional.rc, MergeKorean.rc

2004-05-22 Perry
 Localized language names into French
  Src/Languages: MergeFrench.rc
 Updates to Spanish localized language names
  Src/Languages: MergeSpanish.rc
 BUG: [ 898924 ] Lang order in Language selection dialog?
 RFE: [ 953015 ] sort language names
  Mark listbox in language dialog as sorted
  Src: Merge.rc
  Src/Languages: Merge*.rc

2004-05-21 Perry
 Fix PATCH [ 957740] - declare CMergeDoc::CompareBinaries
  Src: MergeDoc.h
 Updated WinMerge Localized.iss from seier (add Swedish Readme after install)
  InnoSetup: WinMerge Localized.iss
 Updated Swedish ReadMe from seier
  Docs/Users/Languages: Read Me-Swedish.rtf
 Updated all non-localized language versions of Read Me*.rtf to current Read Me.rtf
  Docs\Users\Languages: Read Me*.rtf (except Swedish)
 Remove all localization Contributors*.rtf
  Docs\Users\Languages: removed Contributors*.rtf

2004-05-21 Kimmo
 PATCH: [ 957740 ] Tell if two binary files are different/identical
  Src: DiffWrapper.cpp DiffWrapper.h Merge.rc MergeDoc.cpp resource.h
  Src/Languages: *.rc resource.h

2004-05-21 Laoran
 PATCH: [ 947680 ] Organize resource strings, part 2 (IDD and IDB)
  Src: resource.h
  Src/Languages: resource.h

2004-05-21 Kimmo
 PrivateBuild in version resource must be empty string in CVS.
  Src: Merge.rc
  Src/Languages: *.rc

2004-05-21 Perry
 Localized language names into Korean
  Src/Languages: MergeKorean.rc

2004-05-20 Kimmo
 PATCH: [ 956893 ] Fix toolbar problem with XP themes and VC6
  Src: MainFrm.cpp Merge.cpp
 PATCH: [ 954991 ] Add directory compare column descriptions
  Src: DirColsDlg.cpp DirColsDlg.h DirView.h DirViewColHandler.cpp
   DirViewColItems.cpp Merge.rc resource.h
  Src/Languages: *.rc resource.h

2004-05-18 Kimmo
 PATCH: [ 955408 ] Select first item in dir compare
  Src: DirView.cpp
 PATCH: [ 956044 ] Don't select '..' and don't skip unique folders in dirview
  Src: DirView.cpp

2004-05-18 Perry
 PATCH: [ 955573 ] Swedish localization of Read Me.rtf
 Docs/User/Languages: Read Me-Swedish.rtf

2004-05-18 WinMerge experimental release 2.1.7.3 (cvs)

2004-05-18 Perry
 PATCH: (continued) [ 942021 ] Propose translation of language names
  Src/Languages: MergeBrazilian.rc MergeBulgarian.rc MergeCatalan.rc
   MergeChineseSimplified.rc MergeChineseTraditional.rc
   MergeKorean.rc MergeRussian.rc
 BUG: [ 955550 ] Slovak rc file broken (typo)
  Src/Languages: MergeSlovak.rc
 BUG: [ 955553 ] Russian rc file broken
  Src/Languages: MergeRussian.rc
 BUG: [ 955557 ] Chinese traditional rc file broken (cvs)
  Src/Languages: MergeChineseTraditional.rc
  
2004-05-17 Kimmo
 PATCH: [ 955411 ] Remove non-functional firstdiff selection
  Src: DirView.h MainFrm.cpp

2004-05-15 Kimmo
 Fix build error, VC6 doesn't like CList::GetSize()
  Src: DirActions.cpp
 PATCH: [ 952877 ] Return better results from Rescan()
  Src: MergeDoc.cpp MergeDoc.h 

2004-05-14 Kimmo
 PATCH: [ 952825 ] Cleanup VSS dialog layout
  Src: Merge.rc
  Src/Languages: *.rc
 PATCH: [ 952586 ] Improve readonly file and folder handling
  Src: DirActions.cpp MainFrm.cpp MainFrm.h Merge.rc MergeDoc.cpp resource.h
  Src/Languages: *.rc resource.h
 PATCH: [ 948592 ] Open and select filefilter from Open-dialog
  Src: FileFiltersDlg.cpp MainFrm.cpp MainFrm.h Merge.cpp Merge.h
   Merge.rc OpenDlg.cpp OpenDlg.h resource.h
  Src/Languages: *.rc resource.h

2004-05-13 Kimmo
 Backout last change to Merge.rc - restore version 1.187
  Src: Merge.rc
 BUG: [ 953232 ] Some lang-files broken
  Backout last changes to lang files (see bug item for details)
   Src/Languages: MergeBulgarian.rc MergeChineseSimplified.rc
    MergeChineseTraditional.rc MergeKorean.rc MergeRussian.rc
 PATCH: [ 953056 ] Rename 'Sensitive to EOL' option
  Src: Merge.rc
  Src/Languages: *.rc
 PATCH: [ 953515 ] Improve LocationPane drawing code
  Src: LocationView.cpp

2004-05-13 Perry
 PATCH: [ 950530 ] Remove unneeded cast in DirView.cpp
  Src: DirView.cpp
 PATCH: [ 945722 ] Two functions are never called
  Src: DiffContext.cpp DiffContext.h
 PATCH: [ 945152 ] Installer: My last revisions
  InnoSetup: WinMerge Localized.iss
  InnoSetup/Languages: *.isl (except Swedish.isl)
 PATCH: [ 950236 ] Set DIFFCODE::BOTH correctly
  Src: DirScan.cpp
 PATCH: [ 942021 ] Propose translation of language names
  Src: Merge.rc
  Src/Common: LanguageSelect.cpp LanguageSelect.h
  Src/Languages: *.rc
 PATCH: [ 950212 ] wrong language shown in LanguageSelect
  Src/Common: LanguageSelect.cpp
 BUG: [ 876539 ] Wrong textinclude language def in ChineseTraditional
  Src/Languages: ChineseTraditional.rc
 Translate language names into Dutch (follow-up to PATCH#942021)
  Src/Languages: MergeDutch.rc
 Add a few more native language names
  Src/Common: LanguageSelect.cpp

2004-05-12 Kimmo
 PATCH: [ 948448 ] Remove WinMerge.exe path from system options
  Src: Merge.rc PropRegistry.cpp PropRegistry.h resource.h

2004-05-11 Laoran
 PATCH: [ 948528 ] Build BCMenu after select language
  Src: MainFrm.cpp MainFrm.h Merge.cpp
  Src\Common: LanguageSelect.cpp

2004-05-11 Perry
 Fix MakePatchDirs to ignore BuildTmp.
 MakePatchDirs: ChangeLog.txt MakePatchDirs.rc MakePatchDirsDlg.cpp
 
2004-05-11 Kimmo
 PATCH: [ 951404 ] Add statusmessage for dircompare copy/delete ops
  Src: DirActions.cpp Merge.rc resource.h
  Src/Languages: *.rc resource.h

2004-05-10 Christian
 PATCH: [ 945467 ] Remove ReleaseMinsize and UnicodeReleaseMinsize
  Src: Merge.dsp
  Src/Languages: CopyAll.bat

2004-05-10 Kimmo
 PATCH: [ 951234 ] Use resourceIDs in dircompare statebar bitmpaps
  Src: Merge.rc
  Src/Languages: *.rc

2004-05-10 Laoran
 apply again modifications to IDS_QUICKHELP, lost during PATCH: [ 947680 ]
  Src: Merge.rc 
  Src\Languages\Swedish: MergeSwedish.rc

2004-05-07 Laoran
 PATCH: [ 947680 ] Organize resource strings
  Src: CCPrompt.cpp DiffWrapper.cpp DirFrame.cpp MainFrm.cpp Merge.rc MergeDoc.cpp
   PropGeneral.cpp VssPrompt.cpp resource.h  
  Src\editlib: ccrystaltextview.cpp ccrystaltextview.h editcmd.h
  Src\Common: LanguageSelect.h
  Src\Languages: *.rc resource.h

2004-05-08 WinMerge experimental release 2.1.7.2 (cvs)

2004-05-07 Laoran
 update for MergeSwedish.rc ; contribution from Hans Eriksson
  Language/Swedish: MergeSwedish.rc

2004-05-07 Kimmo
 PATCH: [ 949428 ] Show VSS dialogs only once
  Src: DirActions.cpp MainFrm.cpp MainFrm.h Merge.rc resource.h
  Languages: *.rc resource.h
 BUG: [ 947121 ] ShellExtension does not compile with Visual Studio 2003
  ShellExtension: ShellExtension.dsp
 BUG: [ 941335 ] RC file missing strings and errors
  Src: Merge.rc
  Languages: *.rc

2004-05-07 Laoran
 PATCH: [ 948366 ] clear moved blocks before Rescan
  Src: DiffWrapper.cpp DiffWrapper.h MergeDoc.cpp

2004-05-06 Kimmo
 PATCH: [ 948634 ] Commandline switch to open left/right side as readonly
  Src: Merge.cpp Merge.rc
  Languages: *.rc

2004-05-05 Kimmo
 PATCH: [ 947232 ] Add primary path to WinMerge.exe for ShellExtension
  ShellExtension: ShellExtension.rc WinMergeShell.cpp

2004-05-04 Laoran
 PATCH: [ 947599 ] Remove EditFile.cpp EditFile.h
  Src remove: EditFile.cpp EditFile.h
  Src: Merge.dsp Merge.rc resource.h
  Languages: *.rc resource.h

2004-05-03 Kimmo
 PATCH: [ 942565 ] Option for closing windows with ESC
  Src: DirDoc.cpp DirView.cpp DirView.h MainFrm.cpp Merge.rc MergeEditView.cpp
   MergeEditView.h OptionsDef.h PropGeneral.cpp PropGeneral.h resource.h
  Languages: *.rc resource.h
 PATCH: [ 946550 ] [MergeMode] Don't try to merge if diff not selected
  Src: MergeEditView.cpp

2004-05-03 Laoran
 PATCH: [ 946091 ] Fix for GetLineActualLength
  Src/editlib: ccrystaltextview.cpp

2004-05-03 Laoran
 PATCH: [ 936842 ] Custom message when same file in both panels
  Src: Merge.rc MergeDoc.cpp resource.h
  Languages: *.rc resource.h
  
2004-05-02 Kimmo
 PATCH: [ 833180 ] Filters dialog
  Src new files: FileFiltersDlg.cpp FileFiltersDlg.h
  Src: MainFrm.cpp MainFrm.h Merge.dsp Merge.rc
   PropFilter.cpp PropFilter.h resource.h
  Languages: *.rc resource.h

2004-05-01 Laoran
 PATCH: addon to [ 941623 ] Propose moving IDC_COMPARISON_STOP to block with ...CLOSE
  Src: Merge.rc
  Languages: *.rc

2004-05-01 Perry
 PATCH: [ 941979 ] Add cast to suppress VS.NET 2002 warning
  Src: MergeDoc.cpp
 PATCH: [ 927929 ] Reload language menus after resources hooked
  Src: Merge.cpp
 PATCH: [ 941623 ] Propose moving IDC_COMPARISON_STOP to block with ...CLOSE
  Src:
   Merge.rc
  Languages: MergeBrazilian.rc MergeBulgarian.rc MergeCatalan.rc
   MergeChineseSimplified.rc MergeChineseTraditional.rc MergeCzech.rc
   MergeDanish.rc MergeDutch.rc MergeFrench.rc MergeGerman.rc MergeItalian.rc
   MergeKorean.rc MergeNorwegian.rc MergePolish.rc MergeRussian.rc
   MergeSlovak.rc MergeSpanish.rc MergeSwedish.rc
 PATCH: [ 909761 ] Misplaced return in CDirView::ValidateColumnOrdering()?
  Src: DirViewColHandler.cpp

2004-04-30 Christian
 PATCH: [ 941982 ] Fix VS6 compilation
  Src/Common: MessageBoxDialog.cpp MessageBoxDialog.h

2004-04-29 Kimmo
 PATCH: [ 943149 ] Contributors fix
  Src: Merge.cpp Merge.rc
  Languages: *.rc
  Docs/Users/Contributors.txt
  Removed: Docs/Users/Contributors.rtf
 BUG: [ 944290 ] Crash when deleting files
  Src: DirActions.cpp

2004-04-28 Kimmo
 PATCH: [ 937947 ] Open-dialog improvements (no codepage controls)
  Src: Merge.rc OpenDlg.cpp OpenDlg.h resource.h
  Languages: *.rc resource.h

2004-04-27 Kimmo
 RFE: [ 942591 ] Loose filter for Visual Basic
  Submitted by Tim Gerundt
  Filters new file: Merge_VB_loose.flt
 PATCH: [ 930482 ] Add comments to filter: Merge_GnuC_loose.flt
  Submitted by Tim Gerundt
  Filters: Merge_GnuC_loose.flt

2004-04-26 Kimmo
 BUG: [ 940709 ] Dircompare column widths saved only when WinMerge closed
  Fix from Perry
  Src: DirViewColHandler.cpp

2004-04-26 Perry
 PATCH: [ 941986 ] Remove blank lines in popup dirview menu in Merge.rc
  Src: Merge.rc

2004-04-25 WinMerge experimental release 2.1.7.1 (cvs)

2004-04-25 Perry
 More removing obsolete keywords to sync languages to English
  Languages: MergeDutch.rc MergeFrench.rc MergeGerman.rc
   MergeItalian.rc MergeKorean.rc MergeNorwegian.rc

2004-04-25 Kimmo
 PATCH: [ 941524 ] Reset dircompare column widths
  Src: DirColsDlg.cpp DirColsDlg.h DirView.cpp DirView.h DirViewColHandler.cpp
 PATCH: [ 941545 ] Fix Shift-Arrow to select text in merge mode
  Src: MergeEditView.cpp

2004-04-25 Perry
 More removing obsolete keywords to sync languages to English
  Languages: MergeCatalan.rc MergeChineseSimplified.rc
   MergeChineseTraditional.rc MergeCzech.rc MergeDanish.rc
   MergeFrench.rc MergePolish.rc

2004-04-24 Perry
 More removing obsolete keywords to sync languages to English
  Src: Merge.rc
  Languages: MergeBrazilian.rc MergeSpanish.rc MergeSwedish.rc
 More removing obsolete keywords to sync languages to English
  Src: Merge.rc
  Languages: MergeRussian.rc MergeSlovak.rc MergeSpanish.rc
   MergeSwedish.rc
 More removing obsolete keywords to sync languages to English
  Languages: MergeBrazilian.rc MergeSlovak.rc MergeSpanish.rc
   MergeSwedish.rc

2004-04-24 Kimmo
 BUG: [ 939245 ] Location Bar don't show diff in first line
  Src: LocationView.cpp
 PATCH: [ 938822 ] Enable merge items in file compare context menu
  Src: Merge.rc
  Languages: *.rc

2004-04-24 Perry
 PATCH: [ 941014 ] Various Updates in German Translation (Tim Gerundt)
  (Except I didn't remove the synchro comments)
  Languages: MergeGerman.rc
 Added synchro comments to Merge.rc. Synchronized various languages to English.
  Src: Merge.rc
  Languages: MergeBrazilian.rc MergeBulgarian.rc MergeCatalan.rc 
   MergeChineseSimplified.rc MergeChineseTraditional.rc
   MergeCzech.rc MergeDanish.rc MergeFrench.rc MergeGerman.rc
   MergeSpanish.rc

2004-04-23 Kimmo
 PATCH: [ 940713 ] Fix for resetting dirview columns
  Src: DirViewColHandler.cpp
 Remove deprecated keywords from RC file I added in when applying #936682.
  Src: Merge.rc
 PATCH: [ 940089 ] Add Binary column and shorten short result
  Src: DirViewColHandler.cpp DirViewColItems.cpp Merge.rc resource.h
  Languages: *.rc resource.h
 PATCH: [ 940036 ] Add missing dirview column table indexes
  Src DirViewColHandler.cpp

2004-04-22 Kimmo
 PATCH: [ 936682 ] Highlight syntax in unrecognized side
  Src: MainFrm.cpp Merge.rc MergeDoc.cpp OptionsDef.h PropEditor.cpp
   PropEditor.h resource.h
  Languages: *.rc resource.h

2004-04-21 Kimmo
 PATCH: [ 938609 ] Merge mode (simplified)
  Src: MainFrm.cpp Merge.rc MergeDoc.cpp MergeDoc.h MergeEdiView.cpp
   MergeEditView.h OptionsDef.h resource.h
  Languages: *.rc resource.h
 BUG: [ 939548 ] Location bar crash if diff at end missing last line EOL
  Src: LocationView.cpp

2004-04-20 WinMerge experimental release 2.1.7.0 (cvs)

2004-04-20 Laoran
 Syntax correction for Unicode
  Src: DirView.cpp

2004-04-20 Laoran
 BUG:[ 938373 ] Filtering broken - infinite loop when file filtered
  Src: DirScan.cpp

2004-04-20 Laoran
 updated swedish translation
  Submitted by Hans Eriksson 
  Languages/Swedish: MergeSwedish.rc

2004-04-20 Laoran
 PATCH: [ 929210 ] GUI for prediffer (compare two files)
  Src: DiffWrapper.cpp DirView.cpp MainFrm.cpp MainFrm.h Merge.rc MergeDoc.cpp MergeEditView.cpp 
   MergeEditView.h resource.h
  Languages: *.rc resource.h

2004-04-19 Perry
 Fix English typos in Localization Instructions.txt
 InnoSetup/Languages/Localization Instructions.txt

2004-04-19 Kimmo
 PATCH [ 937535 ] Updated syntax highlighting for resources files (*.rc)
  Submitted by Tim Gerundt
  Src/editlib: rsrc.cpp

2004-04-18 Perry
 BUG: [ 937435 ] cvs doesn't compile -- typo in CMergeDoc::ShowRescanError(
  Src: MergeDoc.cpp
 PATCH: [ 937441 ] CMergeEditView:Avoid calling SelectDiff when no current diff
   Src: MergeEditView.cpp
 BUG: [ 936079 ] castellano options
   Src/Languages/Spanish: MergeSpanish.rc

2004-04-18 Kimmo
 PATCH: [ 934738 ] CopyLeftTo/CopyRightTo Including Common Subdirectories
  Submitted by Ben (?) - some modifications by Kimmo
  Src: DirActions.cpp
 PATCH: [ 930456 ] Allow Copy Left/Right to copy folders too
  Src: DirActions.cpp
 PATCH: [ 934370 ] Log temp file errors and own errormessage
  Src: Merge.rc MergeDoc.cpp MergeDoc.h resource.h
  Languages: *.rc resource.h
  
2004-04-17 Kimmo
 PATCH: [ 910557 ] Location Bar
  Submitted by Vincent Osele
  Src: ChildFrm.cpp ChildFrm.h MainFrm.cpp Merge.dsp Merge.rc
   MergeDoc.cpp MergeDoc.h MergeEditView.h resource.h
  Src new files: LocationBar.cpp LocationBar.h LocationView.h LocationView.cpp
  Languages: *.rc resource.h

2004-04-17 Laoran
 PATCH: [ 929001 ] Delete commented out "diff_dirs2"
  Src: DirDoc.cpp

2004-04-17 Laoran
 BUG: [ 936824 ] Prediffer not initialized when generate patch
  Src: PatchTool.cpp

2004-04-17 Laoran
 BUG: [ 936524 ] Cannot compare/Cancel,Retry,Continue
  Src: DirView.cpp

2004-04-17 Kimmo
 Fix for unicode build after patch #935048 -- add _T() around string
  Src: DirView.cpp

2004-04-16 Laoran
 PATCH: [ 935048 ] Plugin manager and per-file plugin settings V2
  Src: DiffContext.cpp DiffContext.h DiffWrapper.cpp DiffWrapper.h DirActions.cpp DirDoc.cpp DirDoc.h 
   DirScan.cpp DirView.cpp DirView.h MainFrm.cpp Merge.dsp Merge.rc MergeDoc.cpp MergeDoc.h resource.h
  Src Add: PluginManager.cpp PluginManager.h

2004-04-16 Laoran
 updated swedish translation
  Submitted by Hans Eriksson 
  Languages/Swedish: MergeSwedish.rc

2004-04-16 Kimmo
 RFE: [ 934446 ] Syntax highlighting for XML files
  Submitted by Tim Gerundt
  Src: Merge.dsp
  Src/editlib: ccrystaltextview.cpp ccrystaltextview.h
  Src/editlib new file: xml.cpp

2004-04-14 Kimmo
 BUG: [ 926578 ] Division by zero exception
  Fix tabsize limits in options dialog
  Src: PropEditor.cpp
 PATCH: [ 934344 ] Reset dircompare columns
  Src: DirColsDlg.cpp DirColsDlg.h DirViewColHandler.cpp Merge.rc resource.h
  Languages: *.rc resource.h

2004-04-13 Jochen
 PATCH: [ 889357 ] Attempt to improve DirScan speed -- updated patch from 2004-03-18
  Src: 7zCommon.cpp 7zCommon.h DiffContext.cpp DiffContext.h DiffFileInfo.h
   DiffWrapper.cpp DiffWrapper.h DirDoc.cpp DirScan.cpp DirViewColHandler.cpp DirViewColItems.cpp DirViewColItems.h
   MainFrm.cpp
  Merge7z: Merge7z.def Merge7z.h Merge7z311.cpp Merge7zCommon.cpp Merge7z311.dsp Merge7z312.dsp Merge7z313.dsp

2004-04-13 Kimmo
 PATCH: [ 932086 ] Syntax highlighting of HTML not complete (Bug 930930)
  Submitted by Tim Gerundt
  Src/editlib: ccrystaltextview.cpp html.cpp php.cpp
 Fix typo causing wrong icon for error items in dir compare
  Src: DirView.cpp

2004-04-07 Laoran
 BUG: [ 930995 ] Cursor help text ... ; part two : inversion in menu
  Src: Merge.rc
  Src/Languages: *.rc

2004-04-07 Kimmo
 PATCH: [ 930495 ] Log delete file errors from FileTransform.cpp
  Src: FileTransform.cpp
 PATCH: [ 930512 ] Log delete file errors from multiformatText.cpp
  Src/Common: multiformatText.cpp

2004-04-07 Laoran
 BUG: [ 930995 ] Cursor help text ...
  Src/Languages/German: MergeGerman.rc

2004-04-05 Kimmo
 PATCH: [ 929155 ] Add identical folders to dircompare statepane
  Src: DirCompStateBar.cpp DirCompStateBar.h DirView.cpp Merge.dsp
   Merge.rc resource.h
  Src/res new file: error.bmp
  Languages: Merge.rc resource.h res/error.bmp
 PATCH: [ 929584 ] Reset scratchpad names
  Don't show "Untitled Left/Right" for docs opened after scratchpads
  Src: MainFrm.cpp

2004-04-04 Perry
 PATCH: [ 928976 ] Handle when selected language not in list
  Src/Common: LanguageSelect.cpp

2004-04-04 Kimmo
 PATCH: [ 914513 ] Move message ids to stdafx.h
  DirDoc.h StdAfx.h

2004-04-03 Perry
 Move enum ACT_TYPE, struct action, and typedef DeletedItemList inside of 
  struct ActionList, of which they are part. Add header comment for ActionList.
 Src: DirActions.cpp DirView.h

2004-04-03 Laoran
 PATCH: [ 923044 ] Partial compare large files
  Plugins: list of sources.txt
  Plugins\src_VCPP_WatchBeginningOfLog add: all files
  Plugins\src_VCPP_WatchEndOfLog add: all files

2004-04-02 Laoran
 PATCH [ 925172 ] Check for presence of Windows Script
 Src: ConfigLog.cpp ConfigLog.h Merge.rc MergeEditView.cpp Plugins.cpp Plugins.h resource.h

2004-04-02 Laoran
 Change plugins event title 'CONTEXT_MENU' -> 'EDITOR_SCRIPT'
  Src: FileTransform.cpp FileTransform.h MergeEditView.cpp Plugins.cpp Plugins.h
  Plugins/dlls: editor addin.sct insert datetime.sct list.txt
  Plugins: list of sources.txt readme.txt syntax.txt
  Plugins/src_VB/ToUpper: WinMergeScript.cls

2004-04-01 Perry
 Remove most of obsolete keywords in rc file (a la Merge.rc 1.149, which didn't have them)
  Src: Merge.rc
 PATCH: [ 927000 ] Russian translation update (based on 1.32)
  (Not applied exactly, but updated to match current English Merge.rc (mostly removing obsolete keywords).
  Languages: Russian/MergeRussian.rc
 Merge Portuguese Brazilian to current English Merge.rc (mostly removing obsolete keywords).
  Languages: Brazilian/MergeBrazilian.rc

2004-03-31 Kimmo
 PATCH: [ 924521 ] Add context menu for file compare
  Src: DirView.cpp FilePathEdit.cpp Merge.rc MergeEditView.cpp resource.h
  Languages: resource.h *.rc

2004-03-30 seier
  Fixed Swedish Language had a description of Spanish in the installer.  
  Fixed Swedish was installing along with Spanish rather than the Swedish component description in the installer.  
     Src: InnoSetup/WinMerge.iss
  Release Notes Table template created in response to the table located at http://sourceforge.net/project/shownotes.php?release_id=226701.  
     Src: Docs/Users/Release Notes Template.htm
  Migration of /UsersGuide --> /Docs/Users/UsersGuide --> /Docs/Users/Guide Documented
     Src: Docs/Developers/File Migration Log.htm

2004-03-30 Laoran
 PATCH: [ 922724 ] "Don't display again" option for messageboxes
  Src: DirActions.cpp DirView.cpp MainFrm.cpp Merge.cpp Merge.dsp Merge.rc
       MergeDoc.cpp PatchDlg.cpp PatchTool.cpp PropGeneral.cpp PropGeneral.h StdAfx.h resource.h
  Src/editlib: ceditreplacedlg.cpp
  Src/common add: MessageBoxDialog.cpp MessageBoxDialog.h
  Languages: *.rc resource.h

2004-03-30 Kimmo
 PATCH: [ 925179 ] Remove is_*file() functions from coretools.h/cpp
  Common: coretools.cpp coretools.h

2004-03-30 Laoran
 BUG [ 925202 ] broken feature: after save error, save with another filename
  Src: MergeDoc.cpp

2004-03-28 Kimmo
 PATCH: [ 913743 ] Icons for menuitems (RFE 873697)
  File/Exit and Help/Contents icons from Tim Gerundt
  Src: MainFrm.cpp Merge.rc resource.h
  Src/res new files: exit.bmp help_contents.bmp
  Languages: *.rc resource.h
  Languages/res: exit.bmp help_contents.bmp

2004-03-27 Laoran
 PATCH [ 921788 ] scripts submenu in the main menu
 Src: FileTransform.cpp FileTransform.h MainFrm.cpp MainFrm.h Merge.rc
  MergeEditView.cpp MergeEditView.h Plugins.cpp Plugins.h resource.h
 Src/Languages: *.rc resource.h

2003-03-27 WinMerge beta 2.1.6.0 released

2004-03-26 Perry
 Src/Languages: Bulgarian/MergeBulgarian.rc
  Many cosmetic changes to make MergeBulgarian.rc match Merge.rc (mostly dropping obsolete keywords).

2004-03-26 Laoran
 [ 847155 ] Utf8len_of_string is wrong for 8-bit
  Src/Common: unicoder.cpp unicoder.h

2004-03-26 Perry
 Docs/Users: Contributors.rtf
  Add Bulgarian credit to contributors.rtf. Move Portuguese to alphabetically Portuguese.

2004-03-26 seier
  Fixed Swedish Language had a description of Spanish in the installer.  
  Fixed Swedish was installing along with Spanish rather than the Swedish component description in the installer.  
     Src: InnoSetup/WinMerge.iss
     
2004-03-26 Perry
 Add new Bulgarian translation
  Src/Languages/Bulgarian

2004-03-25 Kimmo
 BUG: [ 918760 ] doxygen.cfg moved
  Update paths for new location of doxygen.cfg in docs/developers
  docs/developers: doxygen.cfg

2004-03-24 Laoran
 HideFirstLetter plugin : fix : open input and output file as binary 
  Plugins/HideFirstLetter: WinMergeScript.cpp

2004-03-24 WinMerge experimental release 2.1.5.16 (cvs)

2004-03-24 Kimmo
 BUG: [ 922716 ] "delete both" broken
  Src: DirActions.cpp

2004-03-23 Perry
 Add simple comments in action list code
 Src: DirActions.cpp

2004-03-23 Kimmo
 PATCH: [ 921440 ] UI option for detecting moved blocks
  Src: DirDoc.cpp MainFrm.cpp Merge.rc MergeDoc.cpp OptionsDef.h
   PropCompare.cpp PropCompare.h resource.h
  Languages: *.rc resource.h

2004-03-22 Seier
 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. 
  InnoSetup: desktop.ini
 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.  
  Docs: Users/Manual/screenshots/*.bmp --> *.gif
  Docs: Users/Manual/Compare_dirs.xml
  Docs: Users/Manual/Compare_files.xml
   
2004-03-22 Kimmo
 PATCH: [ 920530 ] Remember Patch-dialog settings
  Src: Merge.rc PatchDlg.cpp PatchDlg.h resource.h
  Languages: *.rc resource.h
 BUG: [ 920965 ] Merging moved block messes up linecolors
  Src: MergeDoc.cpp
 BUG: [ 902915 ] Directory compare statepane button text blinks
  Fix submitted by Jochen in Patch #889357 Attempt to improve DirScan speed.
  Src: DirCompStateBar.cpp
 Change directory compare statepane button to defaultbutton
  Allows stopping directory compare with Enter-key
  Src: Merge.rc
  Languages: *.rc

2004-03-22 Laoran
 PATCH: [ 909672 ] Undo makes marker messy
  Src: MergeEditView.cpp
  Src/editlib: ccrystaltextbuffer.cpp ccrystaltextbuffer.h

2004-03-21 Seier
  Installer now also installs WinMerge as the merging application in addition being the differencing application.  
  Installer updated to use \ShellExtension\ShellExtension.dll as the new location for that file 
  Installer will now remove the ComCtlupd.exe at the end of the installation.  
  PATCH: [ 919134 ] I added the OleAut32.dll necessary for others to compile the WinMerge.iss script.
    Src: /InnoSetup/WinMerge.iss
  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.  
     Src: /Src/Res/Splash2.bmp
 
2004-03-21 Kimmo
 PATCH: [ 918545 ] New Splash Screen
  Submitted and graphics by Dean Grimm
  Src: Splash.cpp Splash.h
  Src/res: splash1.bmp

2004-03-19 Christian
 PATCH: [ 919134 ] Paths fixed in installer
  InnoSetup: WinMerge.iss

2004-03-19 Kimmo
 BUG: [ 919090 ] Memory leak in DiffFileData
  Src: DiffWrapper.cpp

2004-03-18 Perry
 BUG: [ 919160 ] Cannot execute notepad.exe
  Fix OpenFileToExternalEditor to prepend space before quoted filename.
   Src/MainFrm.cpp
 PATCH: [ 891498 ] moved block detection
   Src: Diff.cpp DiffWrapper.cpp DiffWrapper.h MergeDoc.cpp MergeDoc.h
    MergeEditView.cpp MergeEditView.h
   Src\diffutils\src: analyze.c DIFF.H

2004-03-17 Seier
 Modified  \ShellExtension\Register.bat to also UnRegister via a /U (case-insensitive) parameter.  
  I also added an UnRegister.bat which does nothing more than call Register.bat with the /u switch.  
 If you're wondering where a particular file or folder went and why please see \Docs\Developers\File Migration Log.htm.  
  Everyone can use this file from now on.

2004-03-17 Kimmo
 PATCH: [ 913743 ] Icons for menuitems (RFE 873697)
  More nice icons from Tim Gerundt (Edit/Goto, Edit/Replace, View/Language, View/Font, Window/Change Pane)
  Src: MainFrm.cpp Merge.rc resource.h
  Src/res new files: change_pane.bmp go_to.bmp language.bmp replace.bmp select_font.bmp
  Languages: *.rc resource.h
  Languages/res new files: change_pane.bmp go_to.bmp language.bmp replace.bmp select_font.bmp
 PATCH: [ 915790 ] Open Contributors.rtf from About dialog
  Handle errors if wordpad or associated app couldn't be run.
  Src: Merge.cpp

2004-03-16 Seier
  [Patch 917142] for Installer:
    -Now detects whether or not the user requires an updated ComCtl32.dll and if needed updates it.  
    -Corrupt Shell Extension folder association removed from the registry (no more errors in Windows Explorer)
    -Explorer "WinMerge" context menu support added
    -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
    -Portugese is now listed amongst the other selectable languages in alpahbetic order
    -Catalan, Norwegian, Polish, Russian, and Swedish translations have been added to the installer for a total of 17 languages! Way to go 
      Translators!  Eventually we'll all just get lazy and speak Mergish :).  
    -WinMerge's "User's Guide" and "Read Me" files installed and added to the user's start menu
      Program Files\Docs\ created containing:
        * Read Me.rtf
        * Contributors.rtf
        * \User's Guide\	
    -The Read Me.rtf was divided into two files: Read Me.rtf and Contributors.rtf 
      (since this information is non-technical ands considerable bloat to the main Read Me file)
    -Obsolete registry settings LeftMax and DirViewMax are now deleted rather than reset 
      (note: all registry deletions in Inno Setup must have Type set to "None")  
    -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)	
    -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)

2004-03-16 Kimmo
 RFE [ 917196 ] Directory Comparison Results baloon annoyance
  Don't show infotip for filename when whole filename is already shown
  Src: DirView.cpp
 PATCH: [ 915790 ] Open Contributors.rtf from About dialog
  Src: Merge.cpp Merge.rc resource.h

2004-03-15 Perry
 Fix Bulgarian (Cyrillic) spelling of Bulgarian.
 Src/Common: LanguageSelect.cpp

2004-03-15 Kimmo
 RFE: [ 874366 ] Add goto line-number
  Scroll line searched to center of view, as suggested by harry mckame
  Src: MergeEditView.cpp
 Change URLs to point http://winmerge.org 
  (As discussed in BUG #916674 Hardcoded url to help and website from help-menu)
  MainFrm.cpp Merge.cpp

2004-03-14 Kimmo
 RFE [ 897975 ] Syntax highlighting for INI files
  Color "[...]"
  Src/editlib: ini.cpp
 Apply icon change (2004-03-13 Seier) to languages
  Languages/res: Merge.ico
 PATCH: [ 913743 ] Icons for menuitems (RFE 873697)
  Submitted by Tim Gerundt
  Src: MainFrm.cpp Merge.rc resource.h
  Src/res: Toolbar.bmp
  Src/res new files: close.bmp
  Languages: *.rc resource.h
   res/bmp files
 BUG: [ 916028 ] Deleting unique file does not remove it from view
  Src: DirActions.cpp

2004-03-13 Seier
 Add 48*48 icon version (256 & 16 color)
  Src: /res/Merge.ico

2004-03-13 Kimmo
 Add User Manual draft to CVS
  Docs/Users/Manual: *.*
 PATCH: [ 915145 ] Delay automatic close of compare pane
  Src: DirView.cpp

2004-03-13 WinMerge experimental release 2.1.5.15 (cvs)

2004-03-11 Kimmo
 PATCH: [ 902191 ] Uninline CDiffTextBuffer functions
  Src: GhostTextBuffer.cpp MergeDoc.cpp MergeDoc.h
 BUG: [ 906467 ] Link error with Visual Studio 2003
  Fix submitted by hberni
  Merge7z: Merge7z.h
  Src: DirActions.cpp
 PATCH: [ 911442 ] Sort folders first when sorting by name
  Also fixing grouping doxygen comments for functions
  Src: DirViewColItems.cpp

2004-03-11 WinMerge experimental release 2.1.5.14 (installer test)

2004-03-11 Kimmo
 PATCH: [ 913792 ] Cache color options for MergeView
  Src: MergeDoc.cpp MergeEditView.cpp MergeEditView.h
 BUG: [ 872882 ] Some selected menu items looks to small
  Adds missing handler functions BCMenu needs
  Also added code to implement document menus (commented out for now)
  Src: MainFrm.cpp MainFrm.h Merge.rc
 PATCH: [ 913743 ] Icons for menuitems (RFE 873697)
  Submitted by Tim Gerundt
  Src: MainFrm.cpp Merge.rc resource.h
  Src/res new files: cascade.bmp cut.bmp cut.bmp horizontally.bmp
   paste.bmp search.bmp vertically.bmp
  Languages: *.rc resource.h
   res/bmp files

2004-03-10 Kimmo
 Fix for OptionsMgr bugs when loading string options from registry
  UNICODE strings were not handled correctly, incorrect buffer lengths
  Src/Common: OptionsMgr.cpp OptionsMgr.h
 PATCH: [ 912754 ] Close open MergeDoc before opening new from DirDoc
  Src: DirDoc.cpp DirDoc.h DirView.cpp
 RFE: [ 874366 ] Add goto line-number
  Show few lines of context above line scrolled to
  Src: MergeEditView.cpp
 PATCH: [ 913073 ] Option to automatically close compare pane
  Src: DirView.cpp DirView.h MainFrm.cpp Merge.rc OptionsDef.h
   PropGeneral.cpp PropGeneral.cpp resource.h
  Languages: *.rc resource.h

2004-03-09 Kimmo
 PATCH: [ 912297 ] Splashscreen and syntax highlight options
  Src: MainFrm.cpp Merge.cpp Merge.h MergeDiffDetailView.cpp
   MergeEditView.cpp OptionsDef.h
 Fix compile of CShellFileOp with Visual Studio 2003
  Fix from original author Michael Dunn
  Common: CShellFileOp.cpp

2004-03-08 Kimmo
 PATCH: [ 911350 ] Restore default compare options
  Src: MainFrm.cpp Merge.rc PropCompare.cpp PropCompare.h resource.h
  Languages: *.rc resource.h
 PATCH: [ 892397 ] Distinguish prediffer from unpacker
  Submitted by Laoran
  Src: DiffWrapper.cpp DirScan.cpp FileTransform.cpp FileTransform.h
   MainFrm.cpp MergeDoc.cpp SelectUnpackerDlg.cpp
 BUG: [ 909779 ] Uninitialised variable in CGhostTextBuffer::DeleteText()
  Fix submitted by Laoran
  Src: GhostTextBuffer.cpp
 BUG: [ 909796 ] Uninitialised variable on OnSelchangeUnpackerName()
  Fix submitted by Laoran
  Src: SelectUnpackerDlg.cpp
 BUG: [ 909090 ] MainFrm::m_CheckOutMulti not initialized
  Also m_bVCProjSync was unitilialised.
  Src: MainFrm.cpp

2004-03-07 Kimmo
 PATCH: [ 911114 ] DiffOptions to new system
  Src: ConfigLog.cpp ConfigLog.h DiffWrapper.cpp DiffWrapper.h DirDoc.cpp
   DirDoc.h MainFrm.cpp MainFrm.h MergeDoc.cpp MergeDoc.h OptionsDef.h
 PATCH: [ 906872 ] Change ShellExtension to open directories non-recursive
  ShellExtension: ShellExtension.rc WinMergeShell.cpp WinMergeShell.h
 RFE: [ 874366 ] Add goto line-number
  Improvement: Show file's current line in Goto-dialog as selected
  Src: MergeEditView.cpp
 Add contributors.txt
  Docs: contributors.txt

2004-03-06 WinMerge experimental release 2.1.5.13 (cvs)

2004-03-05 Kimmo
 PATCH: [ 909980 ] Fix buffer types and descriptions
  Src: MergeDoc.cpp MergeDoc.h
 Two unrelated lines got removed by checkin of #909980
  Src: MergeDoc.cpp

2004-03-04 Kimmo
 Fix invalid return in paths_IsPathAbsolute()
  paths.cpp
 PATCH: [ 907898 ] Detect filechange by another app before saving
  Src: DiffContext.cpp DiffContext.h Merge.dsp Merge.rc MergeDoc.cpp
   MergeDoc.h resource.h
  Src new files: DiffFileInfo.cpp DiffFileInfo.h
  Languages: *.rc resource.h

2004-03-03 Perry
 fix BUG: [ 902430 ] copy&paste comment bug
  Src: DirView.cpp

2004-03-03 Kimmo
 PATCH: [ 908606 ] Restore default colors
  Add "Defaults" button to Color options page
  Src/Common: OptionsMgr.cpp OptionsMgr.cpp
  Src: Merge.rc PropColor.cpp PropColors.h resource.h
  Languages: recource.h *.rc
 PATCH: [ 908211 ] DiffContext.h should not include RegExp.h
  Submitted by Perry
  Src: DiffContext.h DirDoc.h
 BUG: [ 908217 ] MergeDoc has incorrect include
  Submitted by Perry
  Src: MergeDoc.h
  
2004-03-02 Kimmo
 PATCH: [ 907087 ] Allow commandline switches for external editor
  Src/Common: coretools.cpp coretools.h
  Src: MainFrm.cpp
 PATCH: [ 907641 ] Convert color options to new system
  Src: ColorButton.cpp ColorButton.h MainFrm.cpp Merge.cpp Merge.h
   MergeDiffDetailView.cpp MergeEditView.cpp OptionsDef.h
   PropColors.cpp PropColors.h

2004-03-01 Kimmo
 PATCH: [ 906180 ] Use SHBrowseForFolder() to select folder
  Src: Merge.cpp Merge.h
 FIX wrong checkin comments and wrong patch number and description
  in previous checkin.
 PATCH: