From 643019234989c8d42d0d6a296828c1e3b0db815e Mon Sep 17 00:00:00 2001 From: Tim Gerundt Date: Tue, 22 May 2007 19:18:27 +0000 Subject: [PATCH] BUG: [ 1620721 ] [Plugins] Bug in IgnoreCommentsC.dll? --- Plugins/Changes.txt | 7 +++++++ Plugins/dlls/IgnoreCommentsC.dll | Bin 61440 -> 61440 bytes Plugins/src_VCPP/IgnoreCommentsC/WinMergeScript.cpp | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Plugins/Changes.txt b/Plugins/Changes.txt index 62eac5792..96fb15daa 100644 --- a/Plugins/Changes.txt +++ b/Plugins/Changes.txt @@ -2,6 +2,13 @@ Plugins\Changes.txt Add new items to top (This summarizes all changes to all plugins.) +2007-05-22 Tim + BUG: [ 1620721 ] [Plugins] Bug in IgnoreCommentsC.dll? + Plugins\dlls: + IgnoreCommentsC.dll + Plugins\src_VCPP\IgnoreCommentsC: + WinMergeScript.cpp + 2007-05-12 Tim PATCH: [ 1717461 ] Use DisplayBinaryFiles plugin from WinMergeX Plugins\dlls: diff --git a/Plugins/dlls/IgnoreCommentsC.dll b/Plugins/dlls/IgnoreCommentsC.dll index 9cb0a9e7054d43c49bc0866366fd42f1f36353cc..2b98b2fc27ab8a137df0c77fd7e8f979589d92f6 100644 GIT binary patch delta 7490 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 delta 7336 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 UFNf&GdWHU^{*>P95lN;02Ni3;hX4Qo diff --git a/Plugins/src_VCPP/IgnoreCommentsC/WinMergeScript.cpp b/Plugins/src_VCPP/IgnoreCommentsC/WinMergeScript.cpp index f8f0c0e93..81c578ec0 100644 --- a/Plugins/src_VCPP/IgnoreCommentsC/WinMergeScript.cpp +++ b/Plugins/src_VCPP/IgnoreCommentsC/WinMergeScript.cpp @@ -16,7 +16,7 @@ STDMETHODIMP CWinMergeScript::get_PluginEvent(BSTR *pVal) STDMETHODIMP CWinMergeScript::get_PluginDescription(BSTR *pVal) { - *pVal = SysAllocString(L"Transform C/CPP to compare without comments - save not possible"); + *pVal = SysAllocString(L"The plugin ignores comments (//... and /* ... */) in C, C++, PHP and JavaScript files."); return S_OK; } -- 2.11.0