OSDN Git Service

Share resource file between TortoiseGitBlame and TortoiseProc
authorFrank Li <lznuaa@gmail.com>
Wed, 14 Jan 2009 15:20:30 +0000 (23:20 +0800)
committerFrank Li <lznuaa@gmail.com>
Wed, 14 Jan 2009 15:20:30 +0000 (23:20 +0800)
But log speed is very slow

Signed-off-by: Frank Li <lznuaa@gmail.com>
29 files changed:
src/Git/Git.cpp
src/Git/GitRev.cpp
src/Git/GitStatusListCtrl.cpp
src/Resources/CommonResource.h [new file with mode: 0644]
src/Resources/TortoiseCommon.rc2 [new file with mode: 0644]
src/Resources/TortoiseGitBlame.rc2
src/Resources/TortoiseProc.rc2
src/Resources/TortoiseProcENG.rc
src/TortoiseGitBlame/Resource.h
src/TortoiseGitBlame/TortoiseGitBlame.vcproj
src/TortoiseGitBlame/res/TortoiseGitBlame.ico
src/TortoiseProc/AddDlg.cpp
src/TortoiseProc/ChangedDlg.cpp
src/TortoiseProc/Commands/CommitCommand.cpp
src/TortoiseProc/Commands/CreateRepositoryCommand.h
src/TortoiseProc/Commands/PrevDiffCommand.cpp
src/TortoiseProc/CommitDlg.cpp
src/TortoiseProc/FileDiffDlg.cpp
src/TortoiseProc/GitLogListBase.h
src/TortoiseProc/RenameDlg.cpp
src/TortoiseProc/RevertDlg.cpp
src/TortoiseProc/Settings/SetMainPage.cpp
src/TortoiseProc/Settings/Settings.cpp
src/TortoiseProc/StatGraphDlg.cpp
src/TortoiseProc/TortoiseProc.cpp
src/TortoiseProc/TortoiseProc.vcproj
src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user
src/TortoiseProc/resource.h
src/Utils/MiscUI/SciEdit.cpp

