OSDN Git Service
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'
Kimmo Varis [Wed, 1 Mar 2006 17:08:23 +0000 (17:08 +0000)]
PATCH: [
1395847 ] Integration with Rational ClearCase
- submitted by Gal Hammer
Kimmo Varis [Wed, 1 Mar 2006 16:48:29 +0000 (16:48 +0000)]
BUG: [
1440774 ] Test button for file filters enabled for no filter
- fix submitted by Gal Hammer
Kimmo Varis [Wed, 1 Mar 2006 16:37:18 +0000 (16:37 +0000)]
PATCH: [
1436855 ] Typo in lang files (change pactch to patch)
Tim Gerundt [Tue, 28 Feb 2006 21:01:25 +0000 (21:01 +0000)]
PATCH: [
1440383 ] Suggested addition to manual about bug reports
Kimmo Varis [Tue, 28 Feb 2006 18:40:01 +0000 (18:40 +0000)]
PATCH: [
1440435 ] Manual: add FAQ item about hiding similar lines in editor
Kimmo Varis [Tue, 28 Feb 2006 18:37:16 +0000 (18:37 +0000)]
PATCH: [
1440383 ] Suggested addition to manual about bug reports
- submitted by Perry
Perry Rapp [Tue, 28 Feb 2006 16:06:58 +0000 (16:06 +0000)]
BUG: [
1439360 ] Native languages sometimes suppressed in Unicode Build
Add note to CLanguageSelect::GetNativeLanguageNameString
explaining why codepage check is done even for Unicode build.
Src/Common: LanguageSelect.cpp
Perry Rapp [Mon, 27 Feb 2006 01:13:34 +0000 (01:13 +0000)]
BUG: [
1439350 ] Russian language name in LanguageSelect?
Src/Common: LanguageSelect.cpp
Perry Rapp [Sun, 26 Feb 2006 23:20:35 +0000 (23:20 +0000)]
PATCH: [
1434007 ] Move source control code out of MainFrm.cpp
Src: MainFrm.cpp MainFrm.h Merge.dsp
New Src: SourceControl.cpp
Perry Rapp [Sun, 26 Feb 2006 23:01:52 +0000 (23:01 +0000)]
PATCH: [
1439229 ] Fix CMergeDoc::SanityCheckD not to dereference illegal lines
BUG: [
1438390 ] Crash when editting the attached files
Src: MergeDoc.cpp
Perry Rapp [Sun, 26 Feb 2006 02:35:56 +0000 (02:35 +0000)]
PATCH: [
1435470 ] Remove CTextFile
(follow-on fix, forgot to remove from project)
Src: Merge.dsp
Perry Rapp [Sun, 26 Feb 2006 02:31:08 +0000 (02:31 +0000)]
PATCH: [
1435470 ] Remove CTextFile
Deleted Src\Common: textfile.cpp textfile.h
Kimmo Varis [Fri, 24 Feb 2006 21:36:47 +0000 (21:36 +0000)]
PATCH: [
1431607 ] Fix worddiff highlight error
-submitted by Perry
Kimmo Varis [Fri, 24 Feb 2006 19:06:52 +0000 (19:06 +0000)]
PATCH: [
1437758 ] Improve diff selection when selected diff not visible
Tim Gerundt [Thu, 23 Feb 2006 23:05:52 +0000 (23:05 +0000)]
PATCH: [
1437677 ] Various Updates in German Translation for WinMerge 2.5
Kimmo Varis [Thu, 23 Feb 2006 20:53:38 +0000 (20:53 +0000)]
PATCH: [
1436127 ] Add VS2003 runtimes to installer
Kimmo Varis [Wed, 22 Feb 2006 22:28:04 +0000 (22:28 +0000)]
PATCH: [
1434270 ] Fix difference counts
- submitted by Perry
Kimmo Varis [Wed, 22 Feb 2006 22:06:44 +0000 (22:06 +0000)]
PATCH: [
1430321 ] Swedish translation update and feedback on WinMerge 2.5.3.2
- by Hans Eriksson
Kimmo Varis [Wed, 22 Feb 2006 21:54:01 +0000 (21:54 +0000)]
PATCH: [
1428686 ] Catalan translation update
- by Jordi Vilar
Kimmo Varis [Wed, 22 Feb 2006 21:11:55 +0000 (21:11 +0000)]
PATCH: [
1395721 ] VS.NET 2003 warning of SEH bug
Kimmo Varis [Wed, 22 Feb 2006 15:58:16 +0000 (15:58 +0000)]
PATCH: [
1435431 ] Fix GenerateReport lines
- submitted by Perry
Tim Gerundt [Tue, 21 Feb 2006 21:51:38 +0000 (21:51 +0000)]
BUG: [
1435491 ] Developer instructions needs to be updated
Kimmo Varis [Tue, 21 Feb 2006 21:03:08 +0000 (21:03 +0000)]
PATCH: [
1433125 ] Trap errors from filesystem during actions
Kimmo Varis [Tue, 21 Feb 2006 15:13:09 +0000 (15:13 +0000)]
PATCH: [
1435514 ] Minor tweaks for installer
Kimmo Varis [Tue, 21 Feb 2006 14:41:42 +0000 (14:41 +0000)]
PATCH: [
1435488 ] Update for readme-developers.html
Kimmo Varis [Tue, 21 Feb 2006 14:38:37 +0000 (14:38 +0000)]
PATCH: [
1435384 ] Add context menu for diff pane
Perry Rapp [Tue, 21 Feb 2006 02:06:20 +0000 (02:06 +0000)]
PATCH: [
1405603 ] New Test dialog for file filters
(Forgot to do all the language resources)
and misc RC file fixes (eg, many fixes in editor proppage)
New: Src/Languages: WinMerge_Resource_Discrepencies.txt
Kimmo Varis [Mon, 20 Feb 2006 22:54:00 +0000 (22:54 +0000)]
Remove outdated planning file
Kimmo Varis [Mon, 20 Feb 2006 22:52:04 +0000 (22:52 +0000)]
Remove outdated and unused files
Perry Rapp [Mon, 20 Feb 2006 21:43:58 +0000 (21:43 +0000)]
PATCH: [
1433312 ] Add cvs tags to source files
Src: ByteComparator.cpp SharedFilterDlg.cpp StdAfx.cpp
TestFilterDlg.cpp TestFilterDlg.h ViewableWhitespace.cpp
Src/Common: SortHeaderCtrl.cpp SortHeaderCtrl.h UniFile.cpp
UniFile.h textfile.cpp textfile.h unicoder.cpp unicoder.h
varprop.cpp varprop.h version.cpp version.h
Perry Rapp [Mon, 20 Feb 2006 21:02:13 +0000 (21:02 +0000)]
PATCH: [
1405603 ] New Test dialog for file filters
Src: FileFilterMgr.cpp FileFilterMgr.h FileFiltersDlg.cpp
FileFiltersDlg.h Merge.dsp Merge.rc resource.h
Src new: TestFilterDlg.cpp TestFilterDlg.h
Kimmo Varis [Mon, 20 Feb 2006 19:54:15 +0000 (19:54 +0000)]
PATCH: [
1178743 ] Disable lang menu if no additional langs installed
Perry Rapp [Sun, 19 Feb 2006 21:34:35 +0000 (21:34 +0000)]
PATCH: [
1433353 ] Fix menu resources
Src: MainFrm.cpp Merge.cpp Merge.rc resource.h
Src/Languages/*: Merge*.rc
Perry Rapp [Sun, 19 Feb 2006 20:43:01 +0000 (20:43 +0000)]
Bugfix for just applied: PATCH: [
1433927 ] Fix external editor default and messages
Perry Rapp [Sun, 19 Feb 2006 20:37:24 +0000 (20:37 +0000)]
PATCH: [
1433927 ] Fix external editor default and messages
BUG: [
1433774 ] default editor is blank
Src: MainFrm.cpp Merge.cpp Merge.rc OptionsInit.cpp resource.h
Src/Languages/*: Merge*.rc
Perry Rapp [Sun, 19 Feb 2006 20:23:16 +0000 (20:23 +0000)]
PATCH: [
1424153 ] Remove VTS_PUI1 from lwdisp.h
BUG: [
1395475 ] VTS_UI1 & VTSPUI1 macro redefinition warnings (VS.NET)
Src\Common: lwdisp.h
Perry Rapp [Sun, 19 Feb 2006 20:04:53 +0000 (20:04 +0000)]
PATCH: [
1433931 ] Add comment before isBin checks in DirView
Src: DirView.cpp
Christian List [Sun, 19 Feb 2006 14:17:35 +0000 (14:17 +0000)]
[
1429125 ] Return number of diffs instead of true/false
Perry Rapp [Fri, 17 Feb 2006 23:47:39 +0000 (23:47 +0000)]
Bugfix for my previous checkin today: comment back in error handler
Bump version from 1.0.1.0 to 1.0.2.0
Plugins\src_VB\CompareMSExcelFiles:
CompareMSExcelFiles.vbp WinMergeScript.cls
Plugins\dlls:
CompareMSExcelFiles.dll (v1.0.2.0)
Compiled from current CVS (VB6) v1.0.2
Perry Rapp [Fri, 17 Feb 2006 22:51:13 +0000 (22:51 +0000)]
PATCH: [
1430464 ] Excel - compare macros, comments, document properties etc
Submitted by Arthur Barrett
Bump version from 1.0.0.0 to 1.0.1.0
Plugins\src_VB\CompareMSExcelFiles:
CompareMSExcelFiles.vbp WinMergeScript.cls
Plugins\dlls:
CompareMSExcelFiles.dll (v1.0.1.0)
Compiled from current CVS (VB6) v1.0.1
Perry Rapp [Fri, 17 Feb 2006 05:27:10 +0000 (05:27 +0000)]
BUG: [
1395483 ] Signed/unsigned mismatch warning from LocationView.cpp
Src: LocationView.cpp
Perry Rapp [Fri, 17 Feb 2006 02:13:21 +0000 (02:13 +0000)]
BUG: [
1395475 ] VTS_UI1 & VTSPUI1 macro redefinition warnings (VS.NET)
Fixed VTS_PUI1 (which previous patch for this bug missed).
Src\Common: lwdisp.h
Kimmo Varis [Thu, 16 Feb 2006 18:04:19 +0000 (18:04 +0000)]
PATCH: [
1424535 ] Czech Translation, Submitted by Jan Hryz
- improve folder compare columns dialog (idea for new arrows from Catalan translation)