From d59d2e7e3cdf05e61b5c9106fc9f2c26a61cab7a Mon Sep 17 00:00:00 2001 From: Kimmo Varis Date: Tue, 13 Jan 2004 21:35:25 +0000 Subject: [PATCH] PATCH: [ 869654 ] [Website] Use Valid HTML - Submitted by Tim Gerundt --- Web/WinMergeChanges.html | 190 +++++++++++++++++++++++++++++++++++++++-------- Web/index.php | 21 +++--- Web/readme.txt | 4 + 3 files changed, 174 insertions(+), 41 deletions(-) create mode 100644 Web/readme.txt diff --git a/Web/WinMergeChanges.html b/Web/WinMergeChanges.html index 8fb2bf480..2b7cc5420 100644 --- a/Web/WinMergeChanges.html +++ b/Web/WinMergeChanges.html @@ -1,17 +1,146 @@ - -WinMerge Change History - - - + + + WinMerge Change History + + + + - - - -

WinMerge Change History

+2003-12-10 WinMerge 2.0.2.0 released
+
+2003-12-10 Christian
+ PATCH: [ 857645 ] Getting ready for the last 2.0 release
+  Languages: BuildAll.bat
+  InnoSetup: WinMerge.iss
+  MakeResDll: StdAfx.h
+
+2003-12-04 Laoran
+ BUG: [ 836868 ] Search and replace field size limited (apply to languages)
+  Languages : *.rc
+
+2003-12-02 Kimmo
+ PATCH: [ 852062 ] XML/HTML file filter
+  Filters: new file XML_html.flt
+
+2003-12-01 Laoran
+ BUG: [ 842812] Some extension filtering happening by default
+  WinMerge: OpenDlg.cpp
+ BUG: [ 836384 ] File extension wildcards does not work.
+  WinMerge: OpenDlg.cpp
+
+2003-11-30 Perry
+ PATCH: [ 811039 ] Identify filters by path to solve problems with reused names
+  common: coretools.cpp coretools.h
+  WinMerge: FileFilterMgr.cpp FileFilterMgr.h MainFrm.cpp Merge.cpp Merge.h
+   PropFilter.cpp PropFilter.h
+ PATCH: [ 835198 ] Command line path arguments handling
+  WinMerge: Merge.cpp paths.cpp
+
+2003-11-30 Kimmo
+ PATCH: [ 824987 ] Change binary-file detection (look only for zeros)
+  Fixes bug that some non-binary files were detected as binaries.
+  WinMerge: files.cpp
+ PATCH: [ 804493 ] Read filter files from users profile directory
+  common: coretools.h coretools.cpp
+  WinMerge: FilterMgr.cpp Merge.cpp
+ BUG: [ 813557 ] Selection not visible after find
+  editlib: cfindtextdlg.cpp
+ BUG: [ 815147 ] Scrollwheel scrolls too far at end of file
+  editlib: ccrystaltextview.cpp
+ BUG: [ 826834 ] Text selection startpoint not updated when navigating diffs
+  WinMerge: MergeEditView.cpp
+
+2003-11-07 Laoran
+ BUG: [ 836868 ] Search and replace field size limited
+  WinMerge : Merge.rc
+
+2003-11-04 Laoran
+ Update LCID for swedish resource
+  Languages\Swedish: MergeSwedish.rc
+
+2003-11-03 Laoran
+ PATCH: [ 833959 ] Swedish translation 2.0
+ Submitted by Göran Håkansson
+  Languages: BuildAll.bat
+  Languages\Swedish: MergeSwedish.rc resource.h
+  Languages\Swedish\res : all files
+
+2003-10-26 Laoran
+ PATCH: [ 829895 ] Fixed German translation
+ Submitted by Tim Gerundt
+  Languages: MergeGerman.rc
+
+2003-10-25 Laoran
+ BUG: [ 819793 ] Assert when saving after a Dirdoc session
+  WinMerge: DirDoc.cpp
+
+2003-10-24 Laoran
+ BUG: [ 828166 ] visual indication for active file (2.0)
+  WinMerge: ChildFrm.cpp ChildFrm.h MergeDoc.cpp MergeDoc.h MergeEditView.cpp
+
+2003-10-19 Perry
+ Added Catalan translation
+  Languages: BuildAll.bat Catalan/*
+
+2003-10-07 Kimmo
+ BUG: [ 792074 ] Directory mnemonics . and .. are not honored properly
+  Fix submitted by Perry
+  WinMerge: paths.cpp
+
+2003-09-19 Laoran
+ PATCH: [ 809182 ] Fix for undoRecord for 2.0
+  WinMerge: MergeDoc.cpp MergeDoc.h MergeEditView.cpp
+  editlib: ccrystaltextbuffer.h
+
+2003-09-13 Laoran
+ BUG: [ 763874 ] uncheck "sensitive to EOL" when ignoring whitespaces
+  WinMerge: PropGeneral.cpp
+ PATCH: [ 794345 ] second part for OnEditUndo/OnEditRedo/AddUndoRecord
+  WinMerge: MergeEditView.cpp
+  editlib: ccrystaleditview.cpp ccrystaleditview.h ccrystaltextbuffer.cpp
+ PATCH: [ 799701 ] rescan only once for drag_drop (2.0)
+  WinMerge: MergeDoc.cpp MergeDoc.h MergeEditView.cpp MergeEditView.h
+  editlib: ccrystaleditview.cpp ccrystaleditview.h ccrystaltextview.h
+
+2003-09-13 WinMerge experimental release 2.0.1.0 (cvs of 2.0 src)
+
+2003-09-13 Perry
+ PATCH: [ 802120 ] Fix for VC.NET
+  WinMerge: DiffContext.cpp DiffContext.h DirDoc.cpp DirDoc.h MergeDoc.cpp
+
+2003-09-12 Kimmo
+ PATCH: [ 802132 ] Resort dir columns after redisplay
+  Submitted by Perry, fixes bug Diretory compare not remembering sort
+   column after refresh.
+  WinMerge: DirDoc.cpp DirView.h DirView.cpp
+ PATCH: [ 794345 ] make visible the changed text when undo/redo
+  WinMerge: MergeEditView.cpp
+
+2003-09-10 Kimmo
+ PATCH: [ 802096 ] Fix diff navigation when first/last diff selected
+  WinMerge: MergeEditView.cpp
+
+2003-08-23 Perry
+ PATCH: [ 791487 ] Norwegian (bokmål) translation
+  Corrections#2 Avbrytt->Avbryt and #3 Opdater->Oppdater
+  Languages\Norwegian: MergeNorwegian.rc
+  Correction#0 Bokmal->Bokmål
+  WinMerge\Merge.rc
+  Correction#1 værktøylinje(n)->verktøylinje(n)
+  Languages\Norwegian: MergeNorwegian.rc
+
+2003-08-20 Christian
+ PATCH: [ 791487 ] Norwegian (bokmål) translation
+  Languages: Norwegian added
+
+2003-08-12 Christian
+ PATCH: [ 786618 ] Brazilian Portuguese translation
+  Languages: BuilAll.bat and resurrected directory Brazilian
+
 2003-08-04 WinMerge 2.0.0.3 released
 
 2003-08-04 Christian
@@ -37,7 +166,7 @@
   common: SuperComboBox.cpp
  PATCH: [ 778403 ] Fix accel keys in lang files
   editlib: editres.rc
-  Languages: ChineseSimplified & ChineseTraditional
+  Languages: ChineseSimplified & ChineseTraditional
 
 2003-07-25 Laoran
  [ 776114 ] french keyboard shortcut
@@ -146,7 +275,7 @@
  PATCH: [ 754001 ] 2.0 doc link points to 1.7 docs
   Submitted by Christian
   WinMerge: MainFrm.cpp
- PATCH: [ 760441 ] Fix recursive d&d compare
+ PATCH: [ 760441 ] Fix recursive d&d compare
   WinMerge: MainFrm.cpp
  PATCH: [ 759755 ] Better rescan error reporting
   WinMerge: MainFrm.cpp MergeDoc.h MergeDoc.cpp
@@ -277,7 +406,7 @@
 2003-05-19 WinMerge beta 1.9.2.2 released
 
 2003-05-18 Perry
- PATCH: [ 739529 ] project file & directory filters
+ 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
@@ -434,7 +563,7 @@
   WinMerge: MergeDoc.h MergeDoc.cpp
 
 2003-04-06 Perry
- PATCH: [ 716088 ] Fix bin same/diff bug in Diff.cpp & analyze.c
+ PATCH: [ 716088 ] Fix bin same/diff bug in Diff.cpp & analyze.c
   WinMerge: analyze.c Diff.cpp
 
 2003-04-04 Christian
@@ -483,7 +612,7 @@
 2003-03-25 Perry
  PATCH: [ 709575 ] Fix sanity check in CChildFrame::UpdateHeaderSizes()
  WinMerge: ChildFrm.cpp
- PATCH: [ 708542 ] Make splash & about show language-independent version
+ PATCH: [ 708542 ] Make splash & about show language-independent version
  common: version.cpp version.h
  WinMerge: Merge.cpp Splash.cpp
 
@@ -528,7 +657,7 @@
 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
+ 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
 
@@ -555,7 +684,7 @@
 
 2003-03-05 Perry
  Added new subdir Languages/Danish/res
-  PATCH: [ 695857 ] Fix directory handling, & UNC paths, & shortnames
+  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
@@ -589,10 +718,10 @@
     BuildAll.bat and added directory Languages/Danish
 
 2003-02-26 Kimmo
- [ 692922 ] Don't try to compare file & directory
+ [ 692922 ] Don't try to compare file & directory
   WinMerge:
    OpenDlg.cpp
- [ 686699 ] Check & return file saving success
+ [ 686699 ] Check & return file saving success
   Fix2: Do not return save success of "Save As"
   WinMerge:
    MergeDoc.cpp
@@ -601,32 +730,32 @@
  [ 687574 ] Navigate in directory view (fix bug in patch)
   WinMerge:
    DirView.cpp
- [ 686699 ] Check & return file saving success - fix
+ [ 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)
+  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
+   + 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
+   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)
+   (and updated all obsolete French & German accelerators as well)
   WinMerge:
    Merge.cpp Merge.h Merge.rc
   Languages:
@@ -651,7 +780,7 @@
    ccrystaltextview.cpp
 
 2003-02-15 Kimmo
-  [ 686699 ] Check & return file saving success
+  [ 686699 ] Check & return file saving success
   Merge.rc MergeDoc.h Mergedoc.cpp resource.h
 
 2003-02-14 Kimmo
@@ -681,7 +810,7 @@
  [ 683752 ] Add option to be listed on Directory context menu
 
 2003-02-11  Perry
- Fixing recent SplitFilename & directory concat problems.
+ Fixing recent SplitFilename & directory concat problems.
  [ 683924 ] Same binaries for directory compare.
 
 2003-02-10  Perry
@@ -865,7 +994,6 @@
         Added -r command line option for recursion 
         
Fixed problem with loading debug libraries 
         
Added version display on splash screen 
-      
-
-

+ + \ No newline at end of file diff --git a/Web/index.php b/Web/index.php index 0ef47fea3..e5a50a776 100644 --- a/Web/index.php +++ b/Web/index.php @@ -1,3 +1,5 @@ + @@ -11,7 +13,7 @@ - -

WinMerge on

Swedish DLL

WinMerge

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.

Features

Merge differences
Directory recursion
Integrated editor (with multi-level undo/redo) -
Find & Replace -
Drag & Drop support +
Find & Replace +
Drag & Drop support
Option for integration with Windows Explorer
Rudimentary Visual SourceSafe and Rational ClearCase integration
Handles DOS, UNIX and MAC text file formats @@ -84,7 +85,7 @@
HTML-based User's Guide

WinMerge 2.0.2 - latest stable version

WinMerge 2.0.2 is the latest stable version, and it is recommended for most users

@@ -93,7 +94,7 @@

WinMerge 2.1 - current development version

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.

On the other hand, this version has the latest and greatest features in WinMerge.

Download WinMerge 2.1

WinMerge 1.7 - older stable version

WinMerge 1.7 is an older and simpler version, from before the integrated editor was introduced.

@@ -114,7 +115,7 @@ subscription to the WinMerge-support mailing list. In addition, SourceForge has bug tracking capabilities, so please report any bugs here. Wish list items on the - RFE list will also be considered, but we make + RFE list will also be considered, but we make absolutely no promises.

Here is the current change history.

@@ -149,12 +150,12 @@ To change languages, all you have to do is unzip the DLL in the same directory a

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 check + then check out the list of items to be done. If you see something in there that you think you can handle, let us know and we'll assign the item to you. Then grab a copy of the WinMerge source from anonymous CVS or you can download a zipped version of the source, - write your code, and then upload the changed code as a patch. + write your code, and then upload the changed code as a patch. Then we will merge them back into the main codebase.

If you do decide to join in, please follow these simple guidelines, which will ultimately make all our lives easier:

diff --git a/Web/readme.txt b/Web/readme.txt new file mode 100644 index 000000000..072d058d6 --- /dev/null +++ b/Web/readme.txt @@ -0,0 +1,4 @@ +2004-01-13 Kimmo + PATCH: [ 869654 ] [Website] Use Valid HTML + Submitted by Tim Gerundt, fixes errors and adds 2.0.2 changelog + Web: index.php WinMergeChanges.html -- 2.11.0