OSDN Git Service
Laurent Ganier [Sat, 4 Oct 2003 17:30:00 +0000 (17:30 +0000)]
Undo last changes related to PATCH: [ 813794 ] Fix "ignore blank lines"
Perry Rapp [Sat, 4 Oct 2003 00:05:56 +0000 (00:05 +0000)]
Restore trivial colors originally included in PATCH: [ 813794 ] Fix "ignore blank lines"
Laurent Ganier [Fri, 3 Oct 2003 17:29:46 +0000 (17:29 +0000)]
two minor changes for PATCH: [ 813794 ] Fix "ignore blank lines"
Perry Rapp [Fri, 3 Oct 2003 15:26:49 +0000 (15:26 +0000)]
Bugfix for PATCH: [ 813794 ] Fix "ignore blank lines"
(Prevent crashes on identical files dereferencing null script).
Laurent Ganier [Fri, 3 Oct 2003 07:39:22 +0000 (07:39 +0000)]
two minor changes for PATCH: [ 813794 ] Fix "ignore blank lines"
Perry Rapp [Fri, 3 Oct 2003 03:40:42 +0000 (03:40 +0000)]
PATCH: [ 813794 ] Fix "ignore blank lines"
Kimmo Varis [Thu, 2 Oct 2003 11:55:16 +0000 (11:55 +0000)]
PATCH: [ 815138 ] Commandline filedescriptors
Perry Rapp [Thu, 2 Oct 2003 01:36:38 +0000 (01:36 +0000)]
Fix incorrect patch number for last checkin.
Perry Rapp [Thu, 2 Oct 2003 01:35:07 +0000 (01:35 +0000)]
PATCH: [ 815516 ] Utf8len_of_string is wrong
Perry Rapp [Thu, 2 Oct 2003 00:48:34 +0000 (00:48 +0000)]
PATCH: [ 815483 ] Fix file stat structure (lost in dirscan patch)
Perry Rapp [Tue, 30 Sep 2003 23:20:52 +0000 (23:20 +0000)]
PATCH: [ 813847 ] Fix Unicode double copy
Perry Rapp [Tue, 30 Sep 2003 22:50:03 +0000 (22:50 +0000)]
PATCH: [ 814829 ] Fix handle bad utf8
Kimmo Varis [Tue, 30 Sep 2003 15:17:14 +0000 (15:17 +0000)]
PATCH: [ 812581 ] Prevent second scan during first scan - submitted by Perry
Kimmo Varis [Tue, 30 Sep 2003 14:25:58 +0000 (14:25 +0000)]
PATCH: [ 814830 ] Prevent rescan of scanning dirdoc - submitted by Perry
Kimmo Varis [Mon, 29 Sep 2003 15:55:47 +0000 (15:55 +0000)]
PATCH: [ 814098 ] More edit-events for delayed rescan
Laurent Ganier [Mon, 29 Sep 2003 15:13:01 +0000 (15:13 +0000)]
BUG In DrawSingleLine, Draw EOL only if there is an EOL in the line
Laurent Ganier [Mon, 29 Sep 2003 15:10:20 +0000 (15:10 +0000)]
BUG [ 814214 ] ASSERT failure with diff at eof
Laurent Ganier [Sat, 27 Sep 2003 14:46:17 +0000 (14:46 +0000)]
delete NDEBUG from ReleaseMinsize preprocessor definitions
Perry Rapp [Sat, 27 Sep 2003 08:14:48 +0000 (08:14 +0000)]
PATCH: [ 809149 ] Handle Unicode files
Perry Rapp [Sat, 27 Sep 2003 07:38:36 +0000 (07:38 +0000)]
PATCH: [ 809149 ] Handle Unicode files
Perry Rapp [Sat, 27 Sep 2003 01:32:38 +0000 (01:32 +0000)]
PATCH: [ 809149 ] Handle Unicode files
Perry Rapp [Fri, 26 Sep 2003 23:22:14 +0000 (23:22 +0000)]
PATCH: [ 811039 ] Identify filters by path to solve problems with reused names
Christian List [Fri, 26 Sep 2003 13:50:13 +0000 (13:50 +0000)]
Beta 2.1.2.0 released
Perry Rapp [Fri, 26 Sep 2003 03:10:53 +0000 (03:10 +0000)]
2003-09-27 WinMerge experimental release 2.1.1.9 (Unicode handling patch)
Perry Rapp [Fri, 26 Sep 2003 02:35:14 +0000 (02:35 +0000)]
Fix GetFromClipboard for Unicode (variation on PATCH: [ 812853 ])
Perry Rapp [Fri, 26 Sep 2003 02:23:15 +0000 (02:23 +0000)]
PATCH: [ 812851 ] Another Unicode fix for PutToClipboard
Perry Rapp [Fri, 26 Sep 2003 00:59:26 +0000 (00:59 +0000)]
PATCH: [ 812820 ] Fix regexp for Unicode
Laurent Ganier [Thu, 25 Sep 2003 22:14:40 +0000 (22:14 +0000)]
[ 811371 ] Replace lines when pasting text to ghost lines
Perry Rapp [Thu, 25 Sep 2003 16:47:45 +0000 (16:47 +0000)]
fix BUG: [ 812547 ] copy to clipboard crash in WinMergeU.exe
Kimmo Varis [Thu, 25 Sep 2003 11:30:23 +0000 (11:30 +0000)]
PATCH: [ 811307 ] Open dirview column dialog from menu
Perry Rapp [Wed, 24 Sep 2003 23:15:45 +0000 (23:15 +0000)]
fix BUG: [ 811747 ] VersionInfo clipping in Unicode ?
Perry Rapp [Wed, 24 Sep 2003 22:48:13 +0000 (22:48 +0000)]
fix BUG: [ 811750 ] typo in DirScan.cpp
Kimmo Varis [Wed, 24 Sep 2003 19:48:51 +0000 (19:48 +0000)]
Patch Generate improvements and fixes
Kimmo Varis [Wed, 24 Sep 2003 13:20:02 +0000 (13:20 +0000)]
[ 811748 ] Brazilian RC compile failure
Kimmo Varis [Tue, 23 Sep 2003 18:29:24 +0000 (18:29 +0000)]
Don't show [0 files selected] in Patch Generate -dialog
Perry Rapp [Tue, 23 Sep 2003 07:11:19 +0000 (07:11 +0000)]
PATCH: [ 810998 ] Unicode fix for ghosttextbuffer
Kimmo Varis [Mon, 22 Sep 2003 13:24:12 +0000 (13:24 +0000)]
PATCH: [ 810066 ] Add Save Left (as...) and Save Right (as...)
Kimmo Varis [Mon, 22 Sep 2003 12:28:47 +0000 (12:28 +0000)]
PATCH: [ 809902 ] Show if file is changed
Kimmo Varis [Sun, 21 Sep 2003 14:23:09 +0000 (14:23 +0000)]
Remove unused function GetPathOnly() from DirDoc.cpp
Kimmo Varis [Sun, 21 Sep 2003 13:47:21 +0000 (13:47 +0000)]
Optimise CFilePathEdit to not change text when same text given again - by Laoran
Kimmo Varis [Sun, 21 Sep 2003 13:38:08 +0000 (13:38 +0000)]
BUG: [ 807766 ] File filter rules not applied to unique items (2.1)
Perry Rapp [Sat, 20 Sep 2003 19:16:15 +0000 (19:16 +0000)]
Experimental release 2.1.1.7
Kimmo Varis [Sat, 20 Sep 2003 16:02:21 +0000 (16:02 +0000)]
Make directory compare Window to remember maximized state
Laurent Ganier [Sat, 20 Sep 2003 13:09:20 +0000 (13:09 +0000)]
Actualizing the GnuC filter *.o -> \.o
Laurent Ganier [Fri, 19 Sep 2003 13:47:41 +0000 (13:47 +0000)]
PATCH: [ 809253 ] New release minsize mode
Laurent Ganier [Fri, 19 Sep 2003 13:41:34 +0000 (13:41 +0000)]
Modifications in patch-dialog to compile in Unicode
Kimmo Varis [Fri, 19 Sep 2003 11:49:23 +0000 (11:49 +0000)]
Select compared files when opening Generate patch-dialog
Kimmo Varis [Thu, 18 Sep 2003 19:00:51 +0000 (19:00 +0000)]
BUG: [ 800256 ] Hilight line diff does not scroll to difference
Kimmo Varis [Thu, 18 Sep 2003 14:29:13 +0000 (14:29 +0000)]
PATCH: [ 803904 ] Create patches - forgot to mention new files in readme.txt
Kimmo Varis [Thu, 18 Sep 2003 13:36:28 +0000 (13:36 +0000)]
PATCH: [ 803904 ] Create patches
Laurent Ganier [Tue, 16 Sep 2003 22:11:48 +0000 (22:11 +0000)]
WinMerge experimental release 2.1.1.6 (Preprocessing patch)
Perry Rapp [Tue, 16 Sep 2003 21:31:33 +0000 (21:31 +0000)]
fix BUG: [ 807420 ] assert when saving a modified doc
Laurent Ganier [Tue, 16 Sep 2003 20:57:25 +0000 (20:57 +0000)]
BUG [ 807402 ] ListCopy problem for Unix Files
Kimmo Varis [Tue, 16 Sep 2003 12:22:30 +0000 (12:22 +0000)]
PATCH: [ 806785 ] Add menuitem to show/hide skipped files
Kimmo Varis [Tue, 16 Sep 2003 11:39:12 +0000 (11:39 +0000)]
PATCH: [ 781013 ] 256 Color icon - applying to languages
Kimmo Varis [Tue, 16 Sep 2003 11:38:40 +0000 (11:38 +0000)]
PATCH: [ 781013 ] 256 Color icon
Kimmo Varis [Mon, 15 Sep 2003 18:29:36 +0000 (18:29 +0000)]
PATCH: [ 804493 ] Read filter files from users profile directory
Kimmo Varis [Mon, 15 Sep 2003 18:00:53 +0000 (18:00 +0000)]
Don't color skipped items filenames in directory compare
Kimmo Varis [Mon, 15 Sep 2003 17:43:34 +0000 (17:43 +0000)]
BUG [ 806552 ] DirView icons missing? - Adding icons for skipped files and folders
Perry Rapp [Mon, 15 Sep 2003 01:06:37 +0000 (01:06 +0000)]
PATCH: [ 805888 ] Unicode compile of WinMerge
Perry Rapp [Mon, 15 Sep 2003 00:37:48 +0000 (00:37 +0000)]
PATCH: [ 805427 ] Delete unused CStdioFile variable in PrimeTextBuffers
Perry Rapp [Mon, 15 Sep 2003 00:36:30 +0000 (00:36 +0000)]
PATCH: [ 805875 ] Switch to diffcode flags (Kimmo's improvement, and improved documentation)
Perry Rapp [Mon, 15 Sep 2003 00:32:09 +0000 (00:32 +0000)]
PATCH: [ 805875 ] Switch to diffcode flags
Perry Rapp [Sun, 14 Sep 2003 01:05:47 +0000 (01:05 +0000)]
PATCH: [ 802120 ] Fix for VC.NET
Perry Rapp [Sun, 14 Sep 2003 00:02:22 +0000 (00:02 +0000)]
Widen label IDC_PRIVATEBUILD on about box.
Perry Rapp [Sat, 13 Sep 2003 23:53:07 +0000 (23:53 +0000)]
2003-09-13 WinMerge experimental release 2.1.1.5 (patch demos)
Perry Rapp [Sat, 13 Sep 2003 21:35:39 +0000 (21:35 +0000)]
2003-09-13 WinMerge experimental release 2.1.1.4 (cvs)
Laurent Ganier [Sat, 13 Sep 2003 19:24:17 +0000 (19:24 +0000)]
effects of patch [ 797821 ]
Laurent Ganier [Sat, 13 Sep 2003 10:39:12 +0000 (10:39 +0000)]
effects of patch [ 797821 ]
Perry Rapp [Sat, 13 Sep 2003 02:10:55 +0000 (02:10 +0000)]
Add 2.0 release note.
Laurent Ganier [Thu, 11 Sep 2003 15:46:15 +0000 (15:46 +0000)]
[ 804408 ] Fixes to help compile release version
Laurent Ganier [Thu, 11 Sep 2003 15:34:31 +0000 (15:34 +0000)]
[ 797821 ] GUI for the file EOL option
Kimmo Varis [Wed, 10 Sep 2003 12:54:36 +0000 (12:54 +0000)]
PATCH: [ 802762 ] Optimise printc() in diffutils
Laurent Ganier [Tue, 9 Sep 2003 21:16:49 +0000 (21:16 +0000)]
FIX ASSERT in GetAllViews during a merge session
Laurent Ganier [Mon, 8 Sep 2003 21:49:05 +0000 (21:49 +0000)]
[ 799633 ] context menu with scriptlet, from Jochen Tucht
Laurent Ganier [Mon, 8 Sep 2003 21:33:11 +0000 (21:33 +0000)]
[ 802373 ] undo/redo/onEditOperation when RO (2.1)
Laurent Ganier [Mon, 8 Sep 2003 21:26:26 +0000 (21:26 +0000)]
[ 802359 ] display in diff pane when no diff (2.1)
Kimmo Varis [Mon, 8 Sep 2003 11:25:57 +0000 (11:25 +0000)]
PATCH: [ 802096 ] Fix diff navigation when first/last diff selected
Laurent Ganier [Mon, 8 Sep 2003 08:16:39 +0000 (08:16 +0000)]
[ 802066 ] diff pane when OnDisplayDiff(-1) (2.1)
Perry Rapp [Sun, 7 Sep 2003 21:20:10 +0000 (21:20 +0000)]
Fix bug [ 798404 ] Reordering dirview columns does not preserve sorting column
Perry Rapp [Sun, 7 Sep 2003 21:14:12 +0000 (21:14 +0000)]
PATCH: [ 802132 ] Resort dir columns after redisplay
Laurent Ganier [Sun, 7 Sep 2003 20:18:06 +0000 (20:18 +0000)]
[ 799464 ] preserve positions during Rescan (2.1)
Kimmo Varis [Sun, 7 Sep 2003 18:30:30 +0000 (18:30 +0000)]
BUG: [ 802063 ] files_analyzeFile bug for UNIX file (2.1)
Perry Rapp [Sun, 7 Sep 2003 18:23:21 +0000 (18:23 +0000)]
Add experimental release to readme.
Kimmo Varis [Sun, 7 Sep 2003 14:15:53 +0000 (14:15 +0000)]
Tweak more yellow diff color
Kimmo Varis [Sun, 7 Sep 2003 13:52:21 +0000 (13:52 +0000)]
Change default diff colors to more eye friendly ones (not so bright ones)
Kimmo Varis [Sun, 7 Sep 2003 11:32:50 +0000 (11:32 +0000)]
Use constant values for whitespace compare setting
Kimmo Varis [Sun, 7 Sep 2003 11:02:59 +0000 (11:02 +0000)]
PATCH: [ 800420 ] Fix recursive compare and cleanup recursive usage
Perry Rapp [Sat, 6 Sep 2003 20:36:25 +0000 (20:36 +0000)]
PATCH: [ 795082 ] Display Private Build version in about box
Kimmo Varis [Sat, 6 Sep 2003 17:17:37 +0000 (17:17 +0000)]
PATCH: [ 793900 ] Editable file filters - submitted by Perry
Perry Rapp [Sat, 6 Sep 2003 14:50:04 +0000 (14:50 +0000)]
PATCH: [ 800175 ] skip custom draw if comctl32.dll < 4.71
Laurent Ganier [Mon, 1 Sep 2003 22:28:56 +0000 (22:28 +0000)]
[ 797957 ] correct line number for last real line (in statusbar)
Laurent Ganier [Mon, 1 Sep 2003 22:17:38 +0000 (22:17 +0000)]
[ 798272 ] save settings for the dockable diff bar
Kimmo Varis [Mon, 1 Sep 2003 18:32:29 +0000 (18:32 +0000)]
Improve 256-color icon
Laurent Ganier [Sun, 31 Aug 2003 20:44:28 +0000 (20:44 +0000)]
correction for the patch [797741] in CMergeDoc::CDiffTextBuffer::LoadFromFile
Kimmo Varis [Sun, 31 Aug 2003 17:38:42 +0000 (17:38 +0000)]
Fix ASSERT when opening files for merging - from Laoran
Kimmo Varis [Sun, 31 Aug 2003 17:31:20 +0000 (17:31 +0000)]
PATCH: [ 784302 ] Implement Read-only for files and dirs
Kimmo Varis [Sun, 31 Aug 2003 11:26:05 +0000 (11:26 +0000)]
PATCH: [ 797741 ] Faster file loading
Kimmo Varis [Sat, 30 Aug 2003 17:08:24 +0000 (17:08 +0000)]
PATCH: [ 797797 ] OnOptions must exchange diffOptions with the registry
Laurent Ganier [Sat, 30 Aug 2003 14:50:34 +0000 (14:50 +0000)]
[ 784109 ] layout with two new horizontal panels