OSDN Git Service
Kimmo Varis [Fri, 12 Mar 2004 12:43:13 +0000 (12:43 +0000)]
PATCH: [ 902191 ] Uninline CDiffTextBuffer functions
Christian List [Thu, 11 Mar 2004 20:46:49 +0000 (20:46 +0000)]
WinMerge experimental release 2.1.5.14 (installer test)
Kimmo Varis [Thu, 11 Mar 2004 19:33:45 +0000 (19:33 +0000)]
PATCH: [ 913743 ] Icons for menuitems (RFE 873697) - submitted by Tim Gerundt
Christian List [Thu, 11 Mar 2004 19:25:18 +0000 (19:25 +0000)]
PATCH: [ 913686 ] Home Page on new winmerge.org domain
Kimmo Varis [Thu, 11 Mar 2004 19:24:40 +0000 (19:24 +0000)]
PATCH: [ 913743 ] Icons for menuitems (RFE 873697) - submitted by Tim Gerundt
Christian List [Thu, 11 Mar 2004 19:06:31 +0000 (19:06 +0000)]
A couple of paths corrected and the version numbering is automated
Kimmo Varis [Thu, 11 Mar 2004 15:29:45 +0000 (15:29 +0000)]
BUG: [ 872882 ] Some selected menu items looks to small. - Adds missing handler functions BCMenu needs Also added code to implement document menus (commented out for now)
Kimmo Varis [Thu, 11 Mar 2004 13:29:21 +0000 (13:29 +0000)]
PATCH: [ 913792 ] Cache color options for MergeView
Christian Blackburn [Thu, 11 Mar 2004 01:37:44 +0000 (01:37 +0000)]
This is the updated version 20 of the Inno Setup Installer. I haven't made any significant functional modifications to the script. The only modifications were I added a few more steps to the compilation instructions inside of the script and I changed "winmerge.org/" to "http://WinMerge.org/". I also modified the Read Me file highlighting the COMCTL32.DLL and the 7-Zip requirements.
-Seier Blackburn
Christian Blackburn [Thu, 11 Mar 2004 00:49:37 +0000 (00:49 +0000)]
This is the updated version 19 of the Inno Setup installer. The sole difference is that the WinMerge start menu isn't opened automatically rather it's a post install option that is displayed on the "Finished" page.
-Seier Blackburn
Christian Blackburn [Thu, 11 Mar 2004 00:45:28 +0000 (00:45 +0000)]
This is the updated version 18 of our application's Installer. It now supports the new folder layout requested by Christian List. It also opens the start menu towards the end of the installation.
-Seier Blackburn
Kimmo Varis [Wed, 10 Mar 2004 21:31:45 +0000 (21:31 +0000)]
PATCH: [ 913073 ] Option to automatically close compare pane
Kimmo Varis [Wed, 10 Mar 2004 15:49:46 +0000 (15:49 +0000)]
RFE: [ 874366 ] Add goto line-number - Show few lines of context above line scrolled to
Kimmo Varis [Wed, 10 Mar 2004 15:12:05 +0000 (15:12 +0000)]
PATCH: [ 912754 ] Close open MergeDoc before opening new from DirDoc
Kimmo Varis [Wed, 10 Mar 2004 14:41:56 +0000 (14:41 +0000)]
Fix for OptionsMgr bugs when loading string options from registry
Christian Blackburn [Wed, 10 Mar 2004 12:02:51 +0000 (12:02 +0000)]
I changed the name of the \\InnoSetup\\VCRedist\\ folder to runtimes so that in the future I can distribute Internet Explorer and 7-Zip with our application.
-Seier Blackburn
Christian Blackburn [Wed, 10 Mar 2004 11:45:46 +0000 (11:45 +0000)]
This is the current Inno Setup Script which I would call 2.1.5.16 which has nothing to do with overall version of WinMerge so don't get confused :). It adds support for the U Version WinMergeU.exe and only installs the 7-Zip DLL the user needs. If they don't have 7-Zip then it'll just install the 3.13 DLL.
-Christian Blackburn
Christian Blackburn [Wed, 10 Mar 2004 10:10:27 +0000 (10:10 +0000)]
I've added the "\\InnoSetup\\Art" folder which is to contain all artwork exclusively used by the installer.
-Seier Blackburn
Kimmo Varis [Tue, 9 Mar 2004 13:54:31 +0000 (13:54 +0000)]
Fix compile of CShellFileOp with Visual Studio 2003
Kimmo Varis [Tue, 9 Mar 2004 13:21:28 +0000 (13:21 +0000)]
PATCH: [ 912297 ] Splashscreen and syntax highlight options
Kimmo Varis [Mon, 8 Mar 2004 20:15:06 +0000 (20:15 +0000)]
BUG: [ 909090 ] MainFrm::m_CheckOutMulti not initialized
Kimmo Varis [Mon, 8 Mar 2004 19:41:21 +0000 (19:41 +0000)]
BUG: [ 909796 ] Uninitialised variable on OnSelchangeUnpackerName() - fix by Laoran
Kimmo Varis [Mon, 8 Mar 2004 19:29:35 +0000 (19:29 +0000)]
BUG: [ 909779 ] Uninitialised variable in CGhostTextBuffer::DeleteText() - fix by Laoran
Kimmo Varis [Mon, 8 Mar 2004 19:04:33 +0000 (19:04 +0000)]
PATCH: [ 892397 ] Distinguish prediffer from unpacker - by Laoran
Kimmo Varis [Mon, 8 Mar 2004 13:21:55 +0000 (13:21 +0000)]
PATCH: [ 911350 ] Restore default compare options
Kimmo Varis [Sun, 7 Mar 2004 18:06:54 +0000 (18:06 +0000)]
Add contributors.txt
Kimmo Varis [Sun, 7 Mar 2004 17:57:26 +0000 (17:57 +0000)]
RFE: [ 874366 ] Add goto line-number
Kimmo Varis [Sun, 7 Mar 2004 14:57:57 +0000 (14:57 +0000)]
PATCH: [ 906872 ] Change ShellExtension to open directories non-recursive
Kimmo Varis [Sun, 7 Mar 2004 10:40:14 +0000 (10:40 +0000)]
PATCH: [ 911114 ] DiffOptions to new system
Perry Rapp [Sat, 6 Mar 2004 18:03:50 +0000 (18:03 +0000)]
2004-03-06 WinMerge experimental release 2.1.5.13 (cvs)
Kimmo Varis [Fri, 5 Mar 2004 09:09:43 +0000 (09:09 +0000)]
Two unrelated lines got removed by checkin of #909980
Kimmo Varis [Fri, 5 Mar 2004 08:06:59 +0000 (08:06 +0000)]
PATCH: [ 909980 ] Fix buffer types and descriptions
Kimmo Varis [Thu, 4 Mar 2004 19:44:17 +0000 (19:44 +0000)]
PATCH: [ 907898 ] Detect filechange by another app before saving
Kimmo Varis [Thu, 4 Mar 2004 14:15:52 +0000 (14:15 +0000)]
Fix invalid return in paths_IsPathAbsolute()
Perry Rapp [Wed, 3 Mar 2004 15:10:49 +0000 (15:10 +0000)]
fix BUG: [ 902430 ] copy&paste comment bug
Kimmo Varis [Wed, 3 Mar 2004 14:15:08 +0000 (14:15 +0000)]
BUG: [ 908217 ] MergeDoc has incorrect include - by Perry
Kimmo Varis [Wed, 3 Mar 2004 14:02:24 +0000 (14:02 +0000)]
PATCH: [ 908211 ] DiffContext.h should not include RegExp.h - by Perry
Kimmo Varis [Wed, 3 Mar 2004 13:47:35 +0000 (13:47 +0000)]
PATCH: [ 908606 ] Restore default colors
Kimmo Varis [Tue, 2 Mar 2004 13:03:01 +0000 (13:03 +0000)]
PATCH: [ 907641 ] Convert color options to new system
Kimmo Varis [Tue, 2 Mar 2004 12:50:10 +0000 (12:50 +0000)]
PATCH: [ 907087 ] Allow commandline switches for external editor
Kimmo Varis [Mon, 1 Mar 2004 13:27:42 +0000 (13:27 +0000)]
PATCH: [ 906934 ] Fix filenames in patch-files
Kimmo Varis [Mon, 1 Mar 2004 13:23:55 +0000 (13:23 +0000)]
FIX wrong checkin comments and wrong patch number and description in previous checkin.
Kimmo Varis [Mon, 1 Mar 2004 13:11:30 +0000 (13:11 +0000)]
PATCH: [ 906180 ] Use SHBrowseForFolder() to select folder
Perry Rapp [Sat, 28 Feb 2004 22:57:42 +0000 (22:57 +0000)]
2004-02-28 WinMerge experimental release 2.1.5.12 (cvs)
Kimmo Varis [Sat, 28 Feb 2004 18:22:28 +0000 (18:22 +0000)]
PATCH: [ 906224 ] Convert more options to new system
Kimmo Varis [Sat, 28 Feb 2004 08:21:32 +0000 (08:21 +0000)]
PATCH: [ 906120 ] Improve error handling for dircompare fileoperations
Kimmo Varis [Fri, 27 Feb 2004 22:37:08 +0000 (22:37 +0000)]
Better absolute path check (I thought I already applied this)
Kimmo Varis [Fri, 27 Feb 2004 17:40:23 +0000 (17:40 +0000)]
Fix copy/paste error
Kimmo Varis [Fri, 27 Feb 2004 16:06:52 +0000 (16:06 +0000)]
PATCH: [ 905115 ] Put deleted files to Recycle Bin
Kimmo Varis [Thu, 26 Feb 2004 12:39:52 +0000 (12:39 +0000)]
PATCH: [ 903670 ] Copy Folder (and convert to CShellFileOp)
Kimmo Varis [Mon, 23 Feb 2004 19:15:07 +0000 (19:15 +0000)]
PATCH: [ 902738 ] Two errors in resource (Whitespaces and Hilight) - also RFE [ 837773 ] fix all about boxes
Kimmo Varis [Sat, 21 Feb 2004 12:12:03 +0000 (12:12 +0000)]
PATCH: [ 900718 ] Updated German translation - Submitted by Tim Gerundt
Kimmo Varis [Sat, 21 Feb 2004 10:25:30 +0000 (10:25 +0000)]
PATCH: [ 896153 ] OptionsManager
Perry Rapp [Fri, 20 Feb 2004 23:19:44 +0000 (23:19 +0000)]
Fix MakeResDll.dsp to compile (new directory structure).
Perry Rapp [Fri, 20 Feb 2004 23:14:57 +0000 (23:14 +0000)]
Add GetClipTcharTextFormat (needed by coretools now) to StdAfx.*
Perry Rapp [Fri, 20 Feb 2004 23:12:54 +0000 (23:12 +0000)]
Fix CopyAll.bat for new directory structure
Kimmo Varis [Fri, 20 Feb 2004 14:40:49 +0000 (14:40 +0000)]
PATCH: [ 899926 ] Write LogErrorString()s to logfile
Kimmo Varis [Thu, 19 Feb 2004 22:45:53 +0000 (22:45 +0000)]
RFE: [ 897975 ] Syntax highlighting for INI files - patch submitted by Tim Gerundt
Jochen Tucht [Thu, 19 Feb 2004 22:33:12 +0000 (22:33 +0000)]
no message
Kimmo Varis [Thu, 19 Feb 2004 21:14:56 +0000 (21:14 +0000)]
BUG: [ 893410 ] Typo in IDS_DIFF_FILEOVERWRITE
Kimmo Varis [Thu, 19 Feb 2004 15:41:33 +0000 (15:41 +0000)]
PATCH: [ 899145 ] Check if patch path is absolute
Jochen Tucht [Wed, 18 Feb 2004 22:43:56 +0000 (22:43 +0000)]
Patch #889357
Jochen Tucht [Wed, 18 Feb 2004 22:13:35 +0000 (22:13 +0000)]
Patch #889357
Jochen Tucht [Wed, 18 Feb 2004 21:58:35 +0000 (21:58 +0000)]
Changes for Patch #889357: IDS_ELAPSED_TIME
Jochen Tucht [Wed, 18 Feb 2004 21:54:08 +0000 (21:54 +0000)]
Changes for Patch #889357: gLog::DeleteFileFailed()
Jochen Tucht [Wed, 18 Feb 2004 21:52:19 +0000 (21:52 +0000)]
Changes for Patch #889357 (LSILENTVERIFY...)
Kimmo Varis [Wed, 18 Feb 2004 17:56:16 +0000 (17:56 +0000)]
BUG: [ 898745 ] Wrong result for folders (non-recursive compare)
Kimmo Varis [Tue, 17 Feb 2004 17:25:35 +0000 (17:25 +0000)]
BUG: [ 887280 ] Swap toolbar icon (usability)
Kimmo Varis [Mon, 16 Feb 2004 21:46:31 +0000 (21:46 +0000)]
PATCH: [ 891364 ] Enumerated doctype (scratchpads)
Kimmo Varis [Mon, 16 Feb 2004 13:41:01 +0000 (13:41 +0000)]
PATCH: [ 873151 ] Attempt to fix Help/Configuration
Kimmo Varis [Mon, 9 Feb 2004 14:58:04 +0000 (14:58 +0000)]
BUG: [ 893287 ] Assign wrong file property when storing changes.
Perry Rapp [Sun, 8 Feb 2004 16:46:27 +0000 (16:46 +0000)]
Add header comments to functions lacking such in StdAfx.cpp
Kimmo Varis [Sun, 8 Feb 2004 13:27:38 +0000 (13:27 +0000)]
BUG: [ 887271 ] Weird context menu position if opened from keyboard
Kimmo Varis [Sun, 8 Feb 2004 11:56:18 +0000 (11:56 +0000)]
PATCH: [ 890758 ] Fix and tune doxy config file
Kimmo Varis [Sun, 8 Feb 2004 09:27:36 +0000 (09:27 +0000)]
PATCH: [ 892509 ] Reset dircompare statuspane before new compare
Laurent Ganier [Sat, 7 Feb 2004 14:51:26 +0000 (14:51 +0000)]
BUG: [ 892158 ] Empty lines added to end of file
Perry Rapp [Sat, 7 Feb 2004 03:08:39 +0000 (03:08 +0000)]
2004-02-07 WinMerge experimental release 2.1.5.9 (cvs)
Kimmo Varis [Fri, 6 Feb 2004 23:32:43 +0000 (23:32 +0000)]
BUG: [ 892115 ] Directory compare always recursive
Kimmo Varis [Thu, 5 Feb 2004 22:18:13 +0000 (22:18 +0000)]
Remove doubled entrys from MessageMap
Christian List [Thu, 5 Feb 2004 17:23:54 +0000 (17:23 +0000)]
PATCH: [ 869654 ] [Website] Use Valid HTML
Added Tim Gerundt's arrows
Perry Rapp [Thu, 5 Feb 2004 15:02:38 +0000 (15:02 +0000)]
Add function header comment to OlecharToUTF8 in multiformatText.cpp.
resolves BUG: [ 876500 ] OlecharToUTF8 doesn't distinguish UCS-2BE?
Kimmo Varis [Wed, 4 Feb 2004 20:48:11 +0000 (20:48 +0000)]
PATCH: [ 888662 ] Add Editor options page
Laurent Ganier [Wed, 4 Feb 2004 14:37:53 +0000 (14:37 +0000)]
Correcting the path for the original resource.h
Perry Rapp [Tue, 3 Feb 2004 22:39:35 +0000 (22:39 +0000)]
PATCH: [ 890019 ] Fix diff_flag to bin_flag in CDiffWrapper::RunFileDiff
Perry Rapp [Tue, 3 Feb 2004 22:26:41 +0000 (22:26 +0000)]
PATCH: [ 882683 ] Combine transform code in DirScan.cpp
Kimmo Varis [Tue, 3 Feb 2004 17:44:33 +0000 (17:44 +0000)]
PATCH: [ 887800 ] Add frames around items in dircompare statusbar
Kimmo Varis [Tue, 3 Feb 2004 13:47:34 +0000 (13:47 +0000)]
PATCH: [ 889334 ] Improve and enable logging
Kimmo Varis [Tue, 3 Feb 2004 12:51:29 +0000 (12:51 +0000)]
PATCH: [ 889115 ] Delete transformed temp files in file compare
Kimmo Varis [Tue, 3 Feb 2004 12:46:24 +0000 (12:46 +0000)]
Fix "Copy Right to.." (copy/paste error)
Perry Rapp [Mon, 2 Feb 2004 01:04:31 +0000 (01:04 +0000)]
Cosmetic: fix copy&paste error in UniFile.cpp comment.
Kimmo Varis [Sun, 1 Feb 2004 14:34:55 +0000 (14:34 +0000)]
Initialise all PackingInfo members
Kimmo Varis [Sun, 1 Feb 2004 14:19:29 +0000 (14:19 +0000)]
Remove some unused variables
Kimmo Varis [Sun, 1 Feb 2004 13:29:30 +0000 (13:29 +0000)]
PATCH: [ 887085 ] CMergeDoc::TrySaveAs() cleanup
Kimmo Varis [Sun, 1 Feb 2004 10:44:27 +0000 (10:44 +0000)]
PATCH: [ 885496 ] Move compare options to Compare-page
Laurent Ganier [Sat, 31 Jan 2004 11:55:22 +0000 (11:55 +0000)]
BUG: [ 885018 ] Crash when trying to save scratchpad
Kimmo Varis [Sat, 31 Jan 2004 10:53:14 +0000 (10:53 +0000)]
PATCH: [ 887283 ] Menu cleanup
Perry Rapp [Sat, 31 Jan 2004 01:22:35 +0000 (01:22 +0000)]
[ 879536 ] Add MakePatchDirs source to repository
Perry Rapp [Sat, 31 Jan 2004 01:14:43 +0000 (01:14 +0000)]
PATCH: [ 882650 ] Move temp build files out of Build into BuildTmp (more)
Perry Rapp [Sat, 31 Jan 2004 01:05:14 +0000 (01:05 +0000)]
BUG: [ 887957 ] Some builds of ShellExtension need include dir fixed
Perry Rapp [Sat, 31 Jan 2004 00:10:25 +0000 (00:10 +0000)]
2004-01-30 WinMerge experimental release 2.1.5.8 (cvs)