Three Trivial Changes

- Remove the **poco** `_CHANGELOG` file.  It is only for Apple
environments, and has been removed from **poco** version 1.9.1 (sometime
after version 1.4).

- Tweak two comments in `WinMergeShell.cpp`

- Remove an unused procedure declaration from `WinMergeShell.h`.  There
is no corresponding procedure definition.

diff --git a/Externals/poco/._CHANGELOG b/Externals/poco/._CHANGELOG
deleted file mode 100644 (file)
index 6adb72e..0000000
Binary files a/Externals/poco/._CHANGELOG and /dev/null differ

diff --git a/ShellExtension/WinMergeShell.cpp b/ShellExtension/WinMergeShell.cpp
index d33335f..cefe0a2 100644 (file)
--- a/ShellExtension/WinMergeShell.cpp
+++ b/ShellExtension/WinMergeShell.cpp
@@ -72,9 +72,9 @@ static const TCHAR f_RegSettingsDir[] = REGDIR _T("\\Settings");
 static const TCHAR f_RegValueEnabled[] = _T("ContextMenuEnabled");
 /** 'Saved' path in advanced mode */
 static const TCHAR f_FirstSelection[] = _T("FirstSelection");
-/** Path to WinMerge[U].exe */
+/** Path to WinMergeU.exe */
 static const TCHAR f_RegValuePath[] = _T("Executable");
-/** Path to WinMerge[U].exe, overwrites f_RegValuePath if present. */
+/** Path to WinMergeU.exe, overwrites f_RegValuePath if present. */
 static const TCHAR f_RegValuePriPath[] = _T("PriExecutable");
 /** LanguageId */
 static const TCHAR f_LanguageId[] = _T("LanguageId");

diff --git a/ShellExtension/WinMergeShell.h b/ShellExtension/WinMergeShell.h
index a3c2615..98477cc 100644 (file)
--- a/ShellExtension/WinMergeShell.h
+++ b/ShellExtension/WinMergeShell.h
@@ -68,7 +68,6 @@ protected:
        DWORD m_dwMenuState; /**< Shown menuitems */
 
        BOOL GetWinMergeDir(String &strDir);
-       BOOL CheckExecutable(String path);
        int DrawSimpleMenu(HMENU hmenu, UINT uMenuIndex, UINT uidFirstCmd);
        int DrawAdvancedMenu(HMENU hmenu, UINT uMenuIndex, UINT uidFirstCmd);
        String GetHelpText(UINT_PTR idCmd);