igit added as submodule

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

diff --git a/src/TortoiseProc/Blame.h b/src/TortoiseProc/Blame.h
index ea5d03a..41a6c8e 100644 (file)
--- a/src/TortoiseProc/Blame.h
+++ b/src/TortoiseProc/Blame.h
@@ -30,7 +30,7 @@ class CTGitPath;
  * \ingroup TortoiseProc\r
  * Helper class to get the blame information for a file.\r
  */\r
-class CBlame : public CGit\r
+class CBlame  \r
 {\r
 public:\r
        CBlame();\r
@@ -54,13 +54,15 @@ private:
                                                                git_revnum_t merged_revision, const CString& merged_author, const CString& merged_date, const CString& merged_path,\r
                                                                const CStringA& line);\r
        BOOL            Cancel();\r
+/*\r
        BOOL            Notify(const CTGitPath& path, git_wc_notify_action_t action, \r
                                                git_node_kind_t kind, const CString& mime_type, \r
                                                git_wc_notify_state_t content_state, \r
                                                git_wc_notify_state_t prop_state, LONG rev,\r
                                                const git_lock_t * lock, git_wc_notify_lock_state_t lock_state,\r
                                                git_error_t * err, apr_pool_t * pool);\r
-       BOOL            Log(git_revnum_t rev, const CString& author, const CString& date, const CString& message, LogChangedPathArray * cpaths, apr_time_t time, int filechanges, BOOL copies, DWORD actions, BOOL haschildren);\r
+                                               */\r
+       //BOOL          Log(git_revnum_t rev, const CString& author, const CString& date, const CString& message, LogChangedPathArray * cpaths, apr_time_t time, int filechanges, BOOL copies, DWORD actions, BOOL haschildren);\r
 private:\r
        BOOL            m_bCancelled;                   ///< TRUE if the operation should be canceled\r
        LONG            m_nCounter;                             ///< Counts the number of calls to the Cancel() callback (revisions?)\r