OSDN Git Service
Kimmo Varis [Mon, 5 Sep 2005 14:24:45 +0000 (14:24 +0000)]
PATCH: [
1281638 ] Drop ComCtl32 update from installer
Perry Rapp [Sun, 4 Sep 2005 22:41:05 +0000 (22:41 +0000)]
Cosmetic: Adding class comment to union CMarkdown::_HSTR
Src: markdown.h
Perry Rapp [Sun, 4 Sep 2005 22:28:47 +0000 (22:28 +0000)]
Cosmetic: Adding comment about 7ZCommon.h include of dllpstub.h, which is not obvious
Src: 7ZCommon.h
Perry Rapp [Sun, 4 Sep 2005 22:23:32 +0000 (22:23 +0000)]
2005-09-04 Perry
Cosmetic: Perry adding comments about usage of dllpstub
Src: dllpstub.cpp dllpstub.h markdown.h
Kimmo Varis [Sun, 4 Sep 2005 11:15:13 +0000 (11:15 +0000)]
PATCH: [
1281059 ] Avoid uninitialised members in CLanguageSelect
- submitted by Csaba Raduly
Kimmo Varis [Thu, 1 Sep 2005 14:30:12 +0000 (14:30 +0000)]
WinMerge experimental release 2.3.5.4 (cvs)
Kimmo Varis [Thu, 1 Sep 2005 14:25:46 +0000 (14:25 +0000)]
Bump revision number to 1.2.3
Kimmo Varis [Thu, 1 Sep 2005 14:20:38 +0000 (14:20 +0000)]
PATCH: [
1276921 ] Replace 'Directory' with 'Folder' in Open-dialog
Kimmo Varis [Thu, 1 Sep 2005 14:14:11 +0000 (14:14 +0000)]
PATCH: [
1277750 ] Uninstall Merge7z
Kimmo Varis [Thu, 1 Sep 2005 14:09:56 +0000 (14:09 +0000)]
PATCH: [
1277316 ] New layout for list_of_sources.txt
- submitted by Tim
Kimmo Varis [Thu, 1 Sep 2005 14:03:41 +0000 (14:03 +0000)]
PATCH: [
1278708 ] Updated Swedish.rc for 2.4
- submitted by Hans Eriksson
Kimmo Varis [Wed, 31 Aug 2005 18:57:17 +0000 (18:57 +0000)]
PATCH: [
1277420 ] Swedish translation update for 2.4
- submitted by Hans Eriksson
Jochen Tucht [Wed, 31 Aug 2005 18:04:54 +0000 (18:04 +0000)]
PATCH: [
1275273 ] Convert CDirView to use LVN_GETDISPINFO
Kimmo Varis [Wed, 31 Aug 2005 17:07:59 +0000 (17:07 +0000)]
PATCH: [
1277588 ] Change lstrcpyW to wcscpy
- submitted by Perry
Perry Rapp [Wed, 31 Aug 2005 17:03:16 +0000 (17:03 +0000)]
2005-08-31 Perry
BUG: [
1277300 ] version number
PATCH: [
1277596 ] Fix version string (IDS_VERSION_FMT) in Portuguese
Fix IDS_VERSION_FMT string for Portuguese/Brazilian (was missing %1)
Src/Languages/Brazilian: MergeBrazilian.rc
Kimmo Varis [Wed, 31 Aug 2005 16:53:14 +0000 (16:53 +0000)]
PATCH: [
1277420 ] Swedish translation update for 2.4
- submitted by Hans Eriksson
Kimmo Varis [Wed, 31 Aug 2005 16:45:04 +0000 (16:45 +0000)]
PATCH: [
1277420 ] Swedish translation update for 2.4
- submitted by Hans Eriksson
Kimmo Varis [Wed, 31 Aug 2005 16:22:05 +0000 (16:22 +0000)]
PATCH: [
1276916 ] Add Window/Close All menuitem
Kimmo Varis [Wed, 31 Aug 2005 15:38:03 +0000 (15:38 +0000)]
PATCH: [
1265182 ] cannot transfer cmdargs from WinMergeU to WinMerge
- submitted by Takashi Sawanaka
Kimmo Varis [Wed, 31 Aug 2005 14:48:21 +0000 (14:48 +0000)]
PATCH: [
1276985 ] Manual: Update File and Folder opening
Kimmo Varis [Wed, 31 Aug 2005 14:46:47 +0000 (14:46 +0000)]
PATCH: [
1276983 ] Manual: Update Quick start
Kimmo Varis [Tue, 30 Aug 2005 18:09:49 +0000 (18:09 +0000)]
PATCH: [
1276588 ] Catalan translation update
- submitted by Jordi Vilar
Kimmo Varis [Tue, 30 Aug 2005 18:01:57 +0000 (18:01 +0000)]
PATCH: [
1276588 ] Catalan translation update
- submitted by Jordi Vilar
Kimmo Varis [Tue, 30 Aug 2005 17:47:34 +0000 (17:47 +0000)]
PATCH: [
1275940 ] Merge/Delete enabled for single item only
Kimmo Varis [Tue, 30 Aug 2005 17:33:41 +0000 (17:33 +0000)]
Updated new Innosetup 5.1.x compatible lang files from jrsoftware.org/files/istrans/
Kimmo Varis [Tue, 30 Aug 2005 17:30:48 +0000 (17:30 +0000)]
Created a INNOSETUP_4_2_7 tag for lang files before updating to newer versions
Kimmo Varis [Tue, 30 Aug 2005 14:58:51 +0000 (14:58 +0000)]
PATCH: [
1275874 ] Cleanup Installer a bit
Kimmo Varis [Tue, 30 Aug 2005 14:17:53 +0000 (14:17 +0000)]
PATCH: [
1275833 ] Fix difference navigation with ignored diffs
Kimmo Varis [Mon, 29 Aug 2005 16:29:39 +0000 (16:29 +0000)]
PATCH: [
1275345 ] Archive support options
Kimmo Varis [Sun, 28 Aug 2005 19:01:13 +0000 (19:01 +0000)]
BUG: [
1269022 ] Additional backslash shown for root paths
Kimmo Varis [Sun, 28 Aug 2005 06:36:56 +0000 (06:36 +0000)]
PATCH: [
1274509 ] Small update for installer doc
Kimmo Varis [Sun, 28 Aug 2005 06:16:18 +0000 (06:16 +0000)]
PATCH: [
1274559 ] Upgrade to Innosetup 5.1.5
Add new InnoSetup 5.1.5 compatible setup script, old remains for InnoSetup 4.x
Kimmo Varis [Sun, 28 Aug 2005 06:04:22 +0000 (06:04 +0000)]
PATCH: [
1274502 ] Pick ShellExtensionU.dll from MergeUnicodeBuild-folder
Kimmo Varis [Sun, 28 Aug 2005 05:59:20 +0000 (05:59 +0000)]
PATCH: [
1274504 ] Build Shellextension dlls to same folders than WinMerge.exes
Kimmo Varis [Sat, 27 Aug 2005 07:47:32 +0000 (07:47 +0000)]
PATCH: [
1273316 ] Files.txt - file listing installed files
Kimmo Varis [Fri, 26 Aug 2005 20:48:31 +0000 (20:48 +0000)]
PATCH: [
1267510 ] Allow stopping quick compare after first difference
Kimmo Varis [Fri, 26 Aug 2005 16:17:05 +0000 (16:17 +0000)]
PATCH: [
1273222 ] Change COpenDlg::SelectFile() to show resizable dialog
Perry Rapp [Thu, 25 Aug 2005 22:48:26 +0000 (22:48 +0000)]
PATCH: [
1269567 ] Abortable quick compare
Src: DiffContext.cpp DiffContext.h DiffItem.h DiffThread.cpp
DiffWrapper.cpp DiffWrapper.h DirCompStateBar.cpp DirCompStateBar.h
DirDoc.cpp DirScan.cpp DirScan.h DirView.cpp DirViewColItems.cpp
Merge.dsp Merge.rc resource.h stringdiffs.cpp
Src new files: IAbortable.h
Perry Rapp [Thu, 25 Aug 2005 19:28:50 +0000 (19:28 +0000)]
2005-08-25 Perry
PATCH: [
1273039 ] Fix fencepost error in binary check in QuickCompare
(Fix plus some improved commenting)
Src: DiffWrapper.cpp
Jochen Tucht [Thu, 25 Aug 2005 07:11:02 +0000 (07:11 +0000)]
Fix broken Merge7z::GuessFormatByExtension()
Jochen Tucht [Thu, 25 Aug 2005 07:07:30 +0000 (07:07 +0000)]
no message
Kimmo Varis [Wed, 24 Aug 2005 16:25:43 +0000 (16:25 +0000)]
Compile/merge fix.
Kimmo Varis [Wed, 24 Aug 2005 15:55:00 +0000 (15:55 +0000)]
WinMerge experimental release 2.3.5.3 (cvs)
Kimmo Varis [Wed, 24 Aug 2005 15:24:28 +0000 (15:24 +0000)]
PATCH: [
1265045 ] GUI freeze after changing language
- submitted by Takashi Sawanaka
Kimmo Varis [Wed, 24 Aug 2005 14:58:26 +0000 (14:58 +0000)]
PATCH: [
1267520 ] byte_compare_files() opens files in text mode
- from Perry
Kimmo Varis [Wed, 24 Aug 2005 14:54:17 +0000 (14:54 +0000)]
PATCH: [
1267383 ] Use our SelectFile() to select Project file to open
Kimmo Varis [Wed, 24 Aug 2005 14:32:15 +0000 (14:32 +0000)]
PATCH: [
1267375 ] Allow to resize file open/save dialog
Kimmo Varis [Wed, 24 Aug 2005 14:24:59 +0000 (14:24 +0000)]
PATCH: [
1267409 ] Shell description for project files
Jochen Tucht [Wed, 24 Aug 2005 05:28:03 +0000 (05:28 +0000)]
PATCH: [
1264728 ] Guess archive format by signature
Jochen Tucht [Wed, 24 Aug 2005 05:11:56 +0000 (05:11 +0000)]
PATCH: [
1264728 ] Guess archive format by signature
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