index 48f8525..94a9738 100644 (file)
@@ -214,7 +214,7 @@ int CGit::GetLog(CString& logOut, CString &hash,  CTGitPath *path ,int count,int
        CString param;\r
 \r
        if(mask& LOG_INFO_STAT )\r
-               param += _T(" -numstat ");\r
+               param += _T(" --numstat ");\r
        if(mask& LOG_INFO_FILESTATE)\r
                param += _T(" --raw ");\r
 \r
index 9513952..bc9aee3 100644 (file)
@@ -60,7 +60,7 @@ int GitRev::ParserFromLog(CString &log)
        CString key;\r
        CString text;\r
        CString filelist;\r
-       TCHAR mode;\r
+       TCHAR mode=0;\r
        CTGitPath  path;\r
        this->m_Files.Clear();\r
     m_Action=0;\r
index 49241ac..46aebff 100644 (file)
@@ -52,6 +52,7 @@
 //#include "EditPropertiesDlg.h"\r
 //#include "CreateChangelistDlg.h"\r
 #include "XPTheme.h"\r
+#include "CommonResource.h"\r
 \r
 const UINT CGitStatusListCtrl::SVNSLNM_ITEMCOUNTCHANGED\r
                                        = ::RegisterWindowMessage(_T("GITSLNM_ITEMCOUNTCHANGED"));\r
diff --git a/src/Resources/CommonResource.h b/src/Resources/CommonResource.h
new file mode 100644 (file)
index 0000000..cbe674c
--- /dev/null
@@ -0,0 +1,58 @@
+\r
+#define IDS_LOG_GRAPH                   20000\r
+#define IDS_LOG_ACTIONS                 20001\r
+#define IDS_LOG_MESSAGE                 20002\r
+#define IDS_LOG_AUTHOR                  20003\r
+#define IDS_LOG_DATE                    20004\r
+#define IDS_LOG_BUGIDS                  20006\r
+#define IDS_LOG_ID                                             20007\r
+#define IDS_LOG_POPUP_COMPARE                  20009\r
+#define IDS_LOG_POPUP_BLAMECOMPARE             20010\r
+#define IDS_LOG_POPUP_GNUDIFF_CH        20011\r
+#define IDS_LOG_POPUP_COMPAREWITHPREVIOUS 20012\r
+#define IDS_LOG_POPUP_OPEN                             20014\r
+#define IDS_LOG_POPUP_OPENWITH                 20015\r
+#define IDS_LOG_POPUP_BLAME                            20016\r
+#define IDS_LOG_POPUP_VIEWREV                  20019\r
+#define IDS_LOG_POPUP_VIEWPATHREV              20020\r
+#define IDS_LOG_POPUP_REVERTTOREV              20021\r
+#define IDS_LOG_POPUP_REVERTREV                        20022\r
+#define IDS_LOG_POPUP_MERGEREV                 20023\r
+#define IDS_LOG_POPUP_COMPARETWO               20024\r
+#define IDS_LOG_POPUP_BLAMEREVS                        20025\r
+#define IDS_LOG_POPUP_GNUDIFF                  20026\r
+#define IDS_LOG_POPUP_REVERTREVS               20027\r
+#define IDS_LOG_POPUP_MERGEREVS                        20028\r
+#define IDS_LOG_POPUP_EDITAUTHOR               20029\r
+#define IDS_REPOBROWSE_SHOWREVPROP             20030\r
+#define IDS_LOG_POPUP_COPYTOCLIPBOARD          20031\r
+#define IDS_LOG_POPUP_FIND                             20032\r
+#define IDS_ERR_THREADSTARTFAILED              20033\r
+#define IDS_SCIEDIT_ADDWORD                            20034\r
+#define IDS_SCIEDIT_UNDO                               20035\r
+#define IDS_SCIEDIT_REDO                               20036\r
+#define IDS_SCIEDIT_CUT                                        20037\r
+#define IDS_SCIEDIT_COPY                               20038\r
+#define IDS_SCIEDIT_PASTE                              20039\r
+#define IDS_SCIEDIT_SELECTALL                  20040\r
+#define IDS_SCIEDIT_SPLITLINES                 20041\r
+#define IDS_SPELLEDIT_THESAURUS                        20042\r
+#define IDS_SPELLEDIT_NOTHESAURUS              20043\r
+\r
+#define IDS_APPNAME                                            20044\r
+\r
+#define IDS_LOG_REVISION                               20045\r
+\r
+#define IDS_LOG_POPUP_SAVE                             20046\r
+#define IDS_LOG_POPUP_UPDATE                   20047\r
+#define IDS_LOG_POPUP_BLAMEDIFF                        20048\r
+#define IDS_LOG_POPUP_BLAMEWITHPREVIOUS        20049\r
+#define IDS_LOG_POPUP_GETMERGELOGS             20050\r
+#define IDS_LOG_POPUP_DIFF                             20051\r
+#define IDS_LOG_POPUP_EDITLOG                  20052\r
+#define IDS_SPELLEDIT_CORRECTIONS              20053\r
+#define IDS_SPELLEDIT_NOCORRECTIONS            20054\r
+\r
+\r
+\r
+\r
diff --git a/src/Resources/TortoiseCommon.rc2 b/src/Resources/TortoiseCommon.rc2
new file mode 100644 (file)
index 0000000..dc23f60
--- /dev/null
@@ -0,0 +1,94 @@
+//\r
+// TortoiseCommon.RC2 - resources Microsoft Visual C++ does not edit directly\r
+//\r
+\r
+#ifdef APSTUDIO_INVOKED\r
+#error this file is not editable by Microsoft Visual C++\r
+#endif //APSTUDIO_INVOKED\r
+\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+// Add manually edited resources here...\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+#include "..\Resources\CommonResource.h"\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+STRINGTABLE \r
+BEGIN\r
+    IDS_LOG_GRAPH           "Graph"\r
+       IDS_LOG_ACTIONS         "Actions"\r
+       IDS_LOG_MESSAGE         "Message"\r
+    IDS_LOG_REVISION        "Revision"\r
+    IDS_LOG_AUTHOR          "Author"\r
+    IDS_LOG_DATE            "Date"\r
+       IDS_LOG_BUGIDS          "Bug-ID"\r
+       IDS_LOG_ID                              "ID"\r
+    IDS_LOG_POPUP_COMPARE   "Compare with &working copy"\r
+    IDS_LOG_POPUP_SAVE      "Save revision &to..."\r
+    IDS_LOG_POPUP_COMPARETWO "&Compare revisions"\r
+    IDS_LOG_POPUP_UPDATE    "&Update item to revision"\r
+END\r
+\r
+\r
+STRINGTABLE \r
+BEGIN\r
+    IDS_LOG_POPUP_REVERTREVS "&Revert changes from these revisions"\r
+    IDS_LOG_POPUP_COPYTOCLIPBOARD "Copy to clipboard"\r
+    IDS_LOG_POPUP_REVERTTOREV "R&evert to this revision"\r
+    IDS_LOG_POPUP_BLAMECOMPARE "Compare and &blame with working BASE"\r
+    IDS_LOG_POPUP_BLAMEREVS "&Blame revisions"\r
+    IDS_LOG_POPUP_BLAMEDIFF "&Blame changes"\r
+    IDS_LOG_POPUP_VIEWREV   "View revision in &webviewer"\r
+    IDS_LOG_POPUP_VIEWPATHREV "View revision for path in &webviewer"\r
+    IDS_LOG_POPUP_COMPAREWITHPREVIOUS "Compare with previous revision"\r
+    IDS_LOG_POPUP_BLAMEWITHPREVIOUS "Compare and blame with previous revision"\r
+    IDS_LOG_POPUP_BLAME     "Blame"\r
+    IDS_LOG_POPUP_GNUDIFF_CH "Show changes as &unified diff"\r
+    IDS_LOG_POPUP_GETMERGELOGS "Get merge logs"\r
+    IDS_LOG_POPUP_MERGEREV  "Merge revision to..."\r
+    IDS_LOG_POPUP_MERGEREVS "Merge revisions to..."\r
+END\r
+\r
+STRINGTABLE \r
+BEGIN\r
+    IDS_LOG_POPUP_DIFF      "Show &changes"\r
+    IDS_LOG_POPUP_REVERTREV "&Revert changes from this revision"\r
+    IDS_LOG_POPUP_GNUDIFF   "Show differences as &unified diff"\r
+    IDS_LOG_POPUP_FIND      "Search &log messages..."\r
+    IDS_LOG_POPUP_OPEN      "&Open"\r
+    IDS_LOG_POPUP_EDITAUTHOR "Edit author"\r
+    IDS_LOG_POPUP_EDITLOG   "Edit log message"\r
+    IDS_LOG_POPUP_OPENWITH  "Open with..."\r
+       IDS_REPOBROWSE_SHOWREVPROP "Show revision properties"\r
+END\r
+\r
+\r
+STRINGTABLE \r
+BEGIN\r
+    IDS_ERR_THREADSTARTFAILED "Could not start thread!"\r
+END\r
+\r
+STRINGTABLE \r
+BEGIN\r
+    IDS_SCIEDIT_UNDO        "&Undo"\r
+    IDS_SCIEDIT_REDO        "&Redo"\r
+    IDS_SCIEDIT_CUT         "Cu&t"\r
+    IDS_SCIEDIT_COPY        "Cop&y"\r
+    IDS_SCIEDIT_PASTE       "&Paste"\r
+    IDS_SCIEDIT_SELECTALL   "Select &All"\r
+    IDS_SCIEDIT_ADDWORD     "Add '%s' to dictionary"\r
+    IDS_SCIEDIT_SPLITLINES  "Split lines"\r
+END\r
+\r
+\r
+STRINGTABLE \r
+BEGIN\r
+    IDS_SPELLEDIT_THESAURUS "Thesaurus"\r
+    IDS_SPELLEDIT_CORRECTIONS "Corrections"\r
+    IDS_SPELLEDIT_NOCORRECTIONS "No spell corrections"\r
+    IDS_SPELLEDIT_NOTHESAURUS "No thesaurus suggestions"\r
+    IDS_APPNAME             "TortoiseGit"\r
+\r
+END\r
+\r
index 44b4966..cb34520 100644 (file)
 /////////////////////////////////////////////////////////////////////////////\r
 #include "..\version.h"\r
 #include "..\\TortoiseShell\\resourceshell.rc"\r
+#include "..\Resources\TortoiseCommon.rc2"\r
 /////////////////////////////////////////////////////////////////////////////\r
-STRINGTABLE \r
-BEGIN\r
-    IDS_LOG_GRAPH           "Graph"\r
-       IDS_LOG_ACTIONS         "Actions"\r
-       IDS_LOG_MESSAGE         "Message"\r
-    IDS_LOG_REVISION        "Revision"\r
-    IDS_LOG_AUTHOR          "Author"\r
-    IDS_LOG_DATE            "Date"\r
-       IDS_LOG_BUGIDS          "Bug-ID"\r
-       IDS_LOG_ID                              "ID"\r
-END\r
+\r
 \r
index c4afd7a..14b6b51 100644 (file)
@@ -48,4 +48,5 @@ BEGIN
 END\r
 \r
 #include "..\\TortoiseShell\\resourceshell.rc"\r
+#include "..\\Resources\\TortoiseCommon.rc2"\r
 /////////////////////////////////////////////////////////////////////////////\r
index 7f347f8..e28c147 100644 (file)
Binary files a/src/Resources/TortoiseProcENG.rc and b/src/Resources/TortoiseProcENG.rc differ
index 0b3e399..e3fa2f8 100644 (file)
 #define IDS_GIT_LOG_TAB                                20307\r
 \r
 \r
-#define IDS_LOG_GRAPH                   1184\r
-#define IDS_LOG_ACTIONS                 1870\r
-#define IDS_LOG_MESSAGE                 1207\r
-#define IDS_LOG_AUTHOR                  1209\r
-#define IDS_LOG_DATE                    1210\r
-#define IDS_LOG_REVISION                1208\r
-#define IDS_LOG_BUGIDS                  1840\r
-#define IDS_LOG_ID                                             9605\r
 // Next default values for new objects\r
 //\r
 #ifdef APSTUDIO_INVOKED\r
index 46e2be4..80e2018 100644 (file)
@@ -45,7 +45,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\Git;..\TortoiseProc;..\..\ext\scintilla\include;..\Utils;..\Utils\MiscUI;..\..\ext\hunspell;..\..\ext\ResizableLib"\r
+                               AdditionalIncludeDirectories="..\Git;..\TortoiseProc;..\..\ext\scintilla\include;..\Utils;..\Utils\MiscUI;..\..\ext\hunspell;..\..\ext\ResizableLib;..\Resources"\r
                                PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
                                Name="VCCLCompilerTool"\r
                                Optimization="2"\r
                                EnableIntrinsicFunctions="true"\r
-                               AdditionalIncludeDirectories="..\Git;..\TortoiseProc;..\..\ext\scintilla\include;..\Utils;..\Utils\MiscUI;..\..\ext\hunspell;..\..\ext\ResizableLib"\r
+                               AdditionalIncludeDirectories="..\Git;..\TortoiseProc;..\..\ext\scintilla\include;..\Utils;..\Utils\MiscUI;..\..\ext\hunspell;..\..\ext\ResizableLib;..\Resources"\r
                                PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG"\r
                                MinimalRebuild="false"\r
                                RuntimeLibrary="2"\r
index d56fbcd..d2e7edd 100644 (file)
Binary files a/src/TortoiseGitBlame/res/TortoiseGitBlame.ico and b/src/TortoiseGitBlame/res/TortoiseGitBlame.ico differ
index 1b484ec..137250c 100644 (file)
@@ -23,6 +23,7 @@
 #include "AddDlg.h"\r
 //#include "SVNConfig.h"\r
 #include "Registry.h"\r
+#include "CommonResource.h"\r
 \r
 #define REFRESHTIMER   100\r
 \r
index f63ffe1..0ed86b3 100644 (file)
@@ -25,6 +25,8 @@
 \r
 #include "GitStatusListCtrl.h"\r
 \r
+#include "CommonResource.h"\r
+\r
 IMPLEMENT_DYNAMIC(CChangedDlg, CResizableStandAloneDialog)\r
 CChangedDlg::CChangedDlg(CWnd* pParent /*=NULL*/)\r
        : CResizableStandAloneDialog(CChangedDlg::IDD, pParent)\r
index 54f9521..a30bc42 100644 (file)
@@ -18,7 +18,7 @@
 //\r
 #include "StdAfx.h"\r
 #include "CommitCommand.h"\r
-\r
+#include "CommonResource.h"\r
 #include "CommitDlg.h"\r
 //#include "SVNProgressDlg.h"\r
 #include "StringUtils.h"\r
index 43e33cb..91407d7 100644 (file)
@@ -20,7 +20,7 @@
 #include "Command.h"\r
 \r
 #include "MessageBox.h"\r
-\r
+#include "CommonResource.h"\r
 #include "git.h"\r
 /**\r
  * \ingroup TortoiseProc\r
index 8eeb4cb..096f494 100644 (file)
@@ -23,6 +23,7 @@
 #include "MessageBox.h"\r
 #include "ChangedDlg.h"\r
 #include "LogDlgHelper.h"\r
+#include "CommonResource.h"\r
 \r
 bool PrevDiffCommand::Execute()\r
 {\r
index a7ca9fc..a7c231f 100644 (file)
@@ -30,6 +30,7 @@
 #include "GitStatus.h"\r
 #include "HistoryDlg.h"\r
 #include "Hooks.h"\r
+#include "CommonResource.h"\r
 \r
 #ifdef _DEBUG\r
 #define new DEBUG_NEW\r
index 9455b40..d987e40 100644 (file)
@@ -31,6 +31,7 @@
 #include "RevisionDlg.h"\r
 #include ".\filediffdlg.h"\r
 #include "gitdiff.h"\r
+#include "CommonResource.h"\r
 \r
 #define ID_COMPARE 1\r
 #define ID_BLAME 2\r
index c5e6def..bd643e2 100644 (file)
@@ -2,7 +2,7 @@
 \r
 #include "HintListCtrl.h"\r
 #include "XPTheme.h"\r
-#include "resource.h"\r
+#include "CommonResource.h"\r
 #include "Git.h"\r
 #include "ProjectProperties.h"\r
 #include "TGitPath.h"\r
index be923f0..dc18378 100644 (file)
@@ -22,7 +22,7 @@
 #include "TGitPath.h"\r
 #include "RenameDlg.h"\r
 #include ".\renamedlg.h"\r
-\r
+#include "CommonResource.h"\r
 \r
 IMPLEMENT_DYNAMIC(CRenameDlg, CResizableStandAloneDialog)\r
 CRenameDlg::CRenameDlg(CWnd* pParent /*=NULL*/)\r
