Update TortoiseUDiff to version 16491

[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / AppUtils.h

diff --git a/src/TortoiseProc/AppUtils.h b/src/TortoiseProc/AppUtils.h
index 5d31f72..597201d 100644 (file)
--- a/src/TortoiseProc/AppUtils.h
+++ b/src/TortoiseProc/AppUtils.h
@@ -182,7 +182,24 @@ public:
         */\r
        static CString ToRelativeTimeString(CTime time);\r
 \r
-       \r
+       static CString GetMergeTempFile(CString str,CTGitPath &merge);\r
+       static int         StashApply(CString ref);\r
+\r
+    static bool IsSSHPutty();\r
+\r
+    static bool LaunchRemoteSetting();\r
+\r
+       static bool LaunchPAgent(CString *keyfile=NULL,CString * pRemote=NULL);\r
+\r
+       static CString GetClipboardLink();\r
+       static CString ChooseRepository(CString *path);\r
+\r
+       static bool SendPatchMail(CTGitPathList &pathlist,bool autoclose=false);\r
+\r
+       static int  SaveCommitUnicodeFile(CString &filename, CString &mesage);\r
+\r
+       static int  GetLogOutputEncode();\r
+\r
 private:\r
        static CString PickDiffTool(const CTGitPath& file1, const CTGitPath& file2);\r
        static bool GetMimeType(const CTGitPath& file, CString& mimetype);\r