OSDN Git Service
Perry Rapp [Wed, 22 Oct 2003 23:22:45 +0000 (23:22 +0000)]
Add readme.txt to MakeResDll.
Perry Rapp [Wed, 22 Oct 2003 23:00:11 +0000 (23:00 +0000)]
Fix MakeResDll for MSVC.NET & MSVC.NET 2003.
Perry Rapp [Wed, 22 Oct 2003 22:40:42 +0000 (22:40 +0000)]
Ran "cvs admin -kb *.bmp *.ico" to fix incorrectly typed Language resources
Perry Rapp [Wed, 22 Oct 2003 22:24:00 +0000 (22:24 +0000)]
Fix compile for MakeResDll
Perry Rapp [Wed, 22 Oct 2003 22:20:21 +0000 (22:20 +0000)]
2003-10-22 WinMerge experimental release 2.1.3.4 (cvs)
Kimmo Varis [Wed, 22 Oct 2003 12:45:56 +0000 (12:45 +0000)]
BUG: [ 826969 ] Wrong Open-dialog icon
Laurent Ganier [Wed, 22 Oct 2003 08:29:59 +0000 (08:29 +0000)]
BUG: [ 827064 ] Move "Window" menu after "Plugins" menu
Laurent Ganier [Wed, 22 Oct 2003 08:21:04 +0000 (08:21 +0000)]
BUG: [ 827064 ] Move "Window" menu after "Plugins" menu
Perry Rapp [Tue, 21 Oct 2003 22:48:45 +0000 (22:48 +0000)]
Make icons and bitmaps in WinMerge\\res directory cvs file type binary (cvs admin -kb)
Laurent Ganier [Tue, 21 Oct 2003 21:14:31 +0000 (21:14 +0000)]
Add a backslash in front of relative path used to test for filter (as in 2.0)
Laurent Ganier [Tue, 21 Oct 2003 20:39:13 +0000 (20:39 +0000)]
PATCH: [ 826048 ] headerbar improvements
Kimmo Varis [Tue, 21 Oct 2003 12:28:06 +0000 (12:28 +0000)]
PATCH: [ 824987 ] Change binary-file detection (look only for zeros)
Kimmo Varis [Tue, 21 Oct 2003 12:07:31 +0000 (12:07 +0000)]
PATCH: [ 826149 ] Improved "Merge.ico" and "MergeDoc.ico" - from Tim Gerundt
Laurent Ganier [Mon, 20 Oct 2003 21:55:30 +0000 (21:55 +0000)]
Changing unidiff.cpp for DiffThread.cpp as doxygen example
Kimmo Varis [Mon, 20 Oct 2003 18:08:04 +0000 (18:08 +0000)]
PATCH: [ 809320 ] Open files with external editor
Kimmo Varis [Mon, 20 Oct 2003 14:56:39 +0000 (14:56 +0000)]
Fix Patch Generate dialog's comboboxes to really change files.
Kimmo Varis [Mon, 20 Oct 2003 12:31:47 +0000 (12:31 +0000)]
BUG: [ 826645 ] Scrolling to diff does not move cursor to diff
Laurent Ganier [Mon, 20 Oct 2003 07:49:05 +0000 (07:49 +0000)]
'Comparison Summary' not updated after saving (lost in plugin patch)
Laurent Ganier [Mon, 20 Oct 2003 06:44:21 +0000 (06:44 +0000)]
Format for (eol type) must set the asterisk (sign for modified file)
Perry Rapp [Mon, 20 Oct 2003 01:50:49 +0000 (01:50 +0000)]
2003-10-20 WinMerge experimental release 2.1.3.3 (patch demo)
Laurent Ganier [Sun, 19 Oct 2003 23:12:19 +0000 (23:12 +0000)]
BUG: [ 826233 ] plugins or unicode bug
Perry Rapp [Sun, 19 Oct 2003 22:54:39 +0000 (22:54 +0000)]
Add writeup for MakePatchDirs to readme-developers info. Add section on minor patches and bugfixes. Also make minor grammar fixes. Also update language count (to 14).
Laurent Ganier [Sun, 19 Oct 2003 22:34:20 +0000 (22:34 +0000)]
Rearranging strings in .rc (all languages) by growing identifier values
Laurent Ganier [Sun, 19 Oct 2003 16:01:52 +0000 (16:01 +0000)]
Rearranging strings in English .rc
Perry Rapp [Sun, 19 Oct 2003 05:59:49 +0000 (05:59 +0000)]
PATCH: [ 822451 ] unicoder.cpp update
Perry Rapp [Sun, 19 Oct 2003 04:21:18 +0000 (04:21 +0000)]
Reapply PATCH: [ 818865 ] Exponentially grow text line array
Perry Rapp [Sun, 19 Oct 2003 03:02:57 +0000 (03:02 +0000)]
PATCH: [ 818427 ] Fix hashing for mac lines and "ignore EOLs"
Perry Rapp [Sun, 19 Oct 2003 00:45:00 +0000 (00:45 +0000)]
{Catalan} PATCH: [ 819188 ] Show column number in statusbar
Perry Rapp [Sun, 19 Oct 2003 00:30:44 +0000 (00:30 +0000)]
Update Catalan.rc for plugins (without stringtable rearrangement)
Perry Rapp [Sun, 19 Oct 2003 00:18:48 +0000 (00:18 +0000)]
Added Catalan translation (pre-plugin version)
Laurent Ganier [Fri, 17 Oct 2003 22:25:26 +0000 (22:25 +0000)]
Add a backslash in front of relative path used to test for filter (as in 2.0)
Christian List [Fri, 17 Oct 2003 20:23:44 +0000 (20:23 +0000)]
[ 825035 ] Updated German translation
Christian List [Fri, 17 Oct 2003 14:56:46 +0000 (14:56 +0000)]
New readme-developers.html added
Laurent Ganier [Fri, 17 Oct 2003 13:52:32 +0000 (13:52 +0000)]
WinMerge experimental release 2.1.3.1 (cvs)
Laurent Ganier [Fri, 17 Oct 2003 13:17:11 +0000 (13:17 +0000)]
fix for unicode conversion in unicode build
Laurent Ganier [Fri, 17 Oct 2003 12:54:29 +0000 (12:54 +0000)]
fix to delete useless temporary files
Laurent Ganier [Fri, 17 Oct 2003 12:02:49 +0000 (12:02 +0000)]
[ 807263 ] Preprocessing patch
Kimmo Varis [Fri, 17 Oct 2003 11:55:33 +0000 (11:55 +0000)]
RFE: [ 784695 ] Smarter scroll to diff
Laurent Ganier [Fri, 17 Oct 2003 10:53:19 +0000 (10:53 +0000)]
[ 807263 ] Preprocessing patch
Laurent Ganier [Fri, 17 Oct 2003 09:56:28 +0000 (09:56 +0000)]
[ 807263 ] Preprocessing patch
Laurent Ganier [Fri, 17 Oct 2003 09:49:15 +0000 (09:49 +0000)]
[ 807263 ] Preprocessing patch
Laurent Ganier [Fri, 17 Oct 2003 07:47:12 +0000 (07:47 +0000)]
[ 823556 ] CF_UNICODETEXT format for OLE in unicode build
Laurent Ganier [Fri, 17 Oct 2003 07:29:12 +0000 (07:29 +0000)]
[ 823074 ] DiffContext not updated
Kimmo Varis [Thu, 16 Oct 2003 15:00:09 +0000 (15:00 +0000)]
Fix bug: Commandline params for diff were missing from generated patch-file in unicode build. (Missing conversion)
Kimmo Varis [Thu, 16 Oct 2003 12:31:15 +0000 (12:31 +0000)]
BUG: [ 813557 ] Selection not visible after find
Kimmo Varis [Thu, 16 Oct 2003 12:06:50 +0000 (12:06 +0000)]
Get first selected file from directory compare to Patch Generate -dialog
Kimmo Varis [Wed, 15 Oct 2003 17:22:54 +0000 (17:22 +0000)]
Fix comment
Kimmo Varis [Wed, 15 Oct 2003 17:12:55 +0000 (17:12 +0000)]
Fix bug: File's timestamps wrong in patch files
Kimmo Varis [Wed, 15 Oct 2003 15:30:41 +0000 (15:30 +0000)]
Use ComboBox with history in Patch Generate -dialog
Kimmo Varis [Wed, 15 Oct 2003 14:43:41 +0000 (14:43 +0000)]
Use SelectFile() from Merge.cpp in Patch Generate dialog also fixes bug Result-file asked with "Open" dialog
Kimmo Varis [Wed, 15 Oct 2003 14:38:03 +0000 (14:38 +0000)]
Removed unneeded unlocalisable string from SelectFile() ("Directory selection")
Kimmo Varis [Wed, 15 Oct 2003 12:38:27 +0000 (12:38 +0000)]
BUG: [ 823099 ] RO status not fully implemented when lossy conversions
Kimmo Varis [Wed, 15 Oct 2003 11:53:25 +0000 (11:53 +0000)]
PATCH: [ 823382 ] Save As should update filename
Laurent Ganier [Tue, 14 Oct 2003 17:51:19 +0000 (17:51 +0000)]
[ 819123 ] Half-wait cursor during rescan (new try)
Laurent Ganier [Tue, 14 Oct 2003 16:34:44 +0000 (16:34 +0000)]
BUG: correcting memory allocation for Unicode build in FilepathEdit.cpp
Laurent Ganier [Tue, 14 Oct 2003 07:17:28 +0000 (07:17 +0000)]
BUG: [ 822844 ] Drag & Drop crashes on Unicode build (correcting memory allocation)
Laurent Ganier [Mon, 13 Oct 2003 20:50:27 +0000 (20:50 +0000)]
PATCH: [ 821821 ] Merge multiple diffs
Kimmo Varis [Mon, 13 Oct 2003 12:53:19 +0000 (12:53 +0000)]
PATCH: [ 797502 ] Bugfix and new options for SourceSafe
Kimmo Varis [Sun, 12 Oct 2003 14:20:41 +0000 (14:20 +0000)]
PATCH: [ 817079 ] New Copy to Left/Right icons
Perry Rapp [Sat, 11 Oct 2003 23:33:51 +0000 (23:33 +0000)]
2003-09-26 WinMerge experimental release 2.1.3.0 (cvs)
Perry Rapp [Sat, 11 Oct 2003 22:36:22 +0000 (22:36 +0000)]
PATCH: [ 817875 ] Resizable open dialog
Perry Rapp [Sat, 11 Oct 2003 21:35:30 +0000 (21:35 +0000)]
PATCH: [ 821532 ] Fix CmpResults After Delete
Laurent Ganier [Sat, 11 Oct 2003 16:38:03 +0000 (16:38 +0000)]
[ 820742 ] use extension filter during Rescan in 2.1
Perry Rapp [Fri, 10 Oct 2003 22:56:58 +0000 (22:56 +0000)]
PATCH: [ 821431 ] Update SideFlag When Copy file
Laurent Ganier [Fri, 10 Oct 2003 10:02:33 +0000 (10:02 +0000)]
cosmetic change because I want to use BeSweet with source
Laurent Ganier [Fri, 10 Oct 2003 10:02:06 +0000 (10:02 +0000)]
cosmetical change because I want to use BeSweet with source
Perry Rapp [Fri, 10 Oct 2003 07:09:51 +0000 (07:09 +0000)]
PATCH: [ 820364 ] Fix handling of non-ASCII 8-bit files
Perry Rapp [Fri, 10 Oct 2003 04:04:07 +0000 (04:04 +0000)]
PATCH: [ 791487 ] Norwegian (bokm�l) translation
(Enlarge label in color dialog to avoid clipping text.)
Laurent Ganier [Thu, 9 Oct 2003 22:24:25 +0000 (22:24 +0000)]
[ 818198 ] Colors for "ignore blank lines" (.rc files)
Laurent Ganier [Thu, 9 Oct 2003 22:23:15 +0000 (22:23 +0000)]
[ 818198 ] Colors for "ignore blank lines"
Perry Rapp [Thu, 9 Oct 2003 19:34:17 +0000 (19:34 +0000)]
PATCH: [ 818865 ] Exponentially grow text line array
Laurent Ganier [Thu, 9 Oct 2003 19:28:45 +0000 (19:28 +0000)]
[ 819219 ] Show only simple EOL char when no mixing EOL modes allowed
Perry Rapp [Thu, 9 Oct 2003 15:01:52 +0000 (15:01 +0000)]
Fix duplicate copy of IDS_LINE_STATUS_INFO (to IDS_LINE_STATUS_INFO_EOL) in most language files. Fix missing id ID_POPUP_COPYFROMOTHERSIDE in German file
Laurent Ganier [Wed, 8 Oct 2003 19:04:17 +0000 (19:04 +0000)]
BUG: [ 819793 ] Assert when saving after a Dirdoc session
Laurent Ganier [Wed, 8 Oct 2003 18:25:50 +0000 (18:25 +0000)]
[ 818198 ] Colors for "ignore blank lines"
Kimmo Varis [Wed, 8 Oct 2003 13:20:37 +0000 (13:20 +0000)]
Fix merge error.
Kimmo Varis [Wed, 8 Oct 2003 12:11:04 +0000 (12:11 +0000)]
PATCH: [ 819188 ] Show column number in statusbar
Perry Rapp [Tue, 7 Oct 2003 22:52:41 +0000 (22:52 +0000)]
PATCH: 819633 Fix bug in my "fix ignore blank lines" patch
Perry Rapp [Tue, 7 Oct 2003 22:40:32 +0000 (22:40 +0000)]
PATCH: [ 806277 ] Patch output fix (803299) alternate approach
Perry Rapp [Tue, 7 Oct 2003 22:24:27 +0000 (22:24 +0000)]
PATCH: [ 817502 ] Fix "ignore blank lines"
Kimmo Varis [Tue, 7 Oct 2003 19:28:27 +0000 (19:28 +0000)]
Properly clear display before new dir compare (don't use Redisplay())
Kimmo Varis [Tue, 7 Oct 2003 18:28:37 +0000 (18:28 +0000)]
Forgot filename from comment.
Kimmo Varis [Tue, 7 Oct 2003 18:22:11 +0000 (18:22 +0000)]
Fix Refresh-crash I introduced when fixing BUG [ 803330 ]
Kimmo Varis [Tue, 7 Oct 2003 16:35:20 +0000 (16:35 +0000)]
RFE: [ 817859 ] Generate patch from modified files
Kimmo Varis [Tue, 7 Oct 2003 14:32:24 +0000 (14:32 +0000)]
BUG: [ 803330 ] DirView updated too many times after compare
Kimmo Varis [Sun, 5 Oct 2003 18:18:01 +0000 (18:18 +0000)]
Show text "Identical" on diffnumber panel when files are identical
Laurent Ganier [Sun, 5 Oct 2003 14:01:11 +0000 (14:01 +0000)]
[ 817766 ] Dir compare speed drop after 2.0
Kimmo Varis [Sun, 5 Oct 2003 10:13:35 +0000 (10:13 +0000)]
[ 817394 ] Implement Copy diff and advance to next
Kimmo Varis [Sun, 5 Oct 2003 08:58:58 +0000 (08:58 +0000)]
PATCH: [ 817269 ] Fix navigation in directory compare
Perry Rapp [Sat, 4 Oct 2003 20:48:28 +0000 (20:48 +0000)]
Update dll copy batch file for 4 new build targets
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)