index 7a222fa..7b6a017 100644 (file)
@@ -23,6 +23,7 @@
 #include "Git.h"\r
 #include "Registry.h"\r
 #include ".\revertdlg.h"\r
+#include "CommonResource.h"\r
 \r
 #define REFRESHTIMER   100\r
 \r
index a55b1ee..e59d116 100644 (file)
@@ -27,7 +27,7 @@
 #include ".\setmainpage.h"\r
 #include "Git.h"\r
 #include "MessageBox.h"\r
-\r
+#include "CommonResource.h"\r
 \r
 IMPLEMENT_DYNAMIC(CSetMainPage, ISettingsPropPage)\r
 CSetMainPage::CSetMainPage()\r
index 2f5f1d7..cabd9e7 100644 (file)
@@ -21,7 +21,7 @@
 #include "Settings.h"\r
 #include "MessageBox.h"\r
 #include "..\..\TGitCache\CacheInterface.h"\r
-\r
+#include "CommonResource.h"\r
 \r
 \r
 IMPLEMENT_DYNAMIC(CSettings, CTreePropSheet)\r
index 5f36048..698406d 100644 (file)
@@ -25,7 +25,7 @@
 #include "PathUtils.h"\r
 #include "MessageBox.h"\r
 #include "Registry.h"\r
