igit added as submodule

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

diff --git a/src/TortoiseMerge/TortoiseMerge.cpp b/src/TortoiseMerge/TortoiseMerge.cpp
index 68f5131..5c00d9c 100644 (file)
--- a/src/TortoiseMerge/TortoiseMerge.cpp
+++ b/src/TortoiseMerge/TortoiseMerge.cpp
@@ -22,7 +22,7 @@
 #include "MainFrm.h"\r
 #include "AboutDlg.h"\r
 #include "CmdLineParser.h"\r
-#include "version.h"\r
+#include "..\\version.h"\r
 #include "AppUtils.h"\r
 #include "PathUtils.h"\r
 #include "BrowseFolder.h"\r
@@ -47,7 +47,7 @@ CTortoiseMergeApp::CTortoiseMergeApp()
 \r
 // The one and only CTortoiseMergeApp object\r
 CTortoiseMergeApp theApp;\r
-CCrashReport g_crasher("crashreports@tortoisesvn.tigris.org", "Crash Report for TortoiseMerge " APP_X64_STRING " : " STRPRODUCTVER, TRUE);\r
+//CCrashReport g_crasher("crashreports@tortoisesvn.tigris.org", "Crash Report for TortoiseMerge " APP_X64_STRING " : " STRPRODUCTVER, TRUE);\r
 \r
 // CTortoiseMergeApp initialization\r
 BOOL CTortoiseMergeApp::InitInstance()\r
@@ -55,7 +55,7 @@ BOOL CTortoiseMergeApp::InitInstance()
        CMFCVisualManager::SetDefaultManager(RUNTIME_CLASS(CMFCVisualManagerWindows));\r
        CMFCButton::EnableWindowsTheming();\r
        //set the resource dll for the required language\r
-       CRegDWORD loc = CRegDWORD(_T("Software\\TortoiseSVN\\LanguageID"), 1033);\r
+       CRegDWORD loc = CRegDWORD(_T("Software\\TortoiseGit\\LanguageID"), 1033);\r
        long langId = loc;\r
        CString langDll;\r
        HINSTANCE hInst = NULL;\r