OSDN Git Service
Kimmo Varis [Tue, 18 Apr 2006 15:57:43 +0000 (15:57 +0000)]
PATCH: [
1471767 ] Change Plugins.txt in Start-menu to Plugins
Kimmo Varis [Tue, 18 Apr 2006 15:44:04 +0000 (15:44 +0000)]
PATCH: [
1471760 ] Remove plugins.txt reference from component selection
Takashi Sawanaka [Tue, 18 Apr 2006 15:42:23 +0000 (15:42 +0000)]
PATCH: [
1445996 ] Fix wrong PgDown scrolling after mousescroll(2)
Src/editlib: ccrystaltextview2.cpp
Kimmo Varis [Wed, 12 Apr 2006 18:56:36 +0000 (18:56 +0000)]
WinMerge experimental release 2.5.3.6 (cvs)
Kimmo Varis [Wed, 12 Apr 2006 16:15:05 +0000 (16:15 +0000)]
PaTCH: [
1468783 ] Fix disabled scrollbars after loading files
Kimmo Varis [Wed, 12 Apr 2006 16:05:22 +0000 (16:05 +0000)]
PATCH: [
1468691 ] Center folder compare status dialog to mainframe
Kimmo Varis [Tue, 11 Apr 2006 18:31:15 +0000 (18:31 +0000)]
PATCH: [
1443719 ] xml output reports
- submitted by Perry, modified by me
Kimmo Varis [Tue, 11 Apr 2006 15:57:46 +0000 (15:57 +0000)]
PATCH: [
1467872 ] Fix diff navigation for first-line of diff
Kimmo Varis [Mon, 10 Apr 2006 16:21:17 +0000 (16:21 +0000)]
PATCH: [
1467305 ] Beep when long compare is ready
Tim Gerundt [Sun, 9 Apr 2006 20:51:17 +0000 (20:51 +0000)]
BUG: [
1461375 ] Forgot old patch #981526 for sgml.cpp, sh.cpp and tcl.cpp?
Kimmo Varis [Sun, 9 Apr 2006 15:48:30 +0000 (15:48 +0000)]
BUG: [
1465893 ] Compile error with VC6 (SuperComboBox.cpp)
- fix from Gal Hammer
Kimmo Varis [Sun, 9 Apr 2006 15:38:50 +0000 (15:38 +0000)]
BUG: [
1383719 ] ShellExtension resources opening in IDE fails
- fix from Sdottaka
Kimmo Varis [Sun, 9 Apr 2006 12:58:21 +0000 (12:58 +0000)]
BUG: [
1383719 ] ShellExtension resources opening in IDE fails
- fix from Sdottaka
Kimmo Varis [Thu, 6 Apr 2006 18:41:37 +0000 (18:41 +0000)]
BUG: [
1463137 ] MergeArgs.h is empty file?
Tim Gerundt [Wed, 5 Apr 2006 21:01:32 +0000 (21:01 +0000)]
PATCH: [
1461896 ] Syntax highlighting of HTML for ASP not complete
Kimmo Varis [Wed, 5 Apr 2006 15:56:47 +0000 (15:56 +0000)]
BUG: [
1460236 ] Splash localization is broken
Kimmo Varis [Wed, 5 Apr 2006 15:55:08 +0000 (15:55 +0000)]
PATCH: [
1445426 ] Clear PrivateBuild flag in SetResourceVersions.wsf
- submitted by Perry
Kimmo Varis [Wed, 5 Apr 2006 15:32:24 +0000 (15:32 +0000)]
BUG: [
1460236 ] Splash localization is broken
Kimmo Varis [Wed, 5 Apr 2006 15:09:40 +0000 (15:09 +0000)]
BUG: [
1461328 ] Commandline handling overwrites flags?
- fix from Gal Hammer
Kimmo Varis [Wed, 5 Apr 2006 15:01:32 +0000 (15:01 +0000)]
PATCH: [
1460749 ] Print relative paths to patch files
Takashi Sawanaka [Wed, 5 Apr 2006 13:26:39 +0000 (13:26 +0000)]
BUG: [
1458714 ] [Replace All] doesn't work
Src/editlib: ceditreplacedlg.cpp
Kimmo Varis [Mon, 27 Mar 2006 22:37:31 +0000 (22:37 +0000)]
PATCH: [
1441718 ] Auto Complete on files or folders selection
- submitted by Gal Hammer
Kimmo Varis [Mon, 27 Mar 2006 17:13:56 +0000 (17:13 +0000)]
PATCH: [
1458852 ] Fix UI for multiple file patches
Kimmo Varis [Mon, 27 Mar 2006 14:14:29 +0000 (14:14 +0000)]
PATCH: [
1459284 ] Update of MergeSwedish.rc for WinMerge 2.5.3.5+
- submitted by Hans Eriksson
Kimmo Varis [Sun, 26 Mar 2006 13:22:49 +0000 (13:22 +0000)]
PATCH: [
1406944 ] Compute text statistics in QuickCompare
Kimmo Varis [Sun, 26 Mar 2006 13:17:39 +0000 (13:17 +0000)]
PATCH: [
1406944 ] Compute text statistics in QuickCompare
Kimmo Varis [Sun, 26 Mar 2006 08:06:11 +0000 (08:06 +0000)]
PATCH: [
1458066 ] Use / as path delimiter in patch files
Kimmo Varis [Fri, 24 Mar 2006 21:20:54 +0000 (21:20 +0000)]
PATCH: [
1457203 ] Create patch from multiple files in folder compare
Tim Gerundt [Fri, 24 Mar 2006 21:14:06 +0000 (21:14 +0000)]
PATCH: [
1457946 ] Add known issue about 64bit windows and shell extension
Tim Gerundt [Fri, 24 Mar 2006 20:41:13 +0000 (20:41 +0000)]
PATCH: [
1457306 ] Revamped Visual Basic syntax highlighter
Kimmo Varis [Fri, 24 Mar 2006 16:15:46 +0000 (16:15 +0000)]
BUG: [
1455656 ] GPL text still contains 'How to Apply These Terms...'
Kimmo Varis [Wed, 22 Mar 2006 18:08:09 +0000 (18:08 +0000)]
WinMerge experimental release 2.5.3.5 (cvs)
Kimmo Varis [Wed, 22 Mar 2006 17:18:03 +0000 (17:18 +0000)]
PATCH: [
1406944 ] Compute text statistics in QuickCompare
Kimmo Varis [Wed, 22 Mar 2006 16:23:46 +0000 (16:23 +0000)]
PATCH: [
1455706 ] Catalan translation update
- submitted by Jordi Vilar
Tim Gerundt [Tue, 21 Mar 2006 21:54:05 +0000 (21:54 +0000)]
PATCH: [
1455663 ] Add new keywords to Visual Basic highlighter
Kimmo Varis [Tue, 21 Mar 2006 20:15:01 +0000 (20:15 +0000)]
Remove obsolete splashscreen image (for old splashscreen)
Kimmo Varis [Tue, 21 Mar 2006 20:09:14 +0000 (20:09 +0000)]
PATCH: [
1455430 ] New Splash Screen Revision 2
- submitted by Alexander Skinner
Kimmo Varis [Tue, 21 Mar 2006 20:02:11 +0000 (20:02 +0000)]
PATCH: [
1454720 ] Fix resizable dialogs missing captionbar close button
Kimmo Varis [Tue, 21 Mar 2006 19:24:33 +0000 (19:24 +0000)]
PATCH: [
1452288 ] Add ASP.NET filefilter
- by Jon Galloway and Josh Blair
Kimmo Varis [Tue, 21 Mar 2006 19:19:41 +0000 (19:19 +0000)]
PATCH: [
1448599 ] WinMerge Program Icon Set
- submitted by Alexander Skinner
Kimmo Varis [Sun, 19 Mar 2006 08:55:37 +0000 (08:55 +0000)]
PATCH: [
1453252 ] Fix closing filecompare after error
Kimmo Varis [Sun, 19 Mar 2006 08:43:23 +0000 (08:43 +0000)]
PATCH: [
1449892 ] Add compare method to configlog
Tim Gerundt [Fri, 17 Mar 2006 21:21:30 +0000 (21:21 +0000)]
PATCH: [
1449571 ] Add '*.pm' and '*.plx' to Perl highlighter
Tim Gerundt [Wed, 15 Mar 2006 18:28:06 +0000 (18:28 +0000)]
PATCH: [
1449943 ] Web: Use new logo
Perry Rapp [Wed, 15 Mar 2006 17:59:01 +0000 (17:59 +0000)]
BUG: [
1449947 ] Looks like diffutils bug for mac-style
BUG: [
1449949 ] crash comparing two simple test mac files
Fix looping which missed mac case
diffutils\src: IO.C
Kimmo Varis [Wed, 15 Mar 2006 17:54:12 +0000 (17:54 +0000)]
PATCH: [
1449868 ] Fix difference counts
Kimmo Varis [Tue, 14 Mar 2006 17:16:20 +0000 (17:16 +0000)]
PATCH: [
1449038 ] Add Help-button to Open-dialog
Kimmo Varis [Tue, 14 Mar 2006 16:56:41 +0000 (16:56 +0000)]
PATCH: [
1449038 ] Add Help-button to Open-dialog
Kimmo Varis [Mon, 13 Mar 2006 16:22:54 +0000 (16:22 +0000)]
PATCH: [
1447927 ] Add Help Search to menu, open correct manual location
Kimmo Varis [Sun, 12 Mar 2006 10:53:36 +0000 (10:53 +0000)]
PATCH: [
1448004 ] Update installer doc
Kimmo Varis [Sun, 12 Mar 2006 10:49:07 +0000 (10:49 +0000)]
PATCH: [
1447991 ] Let installer pick lang files from build folder
Kimmo Varis [Sat, 11 Mar 2006 20:46:16 +0000 (20:46 +0000)]
PATCH: [
1447806 ] Use JPEG splashscreen
Kimmo Varis [Sat, 11 Mar 2006 18:07:37 +0000 (18:07 +0000)]
PATCH: [
1447348 ] Build language files to Build directory
Kimmo Varis [Sat, 11 Mar 2006 13:20:35 +0000 (13:20 +0000)]
Add Alexander Skinner to contributors list
Kimmo Varis [Sat, 11 Mar 2006 13:13:50 +0000 (13:13 +0000)]
Change Splashscreen text to according to Dean's wish
Kimmo Varis [Sat, 11 Mar 2006 13:07:37 +0000 (13:07 +0000)]
PaTCH: [
1445377 ] WinMerge Logos (72 DPI)
- submitted by Alexander Skinner
Kimmo Varis [Sat, 11 Mar 2006 12:46:42 +0000 (12:46 +0000)]
BUG: [
1447851 ] Not enough space for version info in new splash screen
Kimmo Varis [Sat, 11 Mar 2006 09:19:50 +0000 (09:19 +0000)]
PATCH: [
1447506 ] Don't include splash bitmap to lang files
Takashi Sawanaka [Sat, 11 Mar 2006 05:46:02 +0000 (05:46 +0000)]
BUG: [
1441389 ] Comparing root directory - mysterious
Src: DiffWrapper.cpp
Perry Rapp [Sat, 11 Mar 2006 00:50:56 +0000 (00:50 +0000)]
PATCH: [
1447547 ] Add more comments to CMergeDoc::PrimeTextBuffers
Src: MergeDoc.cpp
Perry Rapp [Sat, 11 Mar 2006 00:49:32 +0000 (00:49 +0000)]
PATCH: [
1447539 ] Add explanatory comment to CCrystalTextBuffer::MoveLine
Src/editlib: ccrystaltextbuffer.cpp
Kimmo Varis [Fri, 10 Mar 2006 19:17:46 +0000 (19:17 +0000)]
Remove unneeded splash image (Splash2.bmp) as noted in Patch item #
1441392
Perry Rapp [Fri, 10 Mar 2006 18:24:58 +0000 (18:24 +0000)]
PATCH: [
1445434 ] SyntaxColors scrambling reg values
Src: SyntaxColors.cpp
Kimmo Varis [Fri, 10 Mar 2006 16:27:16 +0000 (16:27 +0000)]
WinMerge experimental release 2.5.3.4 (cvs)
Kimmo Varis [Thu, 9 Mar 2006 23:17:13 +0000 (23:17 +0000)]
BUG: [
1446648 ] cvs trunk doesn't compile
Kimmo Varis [Thu, 9 Mar 2006 16:30:07 +0000 (16:30 +0000)]
PATCH: [
1445996 ] Fix wrong PgDown scrolling after mousescroll
Kimmo Varis [Thu, 9 Mar 2006 16:25:20 +0000 (16:25 +0000)]
PATCH: [
1445719 ] Fix broken installer (2.5.3.3)
Kimmo Varis [Wed, 8 Mar 2006 20:17:14 +0000 (20:17 +0000)]
PATCH: [
1441392 ] New Splash Screen - additional positioning tweak
- submitted by Alexander Skinner
Kimmo Varis [Wed, 8 Mar 2006 20:10:36 +0000 (20:10 +0000)]
PATCH: [
1441392 ] New Splash Screen
- submitted by Alexander Skinner
Perry Rapp [Wed, 8 Mar 2006 19:05:15 +0000 (19:05 +0000)]
Add two minor comments to PropRegistry.
PropRegistry.cpp
Perry Rapp [Wed, 8 Mar 2006 07:14:37 +0000 (07:14 +0000)]
PATCH: [
1442844 ] Make GetFileExt easier to understand
Src: MergeDoc.cpp MergeDoc.h
Perry Rapp [Wed, 8 Mar 2006 07:06:57 +0000 (07:06 +0000)]
Bump MakeResDll version from 1.0.6.0 to 1.0.7.0.
MakeResDll: MakeResDll.rc
Perry Rapp [Wed, 8 Mar 2006 07:04:05 +0000 (07:04 +0000)]
PATCH: [
1443391 ] Update MakeResDll for VS.NET 2005
MakeResDll: MakeResDll.cpp MakeResDll.dsp MakeResDll.rc
StdAfx.cpp StdAfx.h readme.txt resource.h
New MakeResDll: Merge.ico VsVersionDlg.cpp VsVersionDlg.h
Perry Rapp [Wed, 8 Mar 2006 06:44:55 +0000 (06:44 +0000)]
2006-03-08 Perry
Update MakeResDll readme with current information (MSVC.Net 2003 works
now), and better explanation of how to pick a specific version.
MakeResDll: readme.txt
Kimmo Varis [Mon, 6 Mar 2006 16:23:44 +0000 (16:23 +0000)]
WinMerge experimental release 2.5.3.3 (cvs)
Kimmo Varis [Mon, 6 Mar 2006 15:56:56 +0000 (15:56 +0000)]
Bump manual version to 1.2.2
Perry Rapp [Mon, 6 Mar 2006 15:45:25 +0000 (15:45 +0000)]
PATCH: [
1443841 ] Add header comment to Src/Changes.txt
Src: Changes.txt
Perry Rapp [Mon, 6 Mar 2006 15:37:54 +0000 (15:37 +0000)]
BUG: [
1444211 ] bug in current SelectFile
Src: Merge.cpp
Tim Gerundt [Mon, 6 Mar 2006 13:43:26 +0000 (13:43 +0000)]
BUG: [
1442865 ] languages lack generate patch & report bitmaps
Tim Gerundt [Mon, 6 Mar 2006 10:32:55 +0000 (10:32 +0000)]
BUG: [
1442866 ] German RC format error
Perry Rapp [Mon, 6 Mar 2006 04:41:44 +0000 (04:41 +0000)]
PATCH: [
1435361 ] Fix and cleanup project file code
Src: DiffContext.cpp DiffContext.h DirDoc.cpp MainFrm.cpp
Merge.cpp Merge.h Merge.rc MergeArgs.cpp ProjectFile.cpp
resource.h
Src/Languages/*: Merge*.rc
Perry Rapp [Mon, 6 Mar 2006 03:01:38 +0000 (03:01 +0000)]
PATCH: [
1441050 ] Fix RCLocalizationHelper
Fix RCLocalizationHelper to detect in-place changes.
Also fail if substitutions expand string (which is better
than corrupting string).
Created ChangeLog (this file).
Added file headers including CVS Ids to various source files.
Bump version from 1.0.2.0 to 1.0.3.0 (and copyright date to 2006).
Plugins\src_VCPP\RCLocalizationHelper:
PatternSet.cpp PatternSet.h PluginError.cpp PluginError.h
RCLocalizationHelper.dsp RCLocalizationHelper.rc WinMergeScript.cpp
New ChangeLog.txt
Plugins\dlls:
RCLocalizationHelper.dll (v1.0.3.0)
Compiled from current CVS (ANSI) (VC6sp6) Release MinDependency, v1.0.3.0
RCLocalizationHelperU.dll (v1.0.3.0)
Compiled from current CVS (UNICODE) (VC6sp6) Unicode Release MinDependency, v1.0.3.0
Perry Rapp [Sat, 4 Mar 2006 18:25:09 +0000 (18:25 +0000)]
PATCH: [
1442791 ] Update MakeResDll project
Add Changes.txt to project.
Bump MakeResDll version from 1.0.5.0 to 1.0.6.0.
Change version copyright from "2003" to "2003-2006"
MakeResDll: MakeResDll.dsp MakeResDll.rc
Perry Rapp [Sat, 4 Mar 2006 18:17:46 +0000 (18:17 +0000)]
PATCH: [
1442238 ] Fix MakeResDll to work with VS.NET 2003
Bump version from 1.0.4.0 to 1.0.5.0.
MakeResDll: MakeResDll.cpp MakeResDll.rc
Perry Rapp [Sat, 4 Mar 2006 18:08:51 +0000 (18:08 +0000)]
PATCH: [
1442134 ] MakeResDll: check that RC file exists
Bump version from 1.0.3.0 to 1.0.4.0.
MakeResDll: MakeResDll.cpp MakeResDll.rc resource.h
Perry Rapp [Sat, 4 Mar 2006 17:54:58 +0000 (17:54 +0000)]
PATCH: [
1424636 ] New BuildOneLanguage.vbs & fix MakeResDll exit
MakeResDll: MakeResDll.cpp StdAfx.h
Src\Languages: BuildDll.bat BuildOneLanguage.vbs
Perry Rapp [Sat, 4 Mar 2006 16:08:27 +0000 (16:08 +0000)]
PATCH: [
1396506 ] customizable text colors
Fix compilation (MSVC.NET 2003 correctly gave error that MSVC6 ignored)
Src: PreferencesDlg.cpp
Perry Rapp [Sat, 4 Mar 2006 08:44:24 +0000 (08:44 +0000)]
PATCH: [
1396506 ] customizable text colors
Add missing files
Src: new PropTextColors.cpp PropTextColors.h
Perry Rapp [Sat, 4 Mar 2006 03:47:22 +0000 (03:47 +0000)]
PATCH: [
1442082 ] Fix MakeDirs to not error if directory exists
Src\Common: coretools.cpp
Perry Rapp [Sat, 4 Mar 2006 02:48:26 +0000 (02:48 +0000)]
PATCH: [
1439335 ] Reset cwd in Merge.cpp SelectFile
Src: Merge.cpp OpenDlg.cpp
Perry Rapp [Sat, 4 Mar 2006 02:36:46 +0000 (02:36 +0000)]
PATCH: [
1396506 ] customizable text colors
Src: MainFrm.cpp MainFrm.h Merge.dsp Merge.rc MergeDoc.cpp
OptionsDef.h OptionsInit.cpp PropArchive.cpp PropArchive.h
PropCodepage.cpp PropCodepage.h PropColors.cpp PropColors.h
PropCompare.cpp PropCompare.h PropEditor.h PropGeneral.h
PropRegistry.h PropSyntaxColors.cpp PropSyntaxColors.h
PropVss.h SyntaxColors.cpp SyntaxColors.h resource.h
Src\Common: PreferencesDlg.cpp PreferencesDlg.h
Src/Languages/*: Merge*.rc
Perry Rapp [Fri, 3 Mar 2006 22:51:28 +0000 (22:51 +0000)]
PATCH: [
1424636 ] New BuildOneLanguage.vbs & fix MakeResDll exit
MakeResDll: MakeResDll.cpp StdAfx.h
Src\Languages: BuildDll.bat BuildOneLanguage.vbs
Perry Rapp [Fri, 3 Mar 2006 22:27:47 +0000 (22:27 +0000)]
PATCH: [
1442699 ] New Changes.txt file for MakeResDll
Add Changes.txt change log (this file).
MakeResDll: new Changes.txt
Kimmo Varis [Fri, 3 Mar 2006 16:27:13 +0000 (16:27 +0000)]
PATCH: [
1442107 ] Move About-dialog code to separate files from Merge.cpp
Kimmo Varis [Fri, 3 Mar 2006 16:06:52 +0000 (16:06 +0000)]
PATCH: [
1441387 ] Improve File Encoding dialog
Tim Gerundt [Thu, 2 Mar 2006 22:11:01 +0000 (22:11 +0000)]
PATCH: [
1437770 ] Icons for 'Generate Patch' and 'Generate Report'
Kimmo Varis [Thu, 2 Mar 2006 19:06:30 +0000 (19:06 +0000)]
PATCH: [
1441124 ] Improve filter test dialog
Kimmo Varis [Wed, 1 Mar 2006 21:47:09 +0000 (21:47 +0000)]
PATCH: [
1424535 ] Czech Translation, Submitted by Jan Hryz
- improve unpacker selection dialog and new filter location selection dialog
Tim Gerundt [Wed, 1 Mar 2006 20:55:46 +0000 (20:55 +0000)]
PATCH: [
1441282 ] Website changes for new stable release 2.4.6
Tim Gerundt [Wed, 1 Mar 2006 19:37:08 +0000 (19:37 +0000)]
PATCH: [
1438233 ] New icons for 'notequalfile', 'lfile' and 'rfile'