-\r
+#include "CommonResource.h"\r
 #include <cmath>\r
 #include <locale>\r
 #include <list>\r
index 7e430f4..1966392 100644 (file)
@@ -40,7 +40,7 @@
 //#include <openssl/err.h>\r
 \r
 #include "Commands\Command.h"\r
-\r
+#include "CommonResource.h"\r
 #include "..\version.h"\r
 #define STRUCT_IOVEC_DEFINED\r
 //#include "sasl.h"\r
index 5b1c3be..078aa33 100644 (file)
@@ -48,7 +48,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="&quot;$InputDir&quot;;../../ext/ResizableLib;../Git;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\TortoiseProc;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;&quot;../../ext/cyrus-sasl/include&quot;;../../../common/openssl/inc32;.\RevisionGraph;..\TortoiseShell"\r
+                               AdditionalIncludeDirectories="..\Resources;&quot;$InputDir&quot;;../../ext/ResizableLib;../Git;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\TortoiseProc;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;&quot;../../ext/cyrus-sasl/include&quot;;../../../common/openssl/inc32;.\RevisionGraph;..\TortoiseShell"\r
                                PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;SVN_DEBUG;ENABLE_NLS;THESAURUS"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="2"\r
                                Optimization="1"\r
                                InlineFunctionExpansion="1"\r
                                FavorSizeOrSpeed="2"\r
