Merge X64 Build

[tortoisegit/TortoiseGitJp.git] / src / TortoiseGitBlame / TortoiseGitBlame.cpp

diff --git a/src/TortoiseGitBlame/TortoiseGitBlame.cpp b/src/TortoiseGitBlame/TortoiseGitBlame.cpp
index 59c9d19..79adf98 100644 (file)
--- a/src/TortoiseGitBlame/TortoiseGitBlame.cpp
+++ b/src/TortoiseGitBlame/TortoiseGitBlame.cpp
@@ -9,6 +9,7 @@
 \r
 #include "TortoiseGitBlameDoc.h"\r
 #include "TortoiseGitBlameView.h"\r
 \r
 #include "TortoiseGitBlameDoc.h"\r
 #include "TortoiseGitBlameView.h"\r

+#include "CmdLineParser.h"\r

 \r
 #ifdef _DEBUG\r
 #define new DEBUG_NEW\r
 \r
 #ifdef _DEBUG\r
 #define new DEBUG_NEW\r


@@ -92,7 +93,7 @@ BOOL CTortoiseGitBlameApp::InitInstance()
        //  serve as the connection between documents, frame windows and views\r
        CSingleDocTemplate* pDocTemplate;\r
        pDocTemplate = new CSingleDocTemplate(\r
        //  serve as the connection between documents, frame windows and views\r
        CSingleDocTemplate* pDocTemplate;\r
        pDocTemplate = new CSingleDocTemplate(\r

-               IDR_MAINFRAME,\r
+               IDR_TORTOISE_GIT_BLAME_MAINFRAME,\r

                RUNTIME_CLASS(CTortoiseGitBlameDoc),\r
                RUNTIME_CLASS(CMainFrame),       // main SDI frame window\r
                RUNTIME_CLASS(CTortoiseGitBlameView));\r
                RUNTIME_CLASS(CTortoiseGitBlameDoc),\r
                RUNTIME_CLASS(CMainFrame),       // main SDI frame window\r
                RUNTIME_CLASS(CTortoiseGitBlameView));\r


@@ -106,7 +107,6 @@ BOOL CTortoiseGitBlameApp::InitInstance()
        CCommandLineInfo cmdInfo;\r
        ParseCommandLine(cmdInfo);\r
 \r
        CCommandLineInfo cmdInfo;\r
        ParseCommandLine(cmdInfo);\r
 \r

-\r

        // Dispatch commands specified on the command line.  Will return FALSE if\r
        // app was launched with /RegServer, /Register, /Unregserver or /Unregister.\r
        if (!ProcessShellCommand(cmdInfo))\r
        // Dispatch commands specified on the command line.  Will return FALSE if\r
        // app was launched with /RegServer, /Register, /Unregserver or /Unregister.\r
        if (!ProcessShellCommand(cmdInfo))\r