--- /dev/null
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<!-- saved from url=(0052)http://winmerge.sourceforge.net/WinMergeChanges.html -->
+<HTML><HEAD><TITLE>WinMerge Change History</TITLE>
+<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
+<META content="Dean Grimm" name=Author>
+<META content="MSHTML 6.00.2600.0" name=GENERATOR></HEAD>
+<BODY>
+<TABLE width=650 border=0>
+ <TBODY>
+ <TR>
+ <TD vAlign=top>
+ <H1>WinMerge Change History</H1>
+ <HR align=left width=640>
+<pre>
+2003-08-04 WinMerge 2.0.0.3 released
+
+2003-08-04 Christian
+ PATHC: [ 782824 ] Add languages to installer
+ InnoSetup: WinMerge.iss Info.txt
+ PATCH: [ 782820 ] Updated Traditional Chinese for 2.0
+ Languages\ChineseTraditional: MergeChineseTraditional.rc
+
+2003-07-30 Laoran
+ PATCH: [ 779470 ] disable unwanted options in PropGeneral
+ WinMerge: PropGeneral.cpp PropGeneral.h
+
+2003-07-29 Perry
+ PATCH: [ 779224 ] Fix sort bug in right date
+ WinMerge: DirView.cpp
+
+2003-07-29 Kimmo
+ PATCH: [ 779172 ] Saving fix for 2.0 and 2.1
+ WinMerge: MergeDoc.cpp
+
+2003-07-27 Kimmo
+ PATCH:[ 778384 ] Sync OnDropFiles() from MainFrame to SuperComboBox
+ common: SuperComboBox.cpp
+ PATCH: [ 778403 ] Fix accel keys in lang files
+ editlib: editres.rc
+ Languages: ChineseSimplified & ChineseTraditional
+
+2003-07-25 Laoran
+ [ 776114 ] french keyboard shortcut
+ Languages: french.rc
+
+2003-07-24 Kimmo
+ PATCH: [ 776525 ] Close doc after failed load
+ WinMerge: MainFrm.cpp
+ PATCH: [ 776106 ] Fix for TEMP dir error
+ Submitted by Laoran
+ WinMerge: MergeDoc.cpp
+
+2003-07-23 Perry
+ PATCH: [ 771666 ] Fix for English descriptions of Chinese
+ common: LanguageSelect.rc
+ WinMerge: Merge.rc
+
+2003-07-22 Perry
+ PATCH: [ 767147 ] Don't clear existing dirdoc until user saves
+ WinMerge: DirDoc.cpp
+
+2003-07-22 Kimmo
+ PATCH: [ 772843 ] Remember custom colors
+ WinMerge: PropColors.h PropColors.cpp
+
+2003-07-21 Perry
+ Added ChineseTraditional, ChineseSimplified, Korean, and Slovak translations to v2.0.
+
+2003-07-18 Kimmo
+ PATCH: [ 766473 ] Update identical files
+ WinMerge: MergeDoc.cpp
+
+2003-07-17 Laoran
+ PATCH: [ 765399 ] Careful view initialization in PrimeListWithFile
+ WinMerge: MergeEditView.cpp
+ editlib: ccrystaltextview.cpp
+
+2003-07-17 Laoran
+ PATCH : [ 772908 ] ResetView must reset m_nTopSubLine
+ editlib: ccrystaltextview.cpp
+
+2003-07-17 Kimmo
+ PATCH: [ 772228 ] Quick bin check for 2.0
+ WinMerge: files.h files.cpp MainFrm.cpp MergeDoc.cpp
+
+2003-07-16 Laoran
+ PATCH: [ 765926 ] Merge empty last line to the last diffrange (change)
+ WinMerge: MergeDoc.cpp
+
+2003-07-14 Kimmo
+ PATCH: [ 769122 ] Keep top screen line within the shorter panel
+ Submitted by Laoran
+ WinMerge: MergeEditView.cpp
+ PATCH: [ 768378 ] use Rescan Timer for Replace All
+ Submitted by Laoran
+ WinMerge: MergeEditView.cpp
+ PATCH: [ 765768 ] Only one Rescan on AllToLeft
+ Submitted by Perry
+ WinMerge: MergeDoc.h MergeDoc.cpp MergeEditView.cpp
+
+2003-07-09 Kimmo
+ PATCH: [ 767204 ] Fix for assert when rescanning with selection
+ Submitted by Gilbert Wellisch
+ editlib: ccrystaltextview.cpp
+
+2003-07-05 Kimmo
+ PATCH: [ 764571 ] Ask about saving when closing with esc
+ WinMerge: MainFrm.cpp MergeDoc.cpp MergeEditView.cpp
+ PATCH: [ 765463 ] Simplify temp path handling a little
+ WinMerge: MergeDoc.h MergeDoc.cpp
+
+2003-07-04 Laoran
+ PATCH: [ 766038 ] stay in the viewing area during OnFirstdiff
+ WinMerge: MergeEditView.cpp
+
+2003-07-02 Perry
+ PATCH: [ 764789 ] Fix Private Build string in rc file
+ WinMerge: Merge.rc
+
+2003-07-01 WinMerge 2.0.0 Release Candidate 2 released
+
+2003-07-01 Christian
+ PATCH: [ 763817 ] Hilight diffs when syntax hilight is off
+ WinMerge: MergeEditView.cpp
+ Submitted by Kimmo
+
+2003-07-01 Kimmo
+ PATCH: [ 762394 ] update german language
+ Submitted by Laoran and Mark Michaelis through
+ BUG [ 760133 ] German: Inconsistent Title for Edit/Options/Syntax-Hilightin
+ Lang/MergeGerman.rc
+ PATCH: [ 763499 ] update french language
+ Submitted by Laoran
+ Lang/MergeFrench.rc
+ PATCH: [ 763265 ] Fix handling of .. and . components
+ Submitted by Perry
+ WinMerge: paths.cpp
+ PATCH: [ 762529 ] Dirframe trying to clear non-existing pane
+ Submitted by jtuc
+ WinMerge: DirFrame.h DirFrame.cpp
+ PATCH: [ 762531 ] Inproper globals in editlib/cs2cs.cpp
+ Submitted by jtuc
+ editlib: cs2cs.cpp
+
+2003-06-30 Kimmo Merging patches from trunk to R2_0 branch
+ PATCH: [ 754001 ] 2.0 doc link points to 1.7 docs
+ Submitted by Christian
+ WinMerge: MainFrm.cpp
+ PATCH: [ 760441 ] Fix recursive d&d compare
+ WinMerge: MainFrm.cpp
+ PATCH: [ 759755 ] Better rescan error reporting
+ WinMerge: MainFrm.cpp MergeDoc.h MergeDoc.cpp
+ PATCH: [ 761951 ] Fix scrolling corruption
+ Submitted by Jochen
+ editlib: ccrystaltextview.cpp
+ PATCH: [ 762268 ] Fix typo in comment (wenn -> when)
+ Submitted by Perry
+ editlib: ccrystaltextview.cpp
+ PATCH: [ 761827 ] Current diff item to select inactive diff
+ WinMerge: MergeDoc.h MergeDoc.cpp MergeEditView.cpp
+ PATCH: [ 762098 ] Code cleanups from Jochen
+ Submitted by jtuc
+ WinMerge: MainFrm.h MainFrm.cpp MergeDoc.cpp MergeEditView.cpp
+ PATCH: [ 760745 ] Fix empty search field detection and better history
+ in FindDlg and EditReplaceDlg
+ Submitted by Laoran
+ editlib : ccrystaleditview.cpp ccrystaltextview.cpp ceditreplacedlg.cpp
+ ceditreplacedlg.h cfindtextdlg.cpp cfindtextdlg.h memcombo.cpp memcombo.h
+ PATCH: [ 762749 ] Forced rescan after options changed
+ WinMerge: MainFrm.cpp - checked in within [ 759755 ]
+ PATCH: [ 762533 ] Stdafx.h has dublicated and unneeded includes
+ Submitted by jtuc
+ WinMerge: StdAfx.h
+ PATCH: [ 758912 ] Combine duplicated code in CMergeEditView::OnEditCopy
+ Submitted by Perry
+ WinMerge: MergeEditView.cpp
+ PATCH: [ 755918 ] Fix typo in CCrystalTextView extension list
+ Added more filename extensions
+ editlib: ccrystaltextview.cpp
+ PATCH: [ 759778 ] Minor cleanup of crystaltextbuffer.cpp
+ Submitted by Perry
+ editlib: ccrystaltextbuffer.cpp
+ PATCH: [ 761874 ] Fix unlocalisable acceskeys
+ WinMerge: Merge.rc
+ editlib: editres.rc
+ Updated language files too
+
+
+-- R2_0 Branch created - above checkins are for that branch only
+
+2003-06-19 Perry
+ PATCH: [ 728153 ] If opening first file fails, don't open second
+ WinMerge: MainFrm.cpp
+
+2003-06-17 Kimmo
+ PATCH: [ 755918 ] Fix typo in CCrystalTextView extension list
+ editlib: ccrystaltextview.cpp
+
+2003-06-16 Christian
+ PATCH [ 754015 ] WinMerge installer imrovements
+ InnoSetup: Info.txt WinMerge.iss WinMergeIcon.bmp WinMergeLarge.bmp
+
+2003-06-12 Kimmo
+ PATCH: [ 753284 ] Fix cursor slowdown after rescan
+ editlib: ccrystaltextview.cpp
+
+2003-06-08 Kimmo
+ PATCH: [ 750160 ] Char width fix
+ editlib: ccrystaltextview.cpp
+
+2003-06-07 Kimmo
+ PATCH: [ 750302 ] Allow *.flt filter files
+ WinMerge: Merge.cpp
+
+2003-06-06 Kimmo
+ Updated filter file from patch [ 742041 ] Improvements to file/directory filters
+ Filters: Merge_VC_loose.flt
+ BUG: [ 749007 ] "Highlighting" is misspelled as "Hilighting"
+ WinMerge: Merge.rc
+
+2003-06-05 WinMerge 2.0.0 Release Candidate 1 released
+
+2003-06-05 Christian
+ PATCH: [ 749566 ] Updated resource files
+ Languages: all resource.h files and all Merge*.rc files
+
+2003-06-04 Christian
+ Updated Czech and Danish resources
+ Languages: Czech\resource.h Czech\MergeCzech.rc Danish\resource.h Danish\MergeDanish.rc
+
+2003-06-02 Kimmo
+ PATCH: [ 747090 ] Fix scroll handling
+ editlib: ccrystaltextview.cpp
+
+2003-06-01 Kimmo
+ PATCH: [ 746319 ] Adjust horiz scrolling width
+ editlib: ccrystaltextview.cpp
+
+2003-05-31 Kimmo
+ PATCH: [ 745654 ] Draw long lines
+ WinMerge: MergeEditView.cpp
+ editlib: ccrystaltextview.cpp
+ PATCH: [ 742041 ] Improvements to file/directory filters
+ WinMerge: FileFilterMgr.h FileFilterMgr.cpp Merge.cpp
+ PATCH: [ 738557 ] Allow "Open Left" for directories
+ WinMerge: DirActions.cpp DirView.h DirView.cpp
+
+2003-05-29 Christian
+ PATCH: Applied [ 745223 ] Fix pasting different EOL types
+ edilib: ccrystaltextbuffer.cpp
+ BUG: [ 744990 ] Pasting to the right
+
+2003-05-29 Kimmo
+ Made new folder \Filters for filter files. Added Perry's original filter files
+ working with beta 1.9.2.2
+
+2003-05-28 Kimmo
+ PATCH: [ 744872 ] Use CopyFile()
+ WinMerge: files.h files.cpp MergeDoc.cpp
+
+2003-05-26 Kimmo
+ PATCH: [ 743284 ] String fixes
+ WinMerge: DirDoc.cpp DirView.cpp MainFrm.cpp MergeDoc.h paths.cpp
+ editlib: ccrystaleditview.cpp ccrystaltextview.cpp registry.cpp
+
+2003-05-25 Kimmo
+ PATCH: [ 742735 ] Fix CCrystalTextBuffer::InsertLine()
+ edilib: ccrystaltextbuffer.cpp
+
+2003-05-23 Christian
+ Made new folder \InnoSetup\ for files related to making WinMerge installer using InnoSetup
+
+2003-05-22 Perry
+ PATCH: [ 741265 ] Fix for bug#741263: 1.9.2.2 crash on refresh
+ WinMerge: Diff.cpp DiffContext.cpp DiffContext.h DirDoc.cpp MainFrm.cpp
+
+2003-05-19 WinMerge beta 1.9.2.2 released
+
+2003-05-18 Perry
+ PATCH: [ 739529 ] project file & directory filters
+ WinMerge: Diff.cpp DiffContext.cpp DiffContext.h FileFilterMgr.cpp
+ FileFilterMgr.h MainFrm.cpp MainFrm.h Merge.cpp Merge.dsp Merge.h
+ Merge.rc PropFilter.cpp PropFilter.h resource.h
+
+2003-05-16 Kimmo
+ PATCH: [ 737709 ] Remove unneeded UpdateAllViews()
+ WinMerge: MergeDoc.cpp
+ PATCH: [ 738467 ] Enable/disable save items
+ WinMerge: MergeEditView.h MergeEditView.cpp
+
+2003-05-14 Kimmo
+ PATCH: [ 737692 ] Scrolling optimisation - significant speedup
+ editlib: ccrystaltextview.cpp
+
+2003-05-13 Kimmo
+ PATCH: [ 736443 ] Prpoper Esc fix
+ WinMerge: DirView.h DirView.cpp Merge.cpp MergeEditView.h MergeEditView.cpp
+
+2003-05-09 Kimmo
+ PATCH: [ 735127 ] German Translation
+ Updated German language file submitted by Jörg Schneider
+ PATCH: [ 734787 ] Disable ESC closing window
+ NOTE: This is to fix BUG [ 734554 ] ESC closes dialog + document
+ WinMerge: Merge.cpp
+ BUG: [ 711961 ] shift-tab in editor moved block then deselects
+ WinMerge: MergeEditView.cpp
+
+2003-05-07 Kimmo
+ PATCH: [ 733383 ] Enable Find- and Replace- dialogs
+ WinMerge: Merge.rc resource.h
+ editlib: ceditreplacedlg.h ceditreplacedlg.cpp cfindtextdlg.h
+ cfindtextdlg.cpp editcmd.h editres.rc
+ Removed: editlib/resource.h
+ Updated other languages
+ PATCH: [ 733926 ] Fix find dialog text selection
+ editlib: ccrystaltextview.cpp
+
+2003-05-06 Kimmo
+ PATCH: [ 732775 ] Add support for MAC files
+ WinMerge: MergeDoc.cpp MergeEditView.h
+
+2003-05-03 Kimmo
+ BUG: [ 731486 ] Crash after save
+ WinMerge: MergeDoc.cpp
+ PATCH: [ 731533 ] Temp path fix
+ WinMerge: MergeDoc.h MergeDoc.cpp
+ editlib: ccrystaltextbuffer.h ccrystaltextbuffer.cpp
+
+2003-05-02 Kimmo
+ BUG: [ 724726 ] Status bar says "Rescanning" the first time
+ WinMerge: Merge.rc
+
+2003-05-01 Kimmo
+ PATCH: [ 730738 ] Update BCMenu (to v3.033)
+ WinMerge: BCMenu.h BCMenu.cpp
+ Updates BCMenu to v3.033, http://www.codeproject.com/menu/bcmenu.asp
+
+2003-04-29 Kimmo
+ PATCH: [ 728542 ] Automatic rescan enable/disable
+ WinMerge: MainFrm.h MainFrm.cpp Merge.rc MergeEditView.h MergeEditView.cpp
+ PropGeneral.h PropGeneral.cpp resource.h
+ Updated other languages too
+
+2003-04-28 Kimmo
+ PATCH: [ 726330 ] Saving before refresh - backout saving - see bug [ 723412 ]
+ WinMerge: MergeDoc.cpp MergeEditView.cpp
+ PATCH: [ 728228 ] Rename properties to options and rearrange
+ Renaming "Properties" to "Options"
+ WinMerge: MainFrm.h MainFrm.cpp Merge.rc resource.h
+ Updated .rc and resource.h for other languages
+ BUG: [ 718133 ] Inconsistent user keyword list for C/C++ syntax hiligth
+ editlib: cplusplus.cpp
+
+2003-04-27 Kimmo
+ BUG: [ 728173 ] Autoscroll first diff breaks syntax hilight
+ WinMerge: MergeDoc.cpp
+
+2003-04-26 Kimmo
+ PATCH: [ 726330 ] Saving before refresh
+ WinMerge: MergeDoc.h MergeDoc.cpp MergeEditView.cpp
+ PATCH: [ 727455 ] Autoscroll first diff for dir compare
+ WinMerge: DirView.h MainFrm.cpp
+
+2003-04-25 Kimmo
+ PATCH: [ 727104 ] Disable margins for unknown filetypes
+ editlib: ccrystaltextview.h ccrystaltextview.cpp
+
+2003-04-23 Kimmo
+ PATCH: [ 721939 ] Wider horiz scroll + more space after last char
+ editlib: ccrystaltextview.cpp
+ PATCH: [ 726390 ] Last diff shown incorrectly sometimes
+ WinMerge: MergeDoc.cpp
+
+2003-04-20 Perry
+ Changed dynamic array to be CArray based
+ editlib: ccrystaltextview.cpp
+ PATCH: [ 724309 ] Add WaitStatusCursors
+ WinMerge: DirDoc.cpp DirView.cpp MainFrm.cpp Merge.dsp MergeDoc.cpp MergeEditView.cpp
+ WaitStatusCursor.cpp WaitStatusCursor.h
+ PATCH: [ 724473 ] Move WaitStatusCursor strings into RC
+ WinMerge: DirDoc.cpp DirView.cpp MainFrm.cpp MergeDoc.cpp MergeEditView.cpp resource.h StdAfx.cpp StdAfx.h
+ PATCH: [ 724479 ] Fix Refresh crash in empty dir view
+ WinMerge: DirDoc.cpp
+ bugfix: Add new files that were part of patch#724309
+ WinMerge: WaitStatusCursor.cpp WaitStatusCursor.h
+ PATCH: [ 724493 ] WaitStatusCursor for MergeDoc rescans
+ WinMerge: MergeDoc.cpp
+
+2003-04-19 Perry
+ [ 724280 ] Could use wait cursors at OpenSelection calls
+ WinMerge: DirView.cpp
+
+2003-04-15 Perry
+ PATCH: [ 722083 ] refresh button (menu item, accelerator)
+ WinMerge: DirView.cpp DirView.h Merge.rc MergeEditView.cpp MergeEditView.h resource.h res/Toolbar.bmp
+ Also updated resource files (resource.h, *.rc, Toolbar.bmp) to all languages
+
+2003-04-14 Kimmo
+ PATCH: [ 720613 ] CDirView leaks imagelist
+ WinMerge: DirView.cpp
+ PATCH: [ 720701 ] Use memory-mapped files when saving files
+ WinMerge: files.h files.cpp MergeDoc.h MergeDoc.cpp
+
+2003-04-14 Perry
+ PATCH: [ 716475 ] Reduce edtlib.h coupling
+ WinMerge: MergeEditView.h StdAfx.h editlib/ccrystaleditview.inl
+
+2003-04-13 Kimmo
+ PATCH: [ 719872 ] Use memory-mapped files when loading files
+ WinMerge: files.h files.cpp Merge.dsp MergeDoc.h MergeDoc.cpp
+
+2003-04-10 Kimmo
+ PATCH: [ 717688 ] CrystalEditor optimisations and memleaks
+ fix tab bug.
+ editlib: ccrystaltextview.cpp
+
+2003-04-09 Kimmo
+ PATCH: [ 717688 ] CrystalEditor optimisations and memleaks
+ editlib: ccrystaltextview.cpp
+
+2003-04-08 Kimmo
+ PATCH: [ 716744 ] Fix CrystalEditor memory leaks
+ editlib: ccrystaltextbuffer.cpp ccrystaltextview.cpp
+
+2003-04-07 Kimmo
+ PATCH: [ 716308 ] Disable italic text
+ editlib: ccrystaltextview.cpp
+ PATCH: [ 715553 ] Add commandline options to not add paths to MRU
+ Usage: -ur to ignore rigth, -ul to ignore left and -ub to ignore both
+ WinMerge: MainFrm.h MainFrm.cpp Merge.cpp
+
+2003-04-06 Kimmo
+ PATCH: [ 715457 ] LoadFromFile() rewrote
+ WinMerge: MergeDoc.h MergeDoc.cpp
+
+2003-04-06 Perry
+ PATCH: [ 716088 ] Fix bin same/diff bug in Diff.cpp & analyze.c
+ WinMerge: analyze.c Diff.cpp
+
+2003-04-04 Christian
+ PATCH: [ 711843 ] Allow backspace at beginning of line
+ WinMerge: MainFrm.cpp
+
+2003-04-03 Kimmo
+ BUG: [ 714570 ] Sensitive to EOL -setting not saved
+ WinMerge: MainFrm.cpp
+
+2003-04-02 Kimmo
+ PATCH: [ 713322 ] Save whole buffer not line by line
+ WinMerge: MergeDoc.cpp
+ PATCH: [ 713416 ] MergeEditView optimisations
+ WinMerge: MergeEditView.cpp
+
+2003-03-31 Kimmo
+ PATCH: [ 711437 ] Don't copy/cut removed lines
+ WinMerge: MergeDoc.h MergeDoc.cpp MergeEditView.h MergeEditView.cpp
+
+2003-03-31 Perry
+ PATCH: [ 712429 ] Fix UpdateItemStatus bug 712093
+ WinMerge: DirActions.cpp DirView.cpp paths.cpp paths.h
+
+2003-03-30 Perry
+ PATCH: [ 712417 ] Fix save of open doc before next merge
+ WinMerge: ChildFrm.cpp ChildFrm.h DirDoc.cpp DirDoc.h DirFrame.cpp DirFrame.h
+ DirView.cpp DirView.h MainFrm.cpp MainFrm.h MergeDoc.cpp MergeDoc.h
+
+2003-03-29 Perry
+ PATCH: [ 710347 ] Fix crash of winmerge c:\ d:\
+ WinMerge: DiffContext.h DirDoc.cpp MainFrm.cpp Merge.cpp OpenDlg.cpp OpenDlg.h paths.cpp paths.h
+ PATCH: [ 687177 ] Handle more errors during copy/creation
+ WinMerge: MainFrm.cpp
+ PATCH: [ 689884 ] Revise doc/view code (allow multiple docs)
+ WinMerge: ChildFrm.cpp DirActions.cpp DirDoc.cpp DirDoc.h DirView.cpp MainFrm.cpp MainFrm.h
+ Merge.cpp MergeDoc.cpp MergeDoc.h MergeEditView.cpp
+ NB: This broke two things in MainFrm--search for TODO: 2003-03-29
+ BUGFIX: [ 711975 ] CMainFrame::GetAllViews crashes
+ WinMerge: MainFrm.cpp
+ BUGFIX: [ 711983 ] ClearMergeDoc causing ASSERT
+ WinMerge: DirDoc.cpp MergeDoc.cpp
+
+2003-03-26 WinMerge beta 1.9.1.4 released
+
+2003-03-25 Perry
+ PATCH: [ 709575 ] Fix sanity check in CChildFrame::UpdateHeaderSizes()
+ WinMerge: ChildFrm.cpp
+ PATCH: [ 708542 ] Make splash & about show language-independent version
+ common: version.cpp version.h
+ WinMerge: Merge.cpp Splash.cpp
+
+2003-03-25 Christian
+ Replace COPYING with corrected version from http://www.gnu.org/licenses/gpl.txt
+
+2003-03-25 Kimmo
+ PATCH: [ 708893 ] Don't ask to save file compare
+ WinMerge: MergeDoc.h MergeDoc.cpp
+ PATCH: [ 703069 ] Fix undo crash
+ editlib: crystaltextbuffer.cpp
+ PATCH: [ 709502 ] Fix missing/existing EOL at end of file
+ WinMerge: MergeDoc.h MergeDoc.cpp
+
+2003-03-23 Perry
+ PATCH: [ 706006 ] Suppress Rescan during Merge
+ Merge.cpp Merge.h MergeDoc.cpp MergeDoc.h MergeEditView.cpp
+
+2003-03-23 Kimmo
+ PATCH: [ 707753 ] Delayed rescan - fix
+ WinMerge: MergeEditView.cpp
+
+2003-03-22 Kimmo
+ PATCH: [ 707753 ] Delayed rescan
+ WinMerge: MergeEditView.h MergeEditView.cpp
+
+2003-03-21 Kimmo
+ PATCH: [ 707152 ] Delay path check in opendialog
+ WinMerge: OpenDlg.h OpenDlg.cpp
+
+2003-03-14 Kimmo
+ PATCH: [ 703234 ] Use stricmp
+ WinMerge: DIFF.C diffmain.c SDIFF.C
+
+2003-03-11 Perry
+ Deleted unused res files: bitmap1.bmp, bmp00001.bmp, ScreenShot.gif, WinMerge.gif
+
+2003-03-11 Christian
+ PATCH: [ 700872 ] Esc to close crashes WinMerge
+ WinMerge: Merge.cpp
+
+2003-03-09 Kimmo
+ PATCH: [ 699839 ] Add same binaries to dir compare status
+ WinMerge: MainFrm.h MainFrm.cpp
+ PATCH: [ 699893 ] Add drag&drop of files/paths to main window
+ Note: Press down Ctrl when dropping dirs for recursive compare
+ WinMerge: MainFrm.h MainFrm.cpp Merge.cpp paths.h paths.cpp
+
+2003-03-07 WinMerge beta 1.9.1.3 released
+
+2003-03-07 Perry
+ PATCH: [ 699580 ] Fix paths.cpp
+ WinMerge: paths.cpp
+
+2003-03-07 Kimmo
+ PATCH: [ 698754 ] Update filetimes after save
+ WinMerge: DiffContext.h DiffContext.cpp DirDoc.h DirDoc.cpp MergeDoc.cpp
+
+2003-03-06 Christian
+ Update Danish language file with new strings in MergeDanish.rc
+ Removed duplicate dialog in French language file in MergeFrench.rc
+ Added Czech to BuildAll.bat
+ PATCH: [ 698346 ] Use full path for directory context menu option
+ WinMerge: PropRegistry.cpp
+
+2003-03-06 Kimmo
+ PATCH: [ 696695 ] DirDoc Redisplay optimisation
+ WinMerge: DirDoc.h DirDoc.cpp
+
+2003-03-05 Perry
+ Added new subdir Languages/Danish/res
+ PATCH: [ 695857 ] Fix directory handling, & UNC paths, & shortnames
+ Fix Danish language files: Update resource.h and update language dialogbox to use IDC_LANGUAGE_LIST.
+
+2003-03-04
+ BUG: [ 684622 ] Escape key closes whole program
+ Nikki Locke's patch slightly modified
+ WinMerge: Merge.cpp
+ PATCH: [ 696588 ] Multimonitor + virtual screens support
+ WinMerge: MainFrm.cpp Merge.dsp multimon.h
+ BUG: [ 697320 ] Saving enabled when comparing directories
+ WinMerge: DirView.h DirView.cpp
+
+2003-02-28 Kimmo
+ BUG: [ 693932 ] Trailing \ on path crashes WinMerge
+ WinMerge: OpenDlg.h OpenDlg.cpp
+
+2003-02-27 Kimmo
+ BUG: [ 693820 ] Typed path failed to compare
+ WinMerge: OpenDlg.cpp
+ BUG: [ 693004 ] Keyboard does not work for accessing menus
+ Add missing WM_MENUCHAR handler from www.codeguru.com
+ WinMerge: MainFrm.h MainFrm.cpp
+
+2003-02-26 Kimmo
+ BUG: [ 683753 ] Rescan is not prompting to save dirty
+ current file
+ WinMerge:
+ MainFrm.cpp
+
+2003-02-26 Christian
+ [ 70970 ] Translate Merge.rc into danish
+ BuildAll.bat and added directory Languages/Danish
+
+2003-02-26 Kimmo
+ [ 692922 ] Don't try to compare file & directory
+ WinMerge:
+ OpenDlg.cpp
+ [ 686699 ] Check & return file saving success
+ Fix2: Do not return save success of "Save As"
+ WinMerge:
+ MergeDoc.cpp
+
+2003-02-24 Kimmo
+ [ 687574 ] Navigate in directory view (fix bug in patch)
+ WinMerge:
+ DirView.cpp
+ [ 686699 ] Check & return file saving success - fix
+ WinMerge:
+ MergeDoc.h Mergedoc.cpp
+
+2003-02-22 Perry
+ [ 650356 ] suggest commenting out several functions
+ [ 684416 ] is_all_whitespace is bad
+ Removed bad unused functions in common/coretools.cpp (& .h)
+ (Did not remove all unused functions, only ones with bugs)
+
+2003-02-21 Perry
+ Sync'ed all language resources to English version.
+ [ 684300 ] Stringified Diffitems
+ + combined & modularized code in DirDoc.cpp
+ WinMerge:
+ DiffContext.cpp DiffContext.h DirDoc.cpp DirView.cpp DirView.h
+
+2003-02-20 Perry
+ [ 689876 ] Patch to fix bug # 689869 (ASSERT on Rescan)
+ WinMerge:
+ MainFrm.cpp & new resource IDS_ERROR_FILE_NOT_FOUND
+ [ 687574 ] Navigate in directory view
+ WinMerge:
+ DirView.cpp DirView.h
+ [ 690176 ] Cmdline param for ESC closing
+ (and updated all obsolete French & German accelerators as well)
+ WinMerge:
+ Merge.cpp Merge.h Merge.rc
+ Languages:
+ Czech\MergeCzech.rc Dutch\MergeDutch.rc French\MergeFrench.rc
+ German\MergeGerman.rc Italian\MergeItalian.rc Spanish\MergeSpanish.rc
+ [ 689896 ] Update to sync Czech resource
+ Czech\MergeCzech.rc
+
+2003-02-18 Christian
+ Removed annoying SourceSafe path from Merge.dsp
+
+2003-02-18 Kimmo
+ [ 684737 ] Fix Language Box to handle dblclick
+ Languages:
+ LanguageSelect.h LanguageSelect.cpp
+ WinMerge:
+ Merge.rc resource.h
+ [ 687039 ] View whitespaces on editor
+ WinMerge:
+ MainFrm.h MainFrm.cpp Merge.rc resource.h
+ WinMerge/editlib:
+ ccrystaltextview.cpp
+
+2003-02-15 Kimmo
+ [ 686699 ] Check & return file saving success
+ Merge.rc MergeDoc.h Mergedoc.cpp resource.h
+
+2003-02-14 Kimmo
+ [ 685491 ] Saving fixes: SaveToFile() rewrite part
+ + Missing NULL check for mf->m_pDirDoc in CMergeDoc
+ MergeDoc.h MergeDoc.cpp
+
+2003-02-13 Perry
+ [ 685816 ] Recommend deleting unlocalized translations
+ [ 684290 ] improved bin test:
+ Diff.cpp readme.txt
+ [ 686090 ] Show/hide binary files
+ WinMerge:
+ DirDoc.cpp MainFrm.cpp MainFrm.h Merge.rc readme.txt
+ resource.h
+ Languages:
+ Spanish/MergeSpanish.rc Spanish/resource.h
+
+2003-02-12 Perry
+ Languages:
+ Dutch/MergeDutch.rc
+ Some updates to align Dutch rc towards English rc.
+ [ 685637 ] CMainFrame::SyncFiles GPF bug
+
+2003-02-12 Christian
+ [ 630286 ] WinMerge crashes/fails in WinCVS
+ [ 683752 ] Add option to be listed on Directory context menu
+
+2003-02-11 Perry
+ Fixing recent SplitFilename & directory concat problems.
+ [ 683924 ] Same binaries for directory compare.
+
+2003-02-10 Perry
+ Kimmo's fix for crash due to NULL doc pointer in MergeDoc::SaveHelper.
+ [ 470013 ] Spanish Orthography and Semantics
+
+2003-02-09 Perry
+ [ 683120 ] splitfilename changed to CStrings
+ Move new SplitFilename from Chris Mumford into coretools, remove old
+ versions, add test chassis, and fix some minor cases.
+
+2003-02-08 Perry
+ DirDoc.*: Changed from strftime to COleDateTime::Format (respects user prefs).
+ First half of [ 679692 ] Update after editing (with code combination).
+ [ 682505 ] API changes for CLog, CDirView and CDirDoc
+ 2nd half of [ 679692 ] Update after editing
+
+2003-02-07 WinMerge beta 1.9.1.1 released
+
+2003-02-07 Christian
+ Added 24 missing languages
+ Fixed duplicated strings in Italian rc.
+
+2003-02-05 Perry
+ Updated Brazilian, Italian, Spanish resources to sync with English/main resources.
+
+2003-01-28 Christian
+ Committed [ 424579 ] Escape to exit
+
+2003-01-27 Christian
+ [ 668654 ] Tabtype selection feature
+ [ 672554 ] Update DirView after individual merge
+ Fixed [ 225571 ] After individual merge, dirView not updated
+ [ 672879 ] Propose clarifying change in ccrystaleditview.cpp
+ [ 672885 ] Fix for ASSERT from CChildFrame::UpdateHeaderSizes
+ [ 673063 ] Modification check before close
+ [ 675526 ] Waitcursors and merging all
+
+2003-01-21 Christian
+ [ 671037 ] Changes for MSVC.NET
+ [ 671810 ] Tempfiles to temp dir
+
+2003-01-20 Christian
+ [ 671034 ] operator precedence bug in SplitterWndEx.cpp
+
+2003-01-15 Christian
+ [ 650384 ] Fix for false equals for binary files
+ [ 651689 ] Add OpenLeft, OpenLeftWith, ... context
+ [ 650293 ] Implement context menus with multiselect
+
+2003-01-14 Christian
+ [ 665993 ] Little optimisation
+
+2002-12-17 WinMerge beta 1.7.2.11 released
+
+2002-11-26 Perry
+ Implemented recursive directory delete
+ Fix bug in EOL handling in crystaltextbuffer, and add optional EOL sensitivity.
+ Added optional EOL insensitivity to gnu diff IO.c.
+ Added status bar progress (file count) indicator during scanning
+ Fixed tooltips of toolbar buttons to list correct hotkeys
+ Split "Show Unique" option into "Show Left Unique" and "Show Right Unique"
+
+2002-12-02 Perry
+ Added left files, left dirs, right files, right dirs to status bar feedback
+
+2002-11-18 WinMerge beta 1.7.2.1 released
+</pre>
+
+ <H3>1.7.1 (10/25/2000)</H3>
+ <UL>
+ <LI>Fixed bug #121116 </LI></UL>
+ <H3>1.6.0.174 (10/25/2000)</H3>
+ <UL>
+ <LI>Finally fixed the LanguageDLL problem, where some machines were
+ unable to load the DLLs. Turns out that specifying /NOENTRY to the
+ linker did the trick. Really all that's needed is new .LANG files,
+ but I added some extra logging to the main app. (Much thanks to <FONT
+ size=3>Cesar de Azevedo Gil for the testing help)</FONT> </LI></UL>
+ <H3>1.6.0.168 (3/11/2000)</H3>
+ <UL>
+ <LI>Changed binary file detection to be more locale-specific
+ <LI>Fixed splitter-centering code </LI></UL>
+ <H3>1.6.0.166 (11/29/99)</H3>
+ <UL>
+ <LI>Fixed crash when comparing 1 text & 1 binary file
+ <LI>Now displays proper notification in above condition
+ <LI>Added mousewheel support
+ <LI>Window sizes are now restored </LI></UL>
+ <H3>1.6.0.163 (11/9/99)</H3>
+ <UL>
+ <LI>Changed method for detecting language of resource DLLs.
+ Hopefully fixes some problems where certain machines can't detect the
+ language (thanks to Gil Andre for much debugging help). </LI></UL>
+ <H3>1.6.0.161 (11/2/99)</H3>
+ <UL>
+ <LI>Rebuilt using VC++ 6.0. Requires <A
+ href="http://winmerge.sourceforge.net/bin/mfc6dll.zip">updated DLLs</A>.
+
+ <LI>Also rebuilt all language DLLs. </LI></UL>
+ <H3>1.5.1.141 (7/23/99)</H3>
+ <UL>
+ <LI>No longer crashes when more that 2 files are specified on command
+ line
+ <LI>Now accepts 3 files on command line for seamless integration with
+ products such as Perforce. First 2 arguments are files to compare,
+ third argument is the filename where the diff file is saved. If
+ the third arg is a directory name, then all changed files are saved to
+ that location. </LI></UL>
+ <H3>1.5.1.135 (6/11/99)</H3>
+ <UL>
+ <LI>No longer crashes on binary files
+ <LI>Changed "Non-text files are different" to "Binary files are
+ different" </LI></UL>
+ <H3>1.5.0.134 (6/8/99)</H3>
+ <UL>
+ <LI>Did work on command line file specification. You can now
+ specify one or two files or directories from the command line. (Thanks
+ to <A href="mailto:Bob@pqsystems.com">Bob Sledge</A>)
+ <UL>
+ <LI>If one is a file & one is a dir, the filename is appended to
+ the dirname & a single file comparison is performed
+ <LI>If only one argument is specified, the Open dialog is displayed.
+ <LI>If one of the arguments specifies a non-existing entity, the
+ Open dialog is displayed. </LI></UL>
+ <LI>You can now drag files from Explorer into the edit fields in the
+ Open dialog (Thanks to <A href="mailto:Bob@pqsystems.com">Bob
+ Sledge</A>)
+ <LI>Now reports that files are identical for single file compares
+ <LI>Fixed bug that caused differences within the first 40 characters to
+ not be reported in the directory listing
+ <LI>Added ability to ignore case & blank lines to preferences
+ </LI></UL>
+ <H3>1.4.0.128 (4/23/99)</H3>
+ <UL>
+ <LI>Extensions field now defaults to *.*
+ <LI>Recursive option works again </LI></UL>
+ <H3>1.3.0.124 (4/16/99)</H3>
+ <UL>
+ <LI>Open dialog now allows you to filter directories by multiple file
+ extensions(ie: *.c;*.cpp;*.h)
+ <LI>Fixed crash in diff code for large files with lots of changes
+ <LI>Cleaned up small memory leak in initial diff code. </LI></UL>
+ <H3>1.2.0.110 (4/5/99)</H3>
+ <UL>
+ <LI>Font can now be changed for difference views
+ <LI>Added "Copy all diffs to other side" item to diff view's context
+ menu
+ <LI>Added popup menu to directory view
+ <LI>Added ability to change UI language via resource DLLs </LI></UL>
+ <H3>1.1.0.90 (3/6/99)</H3>
+ <UL>
+ <LI>Added buttons for copying all diffs to other side (Thanks to <A
+ href="mailto:Simon.Dick@HEXAGON.zeneca.com">Dick Simon</A> for the
+ suggestion)
+ <LI>Difference views now properly preserve embedded tabs (Thanks to <A
+ href="mailto:jvivona@kpi-tech.com">Joe Vivona</A> and <A
+ href="mailto:rogersfn@us.ibm.com">Fred Rogers</A>)
+ <LI>Fixed bug in the Open dialog that caused paths with a \ at the end
+ to not be considered as a directory, and therefore, the recursive
+ checkbox would not be enabled (Thanks to <A
+ href="mailto:mcnair@anet-dfw.com">Dewayne McNair</A>)
+ <LI>Fixed bug in Open dialog that caused \Directory Selection to be
+ returned to the edit fields in some cases (Thanks to <A
+ href="mailto:mcnair@anet-dfw.com">Dewayne McNair</A>) </LI></UL>
+ <H3>1.0.0.65 (1/27/99)</H3>
+ <UL>
+ <LI>Open dialog was initializing both fields the same on the second time
+ around, but has now been fixed (Thanks to <A
+ href="mailto:jvivona@kpi-tech.com">Joe Vivona</A>)
+ <LI>Added preference setting for specifying Tab size </LI></UL>
+ <H3>1.0.0.63 (1/13/99)</H3>
+ <UL>
+ <LI>Fixed problem that was causing crash for some binary files on some
+ machines (Thanks to <A href="mailto:DOlender@SmartHealth.ca">Doug
+ Olender</A>) </LI></UL>
+ <H3>1.0.0.52 (1/11/99)</H3>
+ <UL>
+ <LI>Added command line specification of filenames (Thanks to <A
+ href="mailto:hchen@aspentech.com">Hern Chen</A>)
+ <LI>Added -r command line option for recursion
+ <LI>Fixed problem with loading debug libraries
+ <LI>Added version display on splash screen </LI></UL>
+ <HR>
+
+ <P><!--#geoguide--></P></TD></TR></TBODY></TABLE>
+<P><BR> </P></BODY></HTML>
--- /dev/null
+<html>
+
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
+<meta name="DESCRIPTION" content="WinMerge HomePage: Visual text file comparison and merging (Open Source software).">
+<meta name="KEYWORDS" content="WinMerge, free,download,Beyond Compare, Scooter Software, DLSuperC, DLSubCF, Component Software Diff, Viff, TreeDiff, FileSync, WMatch, Quick Spot, NTDMatch, windiff, WDIFF, FolderMatch, Merge 99, Merge99, PMdiff, PMDiff, PMDIFF, pmdiff, visual, visually, file, folder, directory, synchronization, comparison, graphical, document, text, compare, diff, difference, revision, Araxis, compare folders, compare files, synchronize folders, merge files, merge folders, Y2K, Year 2000, Year 2K, side-by-side, VFC, GFC, gdiff, CSDiff, OS2GFC, vdiff, ediff, fc">
+<title>Welcome to WinMerge on SourceForge!</title>
+</head>
+
+<body>
+
+<table border="0" cellpadding="4">
+ <tr>
+ <td width="200" valign="top" bgcolor="#c0c0c0" bordercolor="#000000">
+ <p align="center"><b><i><FONT face=Arial>WinMerge on</FONT> </i></b><br><a href="http://sourceforge.net/projects/winmerge"><FONT
+ face=Arial><IMG src="http://sourceforge.net/sflogo.php?group_id=13216" border="0" alt="SourceForge Logo"></FONT></a></p>
+ <p align="center"><b><FONT
+ face=Arial>Users</FONT></b></p>
+ <p align="left"><font size="2" ><A href="docs20/index.html"><FONT face=Arial>WinMerge User's
+ Guide</FONT>
+ </a><br>
+ <a href="http://sourceforge.net/mail/?group_id=13216"><FONT face=Arial>Mailing Lists</FONT> </a><br>
+ <a href="http://sourceforge.net/bugs/?group_id=13216"><FONT face=Arial>Submit a Bug Report<br></FONT>
+ </a><A href="WinMergeChanges.html"><FONT
+ face=Arial>Change History</FONT> </a></font></p>
+ <p align="center"><b><FONT
+ face=Arial>Developers</FONT></b></p>
+ <p align="left"><font size="2" ><a href="http://sourceforge.net/projects/winmerge/"><FONT
+ face=Arial>Project Home</FONT>
+ </a><FONT face=Arial> </FONT><a href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/winmerge"><br><FONT face=Arial>Go to
+ CVSWeb</FONT>
+ </a><br>
+ <a href="http://sourceforge.net/cvs/?group_id=13216"><FONT face=Arial>CVS Client Access<br></FONT>
+ </a><A href="#UsingWinCVS"><FONT face=Arial>WinCVS Hints</FONT> </a><br>
+ <a href="http://sourceforge.net/patch/?group_id=13216"><FONT face=Arial>Submit a Patch<br></FONT>
+ </a><A href="#translate"><FONT face=Arial>Translate
+ WinMerge!</FONT> </a><b><br>
+ </b></font></p>
+ <p align="center"><b><FONT
+ face=Arial>Downloads</FONT></b></p>
+ <p align="left"><font size="2" ><a href="http://prdownloads.sourceforge.net/winmerge/WinMergeSetup202.exe"><FONT face=Arial>WinMerge 2.0.2 Installer</FONT>
+ </a><br>
+ <a href="http://prdownloads.sourceforge.net/winmerge/WinMergeDocs2_0.zip"><FONT face=Arial>Documentation</FONT></a></font></p>
+ <p align="left"><font size="2" face=Ariel>
+ <a href="http://prdownloads.sourceforge.net/winmerge/MergeBrazilian20.zip"><FONT face=Arial>Brazilian Portuguese DLL</FONT><br></a>
+ <a href="http://prdownloads.sourceforge.net/winmerge/MergeCatalan20.zip"><FONT face=Arial>Catalan DLL</FONT><br></a>
+ <a href="http://prdownloads.sourceforge.net/winmerge/MergeChineseSimplifiedGB2312_200RC2.zip"><FONT face=Arial>Chinese Simplified GB2313 DLL</FONT><br></a>
+ <a href="http://prdownloads.sourceforge.net/winmerge/MergeChineseTraditionalBIG5_200RC2.zip"><FONT face=Arial>Chinese Traditional BIG5 DLL</FONT><br></a>
+ <a href="http://prdownloads.sourceforge.net/winmerge/MergeCzech_200RC2.zip"><FONT face=Arial>Czech DLL</FONT><br></a>
+ <a href="http://prdownloads.sourceforge.net/winmerge/MergeDanish_200RC2.zip"><FONT face=Arial>Danish DLL</FONT><br></a>
+ <a href="http://prdownloads.sourceforge.net/winmerge/MergeDutch_200RC2.zip"><FONT face=Arial>Dutch DLL</FONT>
+ </a><br>
+ <a href="http://prdownloads.sourceforge.net/winmerge/MergeFrench_200RC2.zip"><FONT face=Arial>French DLL</FONT>
+ </a><br>
+ <a href="http://prdownloads.sourceforge.net/winmerge/MergeGerman_200RC2.zip"><FONT face=Arial>German DLL</FONT>
+ </a><br>
+ <a href="http://prdownloads.sourceforge.net/winmerge/MergeItalian_200RC2.zip"><FONT face=Arial>Italian DLL</FONT>
+ </a><br>
+ <a href="http://prdownloads.sourceforge.net/winmerge/MergeKorean_200RC2.zip"><FONT face=Arial>Korean DLL</FONT><br></a>
+ <a href="http://prdownloads.sourceforge.net/winmerge/MergeNorwegian20.zip"><FONT face=Arial>Norwegian DLL</FONT><br></a>
+ <a href="http://prdownloads.sourceforge.net/winmerge/MergeSlovak_200RC2.zip"><FONT face=Arial>Slovak DLL</FONT><br></a>
+ <a href="http://prdownloads.sourceforge.net/winmerge/MergeSpanish_200RC2.zip"><FONT face=Arial>Spanish DLL</FONT></a><br>
+ <a href="http://prdownloads.sourceforge.net/winmerge/MergeSwedish20.zip"><FONT face=Arial>Swedish DLL</FONT></a><br>
+ </font></p>
+ <p align="left"><FONT face=Arial></FONT> </p></td>
+ <td width=*><h1><IMG height=32 src="images/winmerge.gif" width =32
+ align=textTop nosave> WinMerge</h1>
+ <p>An Open Source visual text file differencing and merging tool for Win32 platforms. It is highly useful for determing what has changed between project versions, and then merging changes between versions. </p>
+ <h2>Features</h2>
+ <ul>
+ <li>Visual differencing of text files
+ <li>Syntax highlighting
+ <li>Diff a single file, or entire directories
+ <li>File filters in directory diff
+ <li>Merge differences
+ <li>Directory recursion
+ <li>Integrated editor (with multi-level undo/redo)
+ <li>Find & Replace
+ <li>Drag & Drop support
+ <li>Option for integration with Windows Explorer
+ <li>Rudimentary Visual SourceSafe and Rational ClearCase integration
+ <li>Handles DOS, UNIX and MAC text file formats
+ <li>Localizable interface via resource DLL
+ <li>HTML-based <A href="docs20/index.html">User's Guide</a></li>
+ </ul>
+
+<IMG src="images/screenshot.png">
+
+<h2>WinMerge 2.0.2 - latest stable version</h2>
+<p>WinMerge 2.0.2 is the latest stable version, and it is recommended for most users</p>
+<p><a href="http://prdownloads.sourceforge.net/winmerge/WinMergeSetup202.exe">Download WinMerge 2.0.2 Installer</a></p>
+
+<h2>WinMerge 2.1 - current development version</h2>
+<p>WinMerge 2.1 is the development version, and is only recommended for users that can tolerate possibly losing their files once in a while, because we do not guarantee it to be stable.</p>
+<p>On the other hand, this version has the latest and greatest features in WinMerge.</P>
+<p><a href="http://sourceforge.net/project/showfiles.php?group_id=13216&release_id=199032">Download WinMerge 2.1</a></p>
+
+<h2>WinMerge 1.7 - older stable version</h2>
+<p><a href="WinMerge17/index.html">WinMerge 1.7</a> is an older and simpler version, from before the integrated editor was introduced.</p>
+<p><a href="http://prdownloads.sourceforge.net/winmerge/WinMergeSetup.exe">Download WinMerge 1.7 Installer</a></p>
+
+
+ <h2>Installation</h2>
+ <p>Just download the installer and double-click it.</p>
+
+ <h2>Using WinMerge</h2>
+ <p>We actually dug up some time and created a simple User's Guide. <A
+ href="docs20/index.html">Check it out</a>.</p>
+
+ <h2>Support</h2>
+ <p>WinMerge is now an Open Source project, that is covered
+ under the <a href="http://www.gnu.org/copyleft/gpl.html">GNU Public License</a>.
+ As such, your main form of support for WinMerge will be through
+ subscription to the <a href="http://lists.sourceforge.net/lists/listinfo/winmerge-support">WinMerge-support mailing list</a>.
+ In addition, SourceForge has bug tracking capabilities, so please report any
+ bugs <a href="http://sourceforge.net/bugs/?group_id=13216">here</a>. Wish list items on the
+ <a href="http://sourceforge.net/tracker/?group_id=13216&atid=363216">RFE list</a> will also be considered, but we make
+ absolutely no promises. </p>
+ <p>Here is the current <A href="WinMergeChanges.html">change history</a>. </p>
+
+ <h2><a name="translate"></a>Localization</h2>
+ <p>If you are interested in translating WinMerge's resources to your own native language,
+ we'd be happy to provide you with the .RC file. All the resources are moved into a
+ DLL, so it should be fairly straightforward to support most languages. <A
+ href="mailto:winmerge-support@lists.sourceforge.net">Let us know</a> if you're interested. We currently have
+WinMerge translated into the languages listed below.
+To change languages, all you have to do is unzip the DLL in the same directory as WinMerge.exe, then
+ select View / Language and choose your language. </p>
+
+<h3>Current translations of WinMerge</h3>
+<ul>
+ <li>Brazilian Portuguese translated by Wender Firmino
+ <li>Catalan translated by Jordi Vilar
+ <li>Simplified Chinese translated by Liaobin
+ <li>Traditional Chinese translated by Koko
+ <li>Czech translated by Jiri Tax
+ <li>Danish translated by Christian List
+ <li>Dutch translated by Ronald Schaap
+ <li>French translated by Gil Andre, continued by Laurent Ganier
+ <li>German translated by Winfried Peter, continued by Joerg Schneider
+ <li>Italian translated by Michele Merega
+ <li>Korean translated by Sukjoon
+ <li>Norwegian translated by Hans Fredrik Nordhaug
+ <li>Slovak translated by majvan
+ <li>Spanish translated by Dean Grimm
+ <li>Swedish translated by Göran Håkansson
+</ul>
+ <h2>Developers Needed!</h2>
+ <p>One of the reasons WinMerge is on SourceForge is so other
+ developers can get involved. If you have some free time, are
+ proficient with DeveloperStudio 6 and MFC, and would like to contribute,
+ then <a href="http://sourceforge.net/tracker/?group_id=13216&atid=113216">check
+ out the list of items to be done</a>. If you see something in there that you think
+ you can handle, <a href="mailto:winmerge-support@lists.sourceforge.net">let us know</a> and we'll assign the item to you. Then
+ grab a copy of the WinMerge source from <a href="http://sourceforge.net/cvs/?group_id=13216">anonymous
+ CVS</a> or you can download a <a href="http://sourceforge.net/project/showfiles.php?group_id=13216">zipped version</a> of the source,
+ write your code, and then upload the changed code <a href="http://sourceforge.net/tracker/?group_id=13216&atid=313216">as a patch</a>.
+ Then we will merge them back into the main codebase. </p>
+ <p>If you do decide to join in, please follow these simple guidelines,
+ which will ultimately make all our lives easier: </p>
+ <ul>
+ <li>Please consider that WinMerge is translated into
+ multiple languages, so it is always better to keep UI changes to a
+ minimum. Any addition of text to the UI means we have to go back
+ to the translators.
+ <li><b>Do not </b>make trivial
+ changes to existing code, such as deleting blanks, consolidating
+ multi-line comments into single line comments, etc. This just adds
+ a bunch of needless differences to the code. Besides, if every
+ developer massaged the code to fit his/her style, it would be a
+ never-ending struggle
+ <li>Please try to match existing coding style as
+ much as possible
+ <li>Please make sure to comment your work so we can
+ all understand what you've done (even though I didn't ;-) )
+ <li>Please don't make changes that don't relate to
+ the task at hand. If you come across other issues while handling a
+ task, please submit them as bugs or patches
+ <li>Please don't make changes that aren't on the task list or bug list;
+ if everyone just threw in everything they wanted, the product would
+ become a hodge-podge</li>
+ </ul>
+ <p>The general plan is to start people with anonymous CVS access and let the regular developers commit
+ their changes to the CVS repository. Those developers that
+ continue to contribute will be considered for read-write CVS access.<br>
+ </p>
+
+ <h2>WinMerge developers</h2>
+ <p>This is a list of some of the current developers on WinMerge</p>
+ <ul>
+ <li>Chris Mumford
+ <li>Christian List
+ <li>Dean Grimm
+ <li>Dennis Limm
+ <li>Kimmo Varis
+ <li>Laurent Ganier
+ <li>Perry Rapp
+ </ul>
+
+ <h2><a name="UsingWinCVS"></a>Using WinCVS</h2>
+ <p>After much trial and error, I finally seem to have hit the sweet spot
+ with WinCVS, and it works pretty well. To get access to the
+ anonymous CVS server, do the following (note that this does not require
+ SSH). </p>
+ <ol>
+ <li>Install <a href="http://www.wincvs.org">WinCVS 1.2</a>
+ <li>Create a directory on your system that will
+ contain the WinMerge and Common repositories (I call it Merge on my
+ system)
+ <li>In WinCVS, select "Change Browse Location" from
+ the View menu and navigate to the directory you just created. Your
+ base folder should now appear in the left pane of the WinCVS main window
+ and should be selected.
+ <li>Select "Checkout module" from the Create menu
+ <li>Enter "WinMerge" (no quotes) in the "Enter
+ module name and path on the server" field. Note that
+ capitalization is important.
+ <li>Select the General tab
+ <li>Enter
+ ":pserver:anonymous@cvs.WinMerge.sourceforge.net:/cvsroot/winmerge" in
+ the "Enter the CVSROOT" field (again, no quotes)
+ <li>Select "passwd file on the CVS server" in the
+ Authentication section
+ <li>Click OK. This should download a copy of
+ the source code into a subdirectory called WinMerge.
+ <li>Repeat steps 4-9, for these modules: "common", "Docs", "Filters",
+ "InnoSetup", "Languages", "MakeResDll", "Plugins" and "ShellExtension".
+ Check out the modules into the same base folder. </li>
+ </ol>
+ <p> </p>
+ <p> </p></td>
+ </tr>
+</table>
+
+</body>
+
+</html>
OSDN Git Service
