OSDN Git Service
Jochen Tucht [Tue, 23 Aug 2005 16:04:27 +0000 (16:04 +0000)]
PATCH: [
1264723 ] Merge7z DllBuild 0013
Kimmo Varis [Tue, 23 Aug 2005 15:43:57 +0000 (15:43 +0000)]
PATCH: [
1266476 ] Add ending backslash for directories opened from commandline
Kimmo Varis [Tue, 23 Aug 2005 15:35:49 +0000 (15:35 +0000)]
PATCH: [
1266442 ] Small cleanup for ShellExtension
- also bump version number to 1.5
Kimmo Varis [Tue, 23 Aug 2005 15:13:21 +0000 (15:13 +0000)]
PATCH: [
1266352 ] Installer should inform shell about fileassociations
Jochen Tucht [Mon, 22 Aug 2005 19:14:41 +0000 (19:14 +0000)]
BUG: [
1266402 ] Cannot compile cvs trunk
Jochen Tucht [Mon, 22 Aug 2005 19:07:35 +0000 (19:07 +0000)]
BUG: [
1266402 ] Cannot compile cvs trunk
Kimmo Varis [Mon, 22 Aug 2005 16:53:08 +0000 (16:53 +0000)]
PATCH: [
1265006 ] Japanese translation update
- submitted by Takashi Sawanaka
Kimmo Varis [Mon, 22 Aug 2005 16:38:23 +0000 (16:38 +0000)]
PATCH: [
1248970 ] Icon for Projectfile
- icon from Tim
Jochen Tucht [Mon, 22 Aug 2005 06:02:17 +0000 (06:02 +0000)]
PATCH: [
1264721 ] Change AllowUpwardDirectory() policy
Jochen Tucht [Mon, 22 Aug 2005 05:48:04 +0000 (05:48 +0000)]
Fix bugs from PATCH: [
1247875 ] codepage detection based on CMarkdown class
Kimmo Varis [Sun, 21 Aug 2005 17:22:11 +0000 (17:22 +0000)]
PATCH: [
1264957 ] fix Bug:[
1246957 ] 2.3.4 regular expression replace borked
- submitted by Takashi Sawanaka
Jochen Tucht [Sat, 20 Aug 2005 08:41:15 +0000 (08:41 +0000)]
PATCH: [
1247875 ] codepage detection based on CMarkdown class
Kimmo Varis [Sat, 20 Aug 2005 07:45:55 +0000 (07:45 +0000)]
PATCH: [
1215964 ] Rename 'list.txt' to 'Plugins.txt'
Jochen Tucht [Sat, 20 Aug 2005 06:50:18 +0000 (06:50 +0000)]
PATCH: [
1247875 ] codepage detection based on CMarkdown class
Kimmo Varis [Fri, 19 Aug 2005 14:49:29 +0000 (14:49 +0000)]
BUG: [
1262229 ] Crash with differing line endings and View Line Differences
Kimmo Varis [Thu, 18 Aug 2005 19:52:48 +0000 (19:52 +0000)]
PATCH: [
1262428 ] Fix toolbar problems with XP theming
Kimmo Varis [Thu, 18 Aug 2005 19:22:12 +0000 (19:22 +0000)]
PATCH: [
1261220 ] Add Compare item for dirview menus
Kimmo Varis [Wed, 17 Aug 2005 19:50:27 +0000 (19:50 +0000)]
PATCH: [
1261244 ] Proper update for Merge/Delete-menuitem
Kimmo Varis [Wed, 17 Aug 2005 19:45:02 +0000 (19:45 +0000)]
PATCH: [
1260244 ] Initialization of non-existing struct-members in editor
Tim Gerundt [Wed, 17 Aug 2005 18:02:10 +0000 (18:02 +0000)]
PATCH: [
1215964 ] Rename 'list.txt' to 'Plugins.txt'
Tim Gerundt [Wed, 17 Aug 2005 17:55:43 +0000 (17:55 +0000)]
BUG: [
1261402 ] Filters.xml: Error on line 111
Tim Gerundt [Tue, 16 Aug 2005 21:07:31 +0000 (21:07 +0000)]
PATCH: [
1215964 ] Rename 'list.txt' to 'Plugins.txt'
Kimmo Varis [Tue, 16 Aug 2005 17:50:55 +0000 (17:50 +0000)]
PATCH: [
1260258 ] Show origin side for Copy To.. folder browse dialog
Kimmo Varis [Tue, 16 Aug 2005 13:56:45 +0000 (13:56 +0000)]
PATCH: [
1258270 ] ShellExtension: allow re-selecting first item
Kimmo Varis [Sun, 14 Aug 2005 17:24:33 +0000 (17:24 +0000)]
PATCH: [
1258584 ] Catalan translation update
- submitted by Jordi Vilar
Kimmo Varis [Sun, 14 Aug 2005 17:15:55 +0000 (17:15 +0000)]
PATCH: [
1258063 ] Fix cursor position after pane change
Kimmo Varis [Sun, 14 Aug 2005 17:10:57 +0000 (17:10 +0000)]
PATCH: [
1255864 ] Different icons for Folder and File Comparison
- icon submitted by Tim
Kimmo Varis [Fri, 12 Aug 2005 21:26:44 +0000 (21:26 +0000)]
PATCH: [
1253326 ] Allow opening files to external editor from file compare
Kimmo Varis [Thu, 11 Aug 2005 20:21:28 +0000 (20:21 +0000)]
PATCH: [
1244009 ] Add userflags to diffitem and remember hidden status
Kimmo Varis [Thu, 11 Aug 2005 20:13:17 +0000 (20:13 +0000)]
PATCH: [
1244009 ] Add userflags to diffitem and remember hidden status
Kimmo Varis [Wed, 10 Aug 2005 14:48:45 +0000 (14:48 +0000)]
WinMerge experimental release 2.3.5.2 (cvs)
Kimmo Varis [Wed, 10 Aug 2005 14:46:19 +0000 (14:46 +0000)]
BUG: [
1254903 ] WinMerge 2.3.5.1: Not enough memory at File Comparison
- fix from Perry
Kimmo Varis [Mon, 8 Aug 2005 16:35:05 +0000 (16:35 +0000)]
WinMerge experimental release 2.3.5.1 (cvs)
Perry Rapp [Sun, 7 Aug 2005 20:27:57 +0000 (20:27 +0000)]
PATCH: [
1248259 ] Preserve trivial diffs in diff chain
Src: DiffList.cpp DiffList.h DiffWrapper.cpp LocationView.cpp
LocationView.h MergeDiffDetailView.cpp MergeDiffDetailView.h
MergeDoc.cpp MergeEditView.cpp MergeEditView.h
Kimmo Varis [Sun, 7 Aug 2005 11:48:22 +0000 (11:48 +0000)]
PATCH: [
1253350 ] Use new-style folder browse dialog
Kimmo Varis [Sun, 7 Aug 2005 11:40:54 +0000 (11:40 +0000)]
PATCH: [
1253205 ] Remove dynamic dll loading from FilePathEdit
Kimmo Varis [Sun, 7 Aug 2005 11:29:33 +0000 (11:29 +0000)]
PATCH: [
1253100 ] Shorter paths in captions
Kimmo Varis [Sat, 6 Aug 2005 09:13:45 +0000 (09:13 +0000)]
PATCH: [
1201945 ] Localization of ShellExtension.dll
- submitted by Takashi Sawanaka
Kimmo Varis [Sat, 6 Aug 2005 08:27:07 +0000 (08:27 +0000)]
PATCH: [
1150083 ] plugin to filter C-style comments CPP/JS/PHP
- submitted by daemonui
Kimmo Varis [Fri, 5 Aug 2005 21:09:17 +0000 (21:09 +0000)]
PATCH: [
1249646 ] Register Shell Edit handler for projectfiles
Kimmo Varis [Fri, 5 Aug 2005 20:14:16 +0000 (20:14 +0000)]
PATCH: [
1238168 ] Convert using BCMenu with pointers
Kimmo Varis [Fri, 5 Aug 2005 20:06:06 +0000 (20:06 +0000)]
Remove accidentally added letter before comment begin.
Kimmo Varis [Fri, 5 Aug 2005 17:36:24 +0000 (17:36 +0000)]
PATCH: [
1252076 ] Improve About-dialog (unicode info, better layout)
Kimmo Varis [Thu, 4 Aug 2005 18:23:51 +0000 (18:23 +0000)]
BUG: [
1247700 ] Cannot browse to parent folders of selected folders
- Fix from Jochen
Perry Rapp [Sun, 31 Jul 2005 03:15:37 +0000 (03:15 +0000)]
2005-07-31 Perry
PATCH: [
1248180 ] fix moved block code
BUG: [
1248172 ] Assert failure in CDiffWrapper::RunFileDiff
BUG: [
1186199 ] Assert from moved block code
Src: DiffWrapper.cpp
Perry Rapp [Sat, 30 Jul 2005 18:48:15 +0000 (18:48 +0000)]
Cosmetic: grammar fix in comment ("same...than" => "same...as")
Src/LocationView.cpp
Perry Rapp [Sat, 30 Jul 2005 17:20:14 +0000 (17:20 +0000)]
2005-07-30 Perry
PATCH: [
1247483 ] Create folder if one doesn't exist (for reports and patches)
BUG: [
1248017 ] WinMerge\Src\DirCmpReport.cpp(80) : error C2065: 'IDS_FOLDER
Creating IDS_FOLDER_NOTEXIST as "Folder does not exist." and checking in to cvs trunk.
Src: Merge.rc resource.h
Src/Languages: resource.h Merge*.rc
Kimmo Varis [Sat, 30 Jul 2005 12:29:55 +0000 (12:29 +0000)]
PATCH: [
1247483 ] Create folder if one doesn't exist (for reports and patches)
Kimmo Varis [Sat, 30 Jul 2005 12:25:49 +0000 (12:25 +0000)]
PATCH: [
1247375 ] Use Shell Edit command primarily to open files
Kimmo Varis [Fri, 29 Jul 2005 11:13:09 +0000 (11:13 +0000)]
PATCH: [
1245773 ] Scan full files in quick contents compare
Kimmo Varis [Tue, 26 Jul 2005 21:02:04 +0000 (21:02 +0000)]
PATCH: [
1208493 ] Suggest change in title of codepage options
Perry Rapp [Tue, 26 Jul 2005 14:50:10 +0000 (14:50 +0000)]
PATCH: [
1208208 ] Move resizeable dialogs position in registry
Src: OpenDlg.cpp SaveClosingDlg.cpp
Src/Common: CMoveConstraint.cpp CMoveConstraint.h
Perry Rapp [Tue, 26 Jul 2005 14:36:47 +0000 (14:36 +0000)]
2005-07-26 Perry
PATCH: [
1242008 ] Update status to binary if open fails because binary
Src: DiffItem.h DiffItemList.cpp DiffItemList.h DirDoc.h DirView.cpp
MainFrm.cpp MainFrm.h MergeDoc.cpp MergeDoc.h
Kimmo Varis [Tue, 26 Jul 2005 08:43:09 +0000 (08:43 +0000)]
Handle empty filename for report
Kimmo Varis [Tue, 26 Jul 2005 07:57:12 +0000 (07:57 +0000)]
PATCH: [
1238174 ] Fix diff counts in quick contents compare
Kimmo Varis [Tue, 26 Jul 2005 07:49:20 +0000 (07:49 +0000)]
Remove invalid ASSERT
Kimmo Varis [Tue, 26 Jul 2005 07:16:56 +0000 (07:16 +0000)]
PATCH: [
1244804 ] Add hourglass for report creating
Perry Rapp [Tue, 26 Jul 2005 06:29:48 +0000 (06:29 +0000)]
PATCH: [
1241275 ] New Shared or Private Filter dialog
New shared filter dialog
Src/Languages: */Merge*.rc */resource.h
Perry Rapp [Tue, 26 Jul 2005 06:11:31 +0000 (06:11 +0000)]
PATCH: [
1241275 ] New Shared or Private Filter dialog
Src: FileFilterHelper.cpp FileFilterHelper.h FileFiltersDlg.cpp
Merge.dsp Merge.rc paths.cpp paths.h resource.h
Src new files: SharedFilterDlg.cpp SharedFilterDlg.h
Perry Rapp [Tue, 26 Jul 2005 04:23:43 +0000 (04:23 +0000)]
2005-07-26 Perry
PATCH: [
1241270 ] Fix paths.cpp GetDirName for root paths
Src: paths.cpp
Perry Rapp [Mon, 25 Jul 2005 23:41:18 +0000 (23:41 +0000)]
PATCH: [
1241962 ] Record zero byte location info
Src/Common: UniFile.cpp UniFile.h
Perry Rapp [Mon, 25 Jul 2005 23:34:06 +0000 (23:34 +0000)]
PATCH: [
1244808 ] Remove LanguageSelect include from Merge.h
Src: codepage.cpp DirActions.cpp Merge.cpp Merge.h
Src/Common: LanguageSelect.h
Perry Rapp [Mon, 25 Jul 2005 21:39:31 +0000 (21:39 +0000)]
2005-07-25 Perry
BUG: [
1241766 ] Debug warning: Warning: no listbox item selected.
Src/Common: LanguageSelect.cpp LanguageSelect.h
Perry Rapp [Mon, 25 Jul 2005 15:42:37 +0000 (15:42 +0000)]
BUG: [
1244536 ] DisplayXMLFiles missing from Plugins/dlls
Plugins\dlls: new file DisplayXMLFiles.dll
Perry Rapp [Mon, 25 Jul 2005 15:40:19 +0000 (15:40 +0000)]
BUG: [
1244546 ] DisplayXMLFiles linking looks wrong
src_VCPP\DisplayXMLFiles: DisplayXMLFiles.dsp
Perry Rapp [Mon, 25 Jul 2005 15:16:52 +0000 (15:16 +0000)]
2005-07-25 Perry
BUG: [
1244540 ] DisplayXMLFiles doesn't compile
src_VCPP\DisplayXMLFiles: WinMergeScript.cpp
Kimmo Varis [Mon, 25 Jul 2005 12:21:30 +0000 (12:21 +0000)]
BUG: [
1244415 ] Bad T2A call in DirCmpReport::SaveToFile
Kimmo Varis [Mon, 25 Jul 2005 12:07:58 +0000 (12:07 +0000)]
PATCH: [
1243655 ] Directory compare reporting
Kimmo Varis [Mon, 25 Jul 2005 11:51:16 +0000 (11:51 +0000)]
PATCH: [
1243655 ] Directory compare reporting
Perry Rapp [Sun, 24 Jul 2005 22:08:53 +0000 (22:08 +0000)]
2005-07-24 Perry
PATCH: [
1242297 ] Fix CPatchDlg::OnOK for empty paths & greatly simplify
Src: Merge.rc PatchDlg.cpp resource.h
Src/Languages: */resource.h */Merge*.rc
Kimmo Varis [Sun, 24 Jul 2005 15:20:43 +0000 (15:20 +0000)]
PATCH: [
1220485 ] Move Redisplay() from doc to view
Perry Rapp [Sun, 24 Jul 2005 00:19:28 +0000 (00:19 +0000)]
PATCH: [
1241930 ] Rename stringdiffs_Get to sd_ComputeWordDiffs
(This is cosmetic function rename)
Src: MergeDocLineDiffs.cpp stringdiffs.cpp stringdiffs.h stringdiffsi.h
Perry Rapp [Sun, 24 Jul 2005 00:16:14 +0000 (00:16 +0000)]
2005-07-24 Perry
PATCH: [
1211574 ] Wrap GetTempPath and GetTempFileName for CString use
Src: DiffWrapper.cpp FileTransform.cpp PathContext.cpp VSSHelper.cpp
paths.cpp paths.h
Kimmo Varis [Sat, 23 Jul 2005 20:07:28 +0000 (20:07 +0000)]
PATCH: [
1243221 ] Cleanup CompareStats
Kimmo Varis [Sat, 23 Jul 2005 06:56:20 +0000 (06:56 +0000)]
BUG: [
1241289 ] Edit point or "anchor" not updated when navigating diffs
Perry Rapp [Fri, 22 Jul 2005 02:33:16 +0000 (02:33 +0000)]
BUG: [
1241990 ] Typo in MergeDoc.h: additionnal => additional
Fix spelling additionnal => additional
Src: MergeDoc.h MergeEditView.h
Perry Rapp [Fri, 22 Jul 2005 02:30:03 +0000 (02:30 +0000)]
2005-07-22 Perry
PATCH: [
1242339 ] Fix CMergeDoc::Rescan to set bIdentical in all cases
Src: DiffWrapper.cpp DiffWrapper.h MergeDoc.cpp PatchTool.cpp
Perry Rapp [Thu, 21 Jul 2005 12:57:19 +0000 (12:57 +0000)]
2005-07-21 Perry
PATCH: [
1226311 ] Record notes about why compare failed
Src: DiffItem.h DiffWrapper.cpp DiffWrapper.h
Perry Rapp [Wed, 20 Jul 2005 22:05:38 +0000 (22:05 +0000)]
Cosmetic: Add function header comment to CMergeDoc::GetWordDiffArray
Src: MergeDocLineDiffs.cpp
Tim Gerundt [Wed, 20 Jul 2005 21:13:29 +0000 (21:13 +0000)]
PATCH: [
1238450 ] Build script for manual at SF.net
Perry Rapp [Wed, 20 Jul 2005 18:07:57 +0000 (18:07 +0000)]
2005-07-20 Perry
PATCH: [
1241753 ] Fix DirViewColItems int64 cast warnings
Src: DirViewColItems.cpp
Kimmo Varis [Tue, 19 Jul 2005 21:00:44 +0000 (21:00 +0000)]
PATCH: [
1236623 ] Increase Quick contents compare buffer size
Kimmo Varis [Tue, 19 Jul 2005 15:48:41 +0000 (15:48 +0000)]
PATCH: [
1238194 ] Use proper member names in MergeDiffDetailView
Perry Rapp [Mon, 18 Jul 2005 17:30:20 +0000 (17:30 +0000)]
Cosmetic: add explanatory comments to comment inside of SetResourceVersions.wsf
Src: SetResourceVersions.wsf
Perry Rapp [Mon, 18 Jul 2005 16:06:27 +0000 (16:06 +0000)]
2005-07-18 Perry
BUG: [
1232382 ] Inconsistent language name casing in Spanish UI (v2.3.4.0)
Make all language names capitalized in Spanish, as in Catalan
Src/Languages/Spanish: MergeSpanish.rc
Jochen Tucht [Sun, 17 Jul 2005 15:58:19 +0000 (15:58 +0000)]
no message
Jochen Tucht [Sun, 17 Jul 2005 15:56:37 +0000 (15:56 +0000)]
BUG: [
1239605 ] Cannot open diff due to 7zip error
Perry Rapp [Sun, 17 Jul 2005 01:51:25 +0000 (01:51 +0000)]
2005-07-17 Perry
PATCH: [
1239275 ] Fixes for sd_ComputeByteDiff
Src: stringdiffs.cpp
Jochen Tucht [Fri, 15 Jul 2005 14:17:52 +0000 (14:17 +0000)]
shlwapi.h prior to VC6SP6 might lack definition of StrIsIntlEqual
Jochen Tucht [Fri, 15 Jul 2005 13:23:18 +0000 (13:23 +0000)]
fix comments / use one doxygen comment style
Jochen Tucht [Fri, 15 Jul 2005 08:24:41 +0000 (08:24 +0000)]
no message
Jochen Tucht [Fri, 15 Jul 2005 08:22:13 +0000 (08:22 +0000)]
PATCH: [
1225880 ] Project file parsing based on CMarkdown class
Jochen Tucht [Fri, 15 Jul 2005 08:13:33 +0000 (08:13 +0000)]
PATCH: [
1229867 ] RFE [
1205516 ], RFE [ 887948 ], and other issues (w/o command line tool integration)
Kimmo Varis [Wed, 13 Jul 2005 08:47:26 +0000 (08:47 +0000)]
PATCH: [
1236598 ] Add binary file check to quick contents compare
Kimmo Varis [Wed, 13 Jul 2005 07:10:08 +0000 (07:10 +0000)]
PATCH: [
1236602 ] Add icon for messagebox about overwriting patch file
Perry Rapp [Tue, 12 Jul 2005 18:13:11 +0000 (18:13 +0000)]
Spelling fix (existant => existent)
Manual: Command_line.xml
Perry Rapp [Tue, 12 Jul 2005 18:12:05 +0000 (18:12 +0000)]
2005-07-12 Perry
Grammar fix via rewrite for /ub option
Manual: Command_line.xml
Perry Rapp [Mon, 11 Jul 2005 23:20:36 +0000 (23:20 +0000)]
PATCH: [
1234629 ] New Chinese(Simplified) translation .rc file
Src/Languages: MergeChineseSimplified.rc
Perry Rapp [Mon, 11 Jul 2005 20:33:06 +0000 (20:33 +0000)]
PATCH: [
1229024 ] Rename CPropFilter to CPropLineFilter
Rename class
Src: PropLineFilter.cpp PropLineFilter.h
(And adding the new/renamed PropLineFilter.* files)
Perry Rapp [Mon, 11 Jul 2005 20:25:59 +0000 (20:25 +0000)]
2005-07-11 Perry
PATCH: [
1229024 ] Rename CPropFilter to CPropLineFilter
Remove PropFilter.cpp PropFilter.h
Add PropLineFilter.cpp PropLineFilter.h
Src: Merge.dsp MainFrm.cpp