OSDN Git Service
Kimmo Varis [Tue, 20 Sep 2005 14:39:21 +0000 (14:39 +0000)]
PATCH: [
1295568 ] Manual: New Open-dialog screenshot
Tim Gerundt [Mon, 19 Sep 2005 20:31:10 +0000 (20:31 +0000)]
PATCH: [
1295767 ] German Translation for 'Highlight Line * Diff'
Kimmo Varis [Mon, 19 Sep 2005 15:58:30 +0000 (15:58 +0000)]
PATCH: [
1295473 ] updated italian rc file for winmerge 2.3.6
- submitted by Andrea Decorte
Kimmo Varis [Mon, 19 Sep 2005 14:53:03 +0000 (14:53 +0000)]
PATCH: [
1295473 ] updated italian rc file for winmerge 2.3.6
- submitted by Andrea Decorte
Kimmo Varis [Mon, 19 Sep 2005 14:39:01 +0000 (14:39 +0000)]
PATCH: [
1294595 ] Manual: Update options
Kimmo Varis [Mon, 19 Sep 2005 14:33:46 +0000 (14:33 +0000)]
PATCH: [
1294514 ] Set file loading traces debug-only
Kimmo Varis [Sun, 18 Sep 2005 08:05:37 +0000 (08:05 +0000)]
PATCH: [
1294162 ] Manual: First update to file compare
Kimmo Varis [Sat, 17 Sep 2005 07:13:26 +0000 (07:13 +0000)]
PATCH: [
1293296 ] Manual: Updates for folder compare
Kimmo Varis [Fri, 16 Sep 2005 16:57:24 +0000 (16:57 +0000)]
BUG: [
1290305 ] ShellExtensionU.dll info missing from config log
Kimmo Varis [Fri, 16 Sep 2005 16:55:03 +0000 (16:55 +0000)]
PATCH: [
1292120 ] More significant diff navigations fixes
Kimmo Varis [Fri, 16 Sep 2005 14:12:22 +0000 (14:12 +0000)]
New file Changes.txt created as change-log.
Kimmo Varis [Fri, 16 Sep 2005 14:05:20 +0000 (14:05 +0000)]
PATCH: [
1292336 ] Manual: update installation doc
Kimmo Varis [Fri, 16 Sep 2005 14:03:37 +0000 (14:03 +0000)]
PATCH: [
1292327 ] Manual: introduction updates
Tim Gerundt [Thu, 15 Sep 2005 19:59:04 +0000 (19:59 +0000)]
PATCH: [
1292279 ] Various Updates in German Translation
Kimmo Varis [Thu, 15 Sep 2005 19:44:01 +0000 (19:44 +0000)]
PATCH: [
1286016 ] Shortcut keys for bookmarks
- submitted by Sigvald Refsum
Kimmo Varis [Wed, 14 Sep 2005 18:00:56 +0000 (18:00 +0000)]
PATCH: [
1290477 ] Catalan translation update
- submitted by Jordi Vilar
Kimmo Varis [Tue, 13 Sep 2005 17:31:59 +0000 (17:31 +0000)]
PATCH: [
1289037 ] Some (non)significant diff count fixes
Kimmo Varis [Mon, 12 Sep 2005 15:32:21 +0000 (15:32 +0000)]
PATCH:
1284150 Fix Shell Extension registering problem
- also bump version to 1.6
Jochen Tucht [Fri, 9 Sep 2005 21:20:14 +0000 (21:20 +0000)]
Fix by Takashi Sawanaka (sdottaka) related to PATCH: [
1247875 ] codepage detection based on CMarkdown class
Perry Rapp [Fri, 9 Sep 2005 03:01:08 +0000 (03:01 +0000)]
2005-09-09, Perry
BUG: [
1284304 ] StaticLink crashes after mouse over event
Changed signature of CStaticLink::OnSetCursor to start with CWnd *
Src\Common: StaticLink.cpp StaticLink.h
Tim Gerundt [Thu, 8 Sep 2005 22:19:29 +0000 (22:19 +0000)]
PATCH: [
1285404 ] Various Updates in German Translation
Perry Rapp [Thu, 8 Sep 2005 13:16:14 +0000 (13:16 +0000)]
PATCH: [
1283466 ] French translation
New translation by Jean-F Jolin
Src/Languages/French: MergeFrench.rc
Perry Rapp [Thu, 8 Sep 2005 13:05:10 +0000 (13:05 +0000)]
2005-09-08, Perry
Added ChangeLogs folder to project, and put Changes.txt (this),
readme.txt, and CHANGELO into new ChangeLogs folder.
Tim Gerundt [Wed, 7 Sep 2005 21:26:59 +0000 (21:26 +0000)]
PATCH: [
1282546 ] Web: Download page
Perry Rapp [Wed, 7 Sep 2005 20:21:40 +0000 (20:21 +0000)]
Add new Changes.txt, to receive new changes instead of readme.txt
Kimmo Varis [Wed, 7 Sep 2005 16:33:57 +0000 (16:33 +0000)]
R2_4 branch created for 2.4 release
2.3.6 WinMerge beta 2.3.6.0 released
Kimmo Varis [Wed, 7 Sep 2005 16:28:24 +0000 (16:28 +0000)]
Bump revision number to 1.1.4
Kimmo Varis [Wed, 7 Sep 2005 16:17:21 +0000 (16:17 +0000)]
PATCH: [
1283217 ] Inactive linediff color is too bright
Perry Rapp [Wed, 7 Sep 2005 14:10:16 +0000 (14:10 +0000)]
BUG: [
1283986 ] Cannot drill into directories
Src: DirView.cpp
Perry Rapp [Tue, 6 Sep 2005 23:28:06 +0000 (23:28 +0000)]
2005-09-07 Perry
PATCH: [
1282587 ] Allow compare 2 items when one on both sides
Src: DiffItem.h DirActions.cpp DirView.cpp
Kimmo Varis [Tue, 6 Sep 2005 18:55:51 +0000 (18:55 +0000)]
PATCH: [
1282479 ] Don't set shell context menu to default value
Kimmo Varis [Tue, 6 Sep 2005 18:23:11 +0000 (18:23 +0000)]
PATCH: [
1282322 ] Use different cursor (hand) with static link
Kimmo Varis [Tue, 6 Sep 2005 17:33:03 +0000 (17:33 +0000)]
PATCH: [
1273040 ] Fix buffer handling in Quick Compare
- submitted by Perry
Perry Rapp [Mon, 5 Sep 2005 21:29:20 +0000 (21:29 +0000)]
PATCH: [
1281371 ] Allow comparing 2 items against each other in DirView
Src: DirActions.cpp DirView.cpp DirView.h
Kimmo Varis [Mon, 5 Sep 2005 19:19:30 +0000 (19:19 +0000)]
Merge some of latest changes from WinMerge.iss to WinMerge Localized.iss
Kimmo Varis [Mon, 5 Sep 2005 15:34:56 +0000 (15:34 +0000)]
PATCH: [
1281735 ] Don't silently overwrite project file
Kimmo Varis [Mon, 5 Sep 2005 15:30:16 +0000 (15:30 +0000)]
PATCH: [
1281561 ] Manual: Whats new in 2.4
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'