OSDN Git Service
Kimmo Varis [Mon, 16 Jan 2006 21:41:48 +0000 (21:41 +0000)]
PATCH: [
1406203 ] Open unique files to external editor
Perry Rapp [Sun, 15 Jan 2006 18:06:20 +0000 (18:06 +0000)]
PATCH: [
1333600 ] Get rid of global MainFrame pointer (part1)
Src: DirActions.cpp DirDoc.cpp DirView.cpp FileActionScript.cpp
MainFrm.cpp MainFrm.h Merge.cpp MergeDoc.cpp MergeEditView.cpp
OpenDlg.cpp PropRegistry.cpp
Src\Common: PreferencesDlg.cpp
Perry Rapp [Sat, 14 Jan 2006 22:04:26 +0000 (22:04 +0000)]
PATCH: [
1403457 ] Support Unicode file filter files
Remove limitation (file filters now handle unicode files)
(reverses my PATCH: [
1401001 ])
Manual: Filters.xml
Perry Rapp [Sat, 14 Jan 2006 21:58:51 +0000 (21:58 +0000)]
PATCH: [
1403457 ] Support Unicode file filter files
Src: FileFilterMgr.cpp
Kimmo Varis [Sat, 14 Jan 2006 16:57:47 +0000 (16:57 +0000)]
PATCH: [
1405340 ] Add XP shadow to folderskip.ico
- submitted by Tim
Kimmo Varis [Sat, 14 Jan 2006 14:09:12 +0000 (14:09 +0000)]
PATCH: [
1385672 ] Replace some 'file's with 'item's
Kimmo Varis [Sat, 14 Jan 2006 13:29:56 +0000 (13:29 +0000)]
PATCH: [
1372044 ] Add FileActionScript for folder compare actions
Perry Rapp [Sat, 14 Jan 2006 04:00:24 +0000 (04:00 +0000)]
TODO: [
1395638 ] CChildFrame::PreCreateWindow() does nothing
Src: ChildFrm.cpp ChildFrm.h MainFrm.cpp
Tim Gerundt [Fri, 13 Jan 2006 21:59:06 +0000 (21:59 +0000)]
PATCH: [
1404317 ] Web: Known Limitations page
Perry Rapp [Fri, 13 Jan 2006 17:49:54 +0000 (17:49 +0000)]
PATCH: [
1403893 ] Fix whitespace error in ByteCompare
BUG: [
1400779 ] Whitespace bug in ByteComparator
Src: ByteComparator.cpp
Perry Rapp [Fri, 13 Jan 2006 17:46:06 +0000 (17:46 +0000)]
PATCH: [
1403454 ] Add comment to UniStdioFile.h
(Cosmetic)
Src/Common: UniFile.h
Kimmo Varis [Fri, 13 Jan 2006 16:27:40 +0000 (16:27 +0000)]
PATCH: [
1039677 ] Alter text of Reset button label
Kimmo Varis [Fri, 13 Jan 2006 16:04:50 +0000 (16:04 +0000)]
PATCH: [
1399263 ] Captioned panes (new style) - apply to languages
Kimmo Varis [Thu, 12 Jan 2006 21:14:08 +0000 (21:14 +0000)]
PATCH: [
1399738 ] Filename bars to use caption colors
Kimmo Varis [Thu, 12 Jan 2006 18:29:22 +0000 (18:29 +0000)]
PATCH: [
1399263 ] Captioned panes (new style)
Tim Gerundt [Thu, 12 Jan 2006 17:04:38 +0000 (17:04 +0000)]
PATCH: [
1403412 ] German: Option 'Line Difference Coloring' looks broken
Tim Gerundt [Wed, 11 Jan 2006 22:11:52 +0000 (22:11 +0000)]
PATCH: [
1402858 ] Web: New background color for 'important' and 'note'
Kimmo Varis [Wed, 11 Jan 2006 17:48:30 +0000 (17:48 +0000)]
WinMerge beta release 2.5.2
Kimmo Varis [Wed, 11 Jan 2006 17:42:56 +0000 (17:42 +0000)]
PATCH: [
1401001 ] Add note to filters manual that Unicode is not supported
- submitted by Perry
Kimmo Varis [Wed, 11 Jan 2006 17:32:53 +0000 (17:32 +0000)]
PATCH: [
1382020 ] New FAQ entry for large file Quick Compare
- submitted by Perry
Kimmo Varis [Wed, 11 Jan 2006 17:27:45 +0000 (17:27 +0000)]
Fix EOL type back to DOS - last commit changed it to UNIX by accident.
Kimmo Varis [Wed, 11 Jan 2006 17:25:42 +0000 (17:25 +0000)]
Update copyright year, WinMerge version to 2.5 and revision
Kimmo Varis [Wed, 11 Jan 2006 17:05:32 +0000 (17:05 +0000)]
BUG: [
1400829 ] Crash trying to open location pane context menu
Kimmo Varis [Wed, 11 Jan 2006 17:03:14 +0000 (17:03 +0000)]
PATCH: [
1400845 ] Allow Shift+Ctrl+F3 to search selected text backwards
- with addition from Takashi for Shift+F3 backwards search
Kimmo Varis [Wed, 11 Jan 2006 16:39:07 +0000 (16:39 +0000)]
PATCH: [
1402774 ] Use dark red color for 'binarydiff.ico'
- submitted by Tim
Tim Gerundt [Tue, 10 Jan 2006 23:14:06 +0000 (23:14 +0000)]
PATCH: [
1401420 ] New 'MergeDir' icon
Perry Rapp [Mon, 9 Jan 2006 23:51:16 +0000 (23:51 +0000)]
PATCH: [
1400830 ] Fix drop to only do LoadProjectFile when 1 file dropped
BUG: [
1400797 ] Dropping two project files doesn't work to compare them
(Also fixes extension test to be case-sensitive)
Src: MainFrm.cpp
Perry Rapp [Mon, 9 Jan 2006 23:47:09 +0000 (23:47 +0000)]
Move a change note of mine from readme.txt to correct location in Changes.txt. Add note to top of readme.txt to try to help prevent this sort of mistake in the future.
Tim Gerundt [Mon, 9 Jan 2006 21:22:15 +0000 (21:22 +0000)]
BUG: [
1394597 ] l10n status page is outdated
Perry Rapp [Sun, 8 Jan 2006 23:58:04 +0000 (23:58 +0000)]
BUG [
1394706 ] IgnoreCommentsC.h in cvs (shouldn't be)
Plugins\src_VCPP\IgnoreCommentsC
Deleted IgnoreCommentsC.h (automatically generated file)
Perry Rapp [Sun, 8 Jan 2006 23:49:13 +0000 (23:49 +0000)]
BUG: [
1396222 ] CDirView::MoveSelection() is confused
(Rename MoveSelection to MoveFocus & add more commenting)
Src: DirActions.cpp DirView.cpp DirView.h
Perry Rapp [Sun, 8 Jan 2006 23:34:27 +0000 (23:34 +0000)]
BUG: [
1396950 ] Manual installation doesn't specify admin access
Manual: Install.xml
Tim Gerundt [Sun, 8 Jan 2006 22:05:16 +0000 (22:05 +0000)]
Add "setCharset('UTF-8')" to file instructions.php
Perry Rapp [Sat, 7 Jan 2006 18:26:28 +0000 (18:26 +0000)]
PATCH: [
1398959 ] Implement GuessEncoding in QuickCompare
Src: codepage_detect.cpp DiffWrapper.cpp DiffWrapper.h
Perry Rapp [Sat, 7 Jan 2006 01:26:13 +0000 (01:26 +0000)]
PATCH: [
1398064 ] Catalan translation update
By Jordi Vilar
Src/Languages/Catalan: MergeCatalan.rc
Perry Rapp [Fri, 6 Jan 2006 02:22:15 +0000 (02:22 +0000)]
Transcode instructions.php into UTF-8
(example above line 52 was in CP1252)
(example below line 52 was in GB2312)
Web\developer\l10n: instructions.php
Kimmo Varis [Thu, 5 Jan 2006 18:20:50 +0000 (18:20 +0000)]
WinMerge experimental release 2.5.0.5 (cvs)
Tim Gerundt [Wed, 4 Jan 2006 23:05:10 +0000 (23:05 +0000)]
PATCH: [
1394598 ] Small addition to translation instructions
Kimmo Varis [Wed, 4 Jan 2006 21:51:22 +0000 (21:51 +0000)]
PATCH: [
1396413 ] Update Open dialog controls when its activated
Kimmo Varis [Wed, 4 Jan 2006 21:36:46 +0000 (21:36 +0000)]
PATCH: [
1393635 ] Save pane sizes and positions when they change
Tim Gerundt [Wed, 4 Jan 2006 12:49:21 +0000 (12:49 +0000)]
PATCH: [
1394596 ] Make l10n web page more detailed
Perry Rapp [Wed, 4 Jan 2006 00:03:35 +0000 (00:03 +0000)]
Cosmetic; normalizing blank lines to agree with English Merge.rc
Src\Languages:
Brazilian\MergeBrazilian.rc
ChineseSimplified\MergeChineseSimplified.rc
Korean\MergeKorean.rc
Norwegian\MergeNorwegian.rc
Kimmo Varis [Tue, 3 Jan 2006 20:59:44 +0000 (20:59 +0000)]
PATCH: [
1383262 ] Fix bitmap leak in ShellExtension
- also bump version number to 1.7.1, submitted by Perry
Kimmo Varis [Tue, 3 Jan 2006 18:07:04 +0000 (18:07 +0000)]
PATCH: [
1395584 ] Update CSizingControlBar to latest version
Kimmo Varis [Tue, 3 Jan 2006 18:04:22 +0000 (18:04 +0000)]
PATCH: [
1394877 ] Find selected text with Ctrl+F3
Kimmo Varis [Tue, 3 Jan 2006 17:38:28 +0000 (17:38 +0000)]
PATCH: [
1394877 ] Find selected text with Ctrl+F3
Takashi Sawanaka [Tue, 3 Jan 2006 13:59:03 +0000 (13:59 +0000)]
PATCH: [
1390104 ] fix for BUG: [
1384069 ] Wrapped lines have incorrect column
Perry Rapp [Tue, 3 Jan 2006 02:04:45 +0000 (02:04 +0000)]
PATCH: [
1212161 ] Fix handling of \r\n in ByteComparator
Src: ByteComparator.cpp
Perry Rapp [Tue, 3 Jan 2006 01:43:52 +0000 (01:43 +0000)]
BUG: [
1390849 ] cvs trunk MergeChineseSimplified doesn't compile
Src/Languages: ChineseSimplified: MergeChineseSimplified.rc
Perry Rapp [Tue, 3 Jan 2006 01:36:05 +0000 (01:36 +0000)]
PATCH: [
1391550 ] vbs script to check & optionally merge WinMerge resources
Src: new CheckTranslations.vbs
Perry Rapp [Tue, 3 Jan 2006 01:32:33 +0000 (01:32 +0000)]
PATCH: [
1383802 ] Cleanup line difference options in Editor-options
Translations
Src/Language: */Merge*.rc
Perry Rapp [Tue, 3 Jan 2006 01:18:25 +0000 (01:18 +0000)]
PATCH: [
1383802 ] Cleanup line difference options in Editor-options
Src: Merge.rc PropEditor.cpp PropEditor.h resource.h
Kimmo Varis [Mon, 2 Jan 2006 21:40:48 +0000 (21:40 +0000)]
PATCH: [
1395018 ] Small cleanup for CMergeDoc::PrimeTextBuffers()
Kimmo Varis [Mon, 2 Jan 2006 21:29:29 +0000 (21:29 +0000)]
PATCH: [
1395474 ] Define WINVER for compiling with VS.net
Perry Rapp [Mon, 2 Jan 2006 20:05:41 +0000 (20:05 +0000)]
BUG: [
1395494 ] stringdiffs.cpp / LastChar() returning uninitialized value?
Src: stringdiffs.cpp
Perry Rapp [Mon, 2 Jan 2006 20:02:51 +0000 (20:02 +0000)]
BUG: [
1395497 ] Unused local variables in CMergeDoc::GetWordDiffArray()
(Delete unused variables)
Src: MergeDocLineDiffs.cpp
Perry Rapp [Mon, 2 Jan 2006 19:39:01 +0000 (19:39 +0000)]
PATCH: [
1395487 ] Unused local variable in UniStdioFile::DoOpen()
Src/Common: UniFile.cpp
Kimmo Varis [Mon, 2 Jan 2006 19:01:21 +0000 (19:01 +0000)]
Remove unused variable from VSSHelper.cpp/VSSHelper::ReLinkVCProj()
Perry Rapp [Mon, 2 Jan 2006 07:05:15 +0000 (07:05 +0000)]
BUG: [
1394707 ] Copy&paste compilation error in IgnoreFieldsComma
Fix include to say IgnoreFieldsComma.h (not IgnoreFieldsTab.h)
Plugins\src_VCPP\IgnoreFieldsComma\WinMergeScript.cpp
Perry Rapp [Mon, 2 Jan 2006 06:56:37 +0000 (06:56 +0000)]
PATCH: [
1394073 ] Fix ByteComparator: m_bol0
(Change in ByteComparator.h is cosmetic typo fix in comment)
(Fixes some bad tabbing as well)
Src: ByteComparator.cpp ByteComparator.h
Perry Rapp [Mon, 2 Jan 2006 06:42:38 +0000 (06:42 +0000)]
BUG: [
1395107 ] MergeKorean.rc not compile in cvs trunk
(resource.h => ..\..\resource.h fix missed Korean somehow)
Src/Languages/Korean: MergeKorean.rc
Perry Rapp [Mon, 2 Jan 2006 05:31:37 +0000 (05:31 +0000)]
PATCH: [
1394717 ] Fix resource.h include for translations
Src/Languages: */Merge*.rc
Src/Languages deleted: UpdateAll_resource_h.bat
Src/Languages deleted: */resource.h (localized versions of resource.h)
Perry Rapp [Mon, 2 Jan 2006 04:55:19 +0000 (04:55 +0000)]
PATCH: [
1392647 ] Prefix members with m_ in storage_for_plugins
Src/Common: multiformatText.cpp multiformatText.h
Kimmo Varis [Sun, 1 Jan 2006 23:37:49 +0000 (23:37 +0000)]
Add Gal Hammer to contributors list
Kimmo Varis [Sun, 1 Jan 2006 23:33:16 +0000 (23:33 +0000)]
PATCH: [
1394759 ] Allows quotes in Rational ClearCase checkout comment
- submitted by Gal Hammer
Perry Rapp [Sun, 1 Jan 2006 16:16:08 +0000 (16:16 +0000)]
BUG: [
1394857 ] cvs trunk does not compile, ANSI, FindEncodingIdFromNameOrAl
Src: codepage_detect.cpp
Kimmo Varis [Sun, 1 Jan 2006 16:04:06 +0000 (16:04 +0000)]
BUG: [
1394851 ] cvs trunk does not compile (DirScan.cpp, sRule)
Kimmo Varis [Sun, 1 Jan 2006 15:15:42 +0000 (15:15 +0000)]
PATCH: [
1394464 ] Find again code doesn't recognize dos/mac EOLs
Kimmo Varis [Sun, 1 Jan 2006 15:08:34 +0000 (15:08 +0000)]
PATCH: [
1392347 ] Fix status after synching unique binary files
Perry Rapp [Sat, 31 Dec 2005 19:44:19 +0000 (19:44 +0000)]
PATCH: [
1393979 ] Delete unused DiffWrapper fnc cleanup_script
Src: DiffWrapper.cpp
Perry Rapp [Sat, 31 Dec 2005 19:30:18 +0000 (19:30 +0000)]
PATCH: [
1394247 ] Fix GuessEncoding recognition of codepages
BUG: [
1394234 ] GuessEncodings fails to recognize CP-437
Src: codepage_detect.cpp
Perry Rapp [Fri, 30 Dec 2005 23:43:12 +0000 (23:43 +0000)]
PATCH: [
1392229 ] Fix Column item handling
Src: DirView.h DirViewColHandler.cpp DirViewColItems.cpp
DirViewColItems.h
Perry Rapp [Fri, 30 Dec 2005 22:58:16 +0000 (22:58 +0000)]
PATCH: [
1393239 ] Split functions out of RunFileDiff
Src: DiffWrapper.cpp DiffWrapper.h
Perry Rapp [Fri, 30 Dec 2005 01:57:44 +0000 (01:57 +0000)]
PATCH: [
1212368 ] Display correct paths in context patches
(Post-application)
Revising patched code, removing unneeded dispname added when patch applied
Src: DiffWrapper.cpp
diffutils\src: CONTEXT.C DIFF.H
Perry Rapp [Fri, 30 Dec 2005 01:11:45 +0000 (01:11 +0000)]
PATCH: [
1391732 ] Do not offer to unify codepages in UNICODE build
Also introduces new error IDS_DIFFERENT_UNICODINGS and new
global function IsUnicodeBuild.
Doing language synchronizations for this patch.
Src: Merge.rc
Languages\Brazilian\MergeBrazilian.rc
Languages\Bulgarian\MergeBulgarian.rc
Languages\Catalan\MergeCatalan.rc
Languages\ChineseSimplified\MergeChineseSimplified.rc
Languages\ChineseTraditional\MergeChineseTraditional.rc
Languages\Czech\MergeCzech.rc
Languages\Danish\MergeDanish.rc
Languages\Dutch\MergeDutch.rc
Languages\German\MergeGerman.rc
Languages\Hungarian\MergeHungarian.rc
Languages\Italian\MergeItalian.rc
Languages\Japanese\MergeJapanese.rc
Languages\Korean\MergeKorean.rc
Languages\Norwegian\MergeNorwegian.rc
Languages\Polish\MergePolish.rc
Languages\Russian\MergeRussian.rc
Languages\Slovak\MergeSlovak.rc
Languages\Spanish\MergeSpanish.rc
Languages\Swedish\MergeSwedish.rc
Languages\Turkish\MergeTurkish.rc
Perry Rapp [Fri, 30 Dec 2005 00:57:48 +0000 (00:57 +0000)]
PATCH: [
1390454 ] new commandline arguments (prediffer, ignorews...)
Src: ConfigLog.cpp DirDoc.cpp DirDoc.h FileTransform.cpp
MainFrm.cpp MainFrm.h Merge.cpp Merge.dsp Merge.h
MergeEditView.cpp MergeEditView.h
PluginManager.cpp PluginManager.h Plugins.cpp Plugins.h
ProjectFile.cpp
Src New files: MergeArgs.h MergeArgs.cpp
Src/Common: CmdArgs.cpp CmdArgs.h OptionsMgr.cpp OptionsMgr.h
Perry Rapp [Fri, 30 Dec 2005 00:25:48 +0000 (00:25 +0000)]
PATCH: [
1212368 ] Display correct paths in context patches
Src: DiffWrapper.cpp DiffWrapper.h
diffutils\src: CONTEXT.C DIFF.H
Perry Rapp [Thu, 29 Dec 2005 23:54:19 +0000 (23:54 +0000)]
PATCH: [
1391766 ] Sync language resources to English
Src: Merge.rc
Languages\Brazilian\MergeBrazilian.rc
Languages\Bulgarian\MergeBulgarian.rc
Languages\Catalan\MergeCatalan.rc
Languages\ChineseSimplified\MergeChineseSimplified.rc
Languages\ChineseTraditional\MergeChineseTraditional.rc
Languages\Czech\MergeCzech.rc
Languages\Danish\MergeDanish.rc
Languages\Dutch\MergeDutch.rc
Languages\German\MergeGerman.rc
Languages\Hungarian\MergeHungarian.rc
Languages\Italian\MergeItalian.rc
Languages\Japanese\MergeJapanese.rc
Languages\Korean\MergeKorean.rc
Languages\Norwegian\MergeNorwegian.rc
Languages\Polish\MergePolish.rc
Languages\Russian\MergeRussian.rc
Languages\Slovak\MergeSlovak.rc
Languages\Spanish\MergeSpanish.rc
Languages\Swedish\MergeSwedish.rc
Languages\Turkish\MergeTurkish.rc
Perry Rapp [Thu, 29 Dec 2005 23:25:03 +0000 (23:25 +0000)]
BUG: [
1392740 ] Clutter in debug output
Src: DirScan.cpp
Perry Rapp [Thu, 29 Dec 2005 20:05:31 +0000 (20:05 +0000)]
BUG: [
1369646 ] Confusing half-commented lines in DiffFileData::prepAndCompa
Src: DiffWrapper.cpp
Perry Rapp [Thu, 29 Dec 2005 18:13:43 +0000 (18:13 +0000)]
PATCH: [
1392729 ] Cleanup variables in RunFileDiff
Src: DiffWrapper.cpp
Perry Rapp [Thu, 29 Dec 2005 10:15:49 +0000 (10:15 +0000)]
PATCH: [
1392650 ] Fix locals of CDiffWrapper::RunFileDiff
Src: DiffWrapper.cpp DiffWrapper.h MergeDoc.cpp PatchTool.cpp
Perry Rapp [Thu, 29 Dec 2005 08:09:08 +0000 (08:09 +0000)]
PATCH: [
1390774 ] Rename CRegOptions to CRegOptionsMgr
Docs\Developers: Options.html
Src\Common: OptionsMgr.cpp OptionsMgr.h
Src: FileTransform.cpp MainFrm.cpp MainFrm.h SyntaxColors.cpp
SyntaxColors.h codepage.h
Perry Rapp [Wed, 28 Dec 2005 20:00:32 +0000 (20:00 +0000)]
PATCH: [
1391732 ] Do not offer to unify codepages in UNICODE build
Also introduces new error IDS_DIFFERENT_UNICODINGS and new
global function IsUnicodeBuild.
Src: ConfigLog.cpp MainFrm.cpp Merge.rc resource.h StdAfx.cpp StdAfx.h
Perry Rapp [Wed, 28 Dec 2005 04:50:33 +0000 (04:50 +0000)]
2005-12-28 Perry
BUG: [
1389855 ] grammar fix in plugin docs
Plugins.html
Perry Rapp [Wed, 28 Dec 2005 04:47:02 +0000 (04:47 +0000)]
BUG: [
1391212 ] New RCLocalizationHelper doesn't handle escaped quotes
Bump version from 1.0.1.0 to 1.0.2.0.
Plugins\src_VCPP\RCLocalizationHelper:
RCLocalizationHelper.rc WinMergeScript.cpp
Plugins\dlls:
RCLocalizationHelper.dll (v1.0.2.0)
Compiled from current CVS (ANSI) (VC6sp6) Release MinDependency, v1.0.2.0
RCLocalizationHelperU.dll (v1.0.2.0)
Compiled from current CVS (UNICODE) (VC6sp6) Unicode Release MinDependency, v1.0.2.0
Perry Rapp [Tue, 27 Dec 2005 16:12:06 +0000 (16:12 +0000)]
PATCH: [
1390793 ] New global function GetOptionMgr
Src: DirActions.cpp DirDoc.cpp DirView.cpp DirViewColHandler.cpp
LocationView.cpp MainFrm.cpp MainFrm.h MergeDiffDetailView.cpp
MergeDoc.cpp MergeEditView.cpp OpenDlg.cpp
Src/Common: OptionsMgr.h
Perry Rapp [Tue, 27 Dec 2005 11:48:15 +0000 (11:48 +0000)]
PATCH: [
1382130 ] New line-based RCLocalizationHelper
Bump version from 1.0.0.3 to 1.0.1.0
Plugins\src_VCPP\RCLocalizationHelper:
NEW PatternSet.cpp PatternSet.h PluginError.cpp PluginError.h
NEW widestr.h
NEW RCLocalizationHelper.ini RCLocalizationHelperU.ini
RCLocalizationHelper.dsp RCLocalizationHelper.rc Resource.h
WinMergeScript.cpp
Plugins\dlls:
NEW RCLocalizationHelper.ini RCLocalizationHelperU.ini
RCLocalizationHelper.dll (v1.0.1.0)
Compiled from current CVS (ANSI) (VC6sp6) Release MinDependency, v1.0.1.0
RCLocalizationHelperU.dll (v1.0.1.0)
Compiled from current CVS (UNICODE) (VC6sp6) Unicode Release MinDependency, v1.0.1.0
Perry Rapp [Mon, 26 Dec 2005 21:54:45 +0000 (21:54 +0000)]
Update language versions of resource.h
Src/Languages/*: resource.h
Perry Rapp [Mon, 26 Dec 2005 21:43:25 +0000 (21:43 +0000)]
2005-12-26 Perry
PATCH: [
1388704 ] Simplified Chinese language .rc file for RC1
Src/Languages/ChineseSimplified: MergeChineseSimplified.rc
Perry Rapp [Mon, 26 Dec 2005 00:07:15 +0000 (00:07 +0000)]
Update & synchronize translations: Korean Norwegian Polish Russian
Src: Merge.rc
Src/Languages:
Korean: MergeKorean.rc
Norwegian: MergeNorwegian.rc
Polish: MergePolish.rc
Russian: MergeRussian.rc
Perry Rapp [Sun, 25 Dec 2005 21:18:59 +0000 (21:18 +0000)]
Remove needless cast
Src/Common: unicoder.cpp
Perry Rapp [Sun, 25 Dec 2005 21:01:00 +0000 (21:01 +0000)]
2005-12-25 Perry
Update & synchronize translations: Danish Dutch French Hungarian Italian Japanese
Src: Merge.rc
Src/Languages:
Danish: MergeDanish.rc
Dutch: MergeDutch.rc
French: MergeFrench.rc
Hungarian: MergeHungarian.rc
Italian: MergeItalian.rc
Japanese: MergeJapanese.rc
Perry Rapp [Sat, 24 Dec 2005 02:04:52 +0000 (02:04 +0000)]
PATCH: [
1384813 ] Alphabetize entries in Plugins list_of_sources.txt
list_of_sources.txt
Perry Rapp [Sat, 24 Dec 2005 02:00:33 +0000 (02:00 +0000)]
Bugfix for patch above; put binaries into MergePlugin subdirectories.
Plugins\src_VCPP\WatchBeginningOfLog: WatchBeginningOfLog.dsp
Plugins\src_VCPP\WatchEndOfLog: WatchEndOfLog.dsp
Perry Rapp [Sat, 24 Dec 2005 01:44:04 +0000 (01:44 +0000)]
PATCH: [
1386809 ] Move temporaries out of src tree - log plugins
Plugins\src_VCPP\WatchBeginningOfLog:
WatchBeginningOfLog.dsp WatchBeginningOfLog.rc
Plugins\src_VCPP\WatchEndOfLog:
WatchEndOfLog.dsp WatchEndOfLog.rc
Plugins\dlls: WatchBeginningOfLog.dll (v1.0.0.2)
Compiled from current CVS (ANSI) (VC6sp6) Release MinDependency, v1.0.2.0
WatchEndOfLog.dll (v1.0.0.2)
Compiled from current CVS (ANSI) (VC6sp6) Release MinDependency, v1.0.2.0
Kimmo Varis [Fri, 23 Dec 2005 15:02:13 +0000 (15:02 +0000)]
PATCH: [
1388456 ] Convert rest of folder compare bitmaps to icons
- icons from Tim (Thanks!)
Kimmo Varis [Wed, 21 Dec 2005 20:14:56 +0000 (20:14 +0000)]
WinMerge experimental release 2.5.0.4 (cvs)
Kimmo Varis [Wed, 21 Dec 2005 20:13:56 +0000 (20:13 +0000)]
PATCH: [
1387297 ] Swedish translation update for 2.5.0.3+
- submitted by Hans Eriksson
Kimmo Varis [Wed, 21 Dec 2005 20:05:28 +0000 (20:05 +0000)]
BUG: [
1385518 ] Batch file syntax highlighting weirdness
- fix from Tim