-                               AdditionalIncludeDirectories="&quot;$InputDir&quot;;../../ext/ResizableLib;../Git;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\TortoiseProc;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;&quot;../../ext/cyrus-sasl/include&quot;;../../../common/openssl/inc32;.\RevisionGraph;..\TortoiseShell"\r
+                               AdditionalIncludeDirectories="..\Resources;&quot;$InputDir&quot;;../../ext/ResizableLib;../Git;&quot;../../ext/apr-util/include&quot;;&quot;../../ext/apr-util/xml/expat/lib&quot;;../../ext/Subversion/subversion/include;../../ext/Subversion/subversion/libsvn_client;../../ext/apr/include;../../ext/boost;..\TortoiseProc;..\Utils;..\SVN;..\..\ext\ResizableLib;..\crashrpt;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\..\ext\hunspell;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;&quot;../../ext/cyrus-sasl/include&quot;;../../../common/openssl/inc32;.\RevisionGraph;..\TortoiseShell"\r
                                PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;THESAURUS"\r
                                StringPooling="true"\r
                                MinimalRebuild="false"\r
index 2efbcb3..a9acb41 100644 (file)
@@ -11,7 +11,7 @@
                        <DebugSettings\r
                                Command="$(TargetPath)"\r
                                WorkingDirectory="D:\Profiles\b20596\tortoisegit"\r
-                               CommandArguments="/command:settings /path:&quot;D:\\Profiles\\b20596\\git&quot;"\r
+                               CommandArguments="/command:log /path:&quot;D:\\Profiles\\b20596\\git&quot;"\r
                                Attach="false"\r
                                DebuggerType="3"\r
                                Remote="1"\r
index 10e0aaf..4d77923 100644 (file)
Binary files a/src/TortoiseProc/resource.h and b/src/TortoiseProc/resource.h differ
index 44252df..dce2b6a 100644 (file)
@@ -17,7 +17,7 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\r
 //\r
 #include "StdAfx.h"\r
-#include "resource.h"\r
+#include "CommonResource.h"\r
 //#include "AppUtils.h"\r
 #include "..\PathUtils.h"\r
 #include "..\UnicodeUtils.h"\r