merge original branch.

[tortoisegit/TortoiseGitJp.git] / src / Utils / UnicodeUtils.h

diff --git a/src/Utils/UnicodeUtils.h b/src/Utils/UnicodeUtils.h
index 364339b..6ab7f66 100644 (file)
--- a/src/Utils/UnicodeUtils.h
+++ b/src/Utils/UnicodeUtils.h
@@ -42,6 +42,7 @@ public:
        ~CUnicodeUtils(void);\r
 #if defined(_MFC_VER) || defined(CSTRING_AVAILABLE)\r
        static CStringA GetUTF8(const CStringW& string);\r
+       static CStringA GetMulti(const CStringW& string, int acp);\r
        static CStringA GetUTF8(const CStringA& string);\r
        static CString GetUnicode(const CStringA& string);\r
        static CStringA ConvertWCHARStringToUTF8(const CString& string);\r