OSDN Git Service

(root) / tortoisegit / TortoiseGitJp.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Setting dialog, remote list work.
[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / TortoiseProc.vcproj
diff --git a/src/TortoiseProc/TortoiseProc.vcproj b/src/TortoiseProc/TortoiseProc.vcproj
index e435791..ced05cc 100644 (file)
--- a/src/TortoiseProc/TortoiseProc.vcproj
+++ b/src/TortoiseProc/TortoiseProc.vcproj
@@ -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"\r
+                               AdditionalIncludeDirectories="..\TortoiseProc;..\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;..\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
@@ -59,6 +59,7 @@
                                UsePrecompiledHeader="2"\r
                                WarningLevel="4"\r
                                DebugInformationFormat="4"\r
+                               DisableSpecificWarnings="4996,4018"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -76,7 +77,8 @@
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="Crypt32.lib gdiplus.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib"\r
                                LinkIncremental="2"\r
-                               IgnoreDefaultLibraryNames="libcd.lib;libc;shell32;LIBCMTD;"\r
+                               AdditionalLibraryDirectories=""\r
+                               IgnoreDefaultLibraryNames=""\r
                                DelayLoadDLLs="gdiplus.dll"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -134,10 +136,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\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"\r
+                               AdditionalIncludeDirectories="..\TortoiseProc;..\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;..\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
@@ -150,6 +149,7 @@
                                UsePrecompiledHeader="2"\r
                                WarningLevel="4"\r
                                DebugInformationFormat="3"\r
+                               DisableSpecificWarnings="4996,4018"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r
@@ -167,7 +167,8 @@
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="Crypt32.lib gdiplus.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib"\r
                                LinkIncremental="1"\r
-                               IgnoreDefaultLibraryNames="libcd.lib;libc;shell32;LIBCMT"\r
+                               AdditionalLibraryDirectories="../../ext/wingit"\r
+                               IgnoreDefaultLibraryNames=""\r
                                DelayLoadDLLs="gdiplus.dll"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -231,7 +232,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="&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;..\TortoiseShell;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;&quot;../../ext/cyrus-sasl/include&quot;;../../../common/openssl/inc32;.\RevisionGraph"\r
+                               AdditionalIncludeDirectories="..\TortoiseProc;..\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;..\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="WIN64;_WINDOWS;_DEBUG;SVN_DEBUG;ENABLE_NLS;THESAURUS"\r
                                MinimalRebuild="true"\r
                                ExceptionHandling="2"\r
@@ -257,9 +258,9 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="delayimp.lib Crypt32.lib Secur32.lib wininet.lib shfolder.lib shell32.lib comctl32.lib mswsock.lib ws2_32.lib rpcrt4.lib shlwapi.lib Version.lib gdiplus.lib ../../obj\ResizableLib\Debug64\ResizableLib.lib ../../obj\LogCacheLib\Debug64\LogCacheLib.lib ../../ext/Subversion\debug_x64\libsvn_repos.lib ../../ext/Subversion\debug_x64\libsvn_diff.lib ../../ext/Subversion\debug_x64\libsvn_fs.lib ../../ext/Subversion\debug_x64\libsvn_fs_fs.lib ../../ext/Subversion\debug_x64\libsvn_fs_util.lib ../../ext/Subversion\debug_x64\libsvn_ra_neon.lib ../../ext/Subversion\debug_x64\libsvn_ra_serf.lib ../../ext/Subversion\debug_x64\libsvn_ra_local.lib ../../ext/Subversion\debug_x64\libsvn_ra.lib ../../ext/Subversion\debug_x64\libsvn_ra_svn.lib ../../ext/neon\debug_x64\libneon.lib ../../ext/serf\debug_x64\libserf.lib ../../ext/Subversion\debug_x64\libsvn_wc.lib ../../ext/Subversion\debug_x64\libsvn_subr.lib ../../ext/Subversion\debug_x64\libsvn_client.lib ../../ext/Subversion\debug_x64\libsvn_delta.lib ../../ext/apr\debug_x64\libapr_tsvn.lib ../../ext/apr-util\debug_x64\libaprutil_tsvn.lib ../../ext/apr-util\xml\expat\lib\debug_x64\xml.lib ../../ext/libintl/libintl3-x64/lib/intl3_tsvn.lib ../../ext/cyrus-SASL\debug_x64\libsasl.lib"\r
+                               AdditionalDependencies="Crypt32.lib gdiplus.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib"\r
                                LinkIncremental="2"\r
-                               IgnoreDefaultLibraryNames="shell32;msvcrt.lib"\r
+                               IgnoreDefaultLibraryNames=""\r
                                DelayLoadDLLs="gdiplus.dll"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -318,10 +319,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               Optimization="1"\r
-                               InlineFunctionExpansion="1"\r
-                               FavorSizeOrSpeed="2"\r
-                               AdditionalIncludeDirectories="&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;..\TortoiseShell;&quot;..\..\ext\libintl\libintl3-win32\inc&quot;;..\..\ext\scintilla\include;..\Utils\TreePropSheet;..\Utils\ColourPickerXP;..\Utils\NewMenu;..\Utils\MiscUI;..\LogCache;&quot;../../ext/cyrus-sasl/include&quot;;../../../common/openssl/inc32;.\RevisionGraph"\r
+                               AdditionalIncludeDirectories="..\TortoiseProc;..\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;..\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="WIN64;_WINDOWS;NDEBUG;THESAURUS"\r
                                StringPooling="true"\r
                                MinimalRebuild="false"\r
@@ -349,9 +347,9 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="delayimp.lib Crypt32.lib Secur32.lib wininet.lib shfolder.lib shell32.lib comctl32.lib mswsock.lib ws2_32.lib rpcrt4.lib shlwapi.lib Version.lib gdiplus.lib ../../obj/ResizableLib/Release64/ResizableLib.Lib ../../obj\LogCacheLib\Release64\LogCacheLib.lib ../../ext/Subversion\release_x64\libsvn_repos.lib ../../ext/Subversion\release_x64\libsvn_diff.lib ../../ext/Subversion\release_x64\libsvn_fs.lib ../../ext/Subversion\release_x64\libsvn_fs_fs.lib ../../ext/Subversion\release_x64\libsvn_fs_util.lib ../../ext/Subversion\release_x64\libsvn_ra_neon.lib ../../ext/Subversion\release_x64\libsvn_ra_serf.lib ../../ext/Subversion\release_x64\libsvn_ra_local.lib ../../ext/Subversion\release_x64\libsvn_ra.lib ../../ext/Subversion\release_x64\libsvn_ra_svn.lib ../../ext/neon\release_x64\libneon.lib ../../ext/serf\release_x64\libserf.lib ../../ext/Subversion\release_x64\libsvn_wc.lib ../../ext/Subversion\release_x64\libsvn_subr.lib ../../ext/Subversion\release_x64\libsvn_client.lib ../../ext/Subversion\release_x64\libsvn_delta.lib ../../ext/apr\release_x64\libapr_tsvn.lib ../../ext/apr-util\release_x64\libaprutil_tsvn.lib ../../ext/apr-util\xml\expat\lib\release_x64\xml.lib ../../ext/libintl/libintl3-x64/lib/intl3_tsvn.lib ../../ext/cyrus-SASL\release_x64\libsasl.lib"\r
+                               AdditionalDependencies="Crypt32.lib gdiplus.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib"\r
                                LinkIncremental="1"\r
-                               IgnoreDefaultLibraryNames="libcd.lib;libc;shell32;"\r
+                               IgnoreDefaultLibraryNames=""\r
                                DelayLoadDLLs="gdiplus.dll"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -393,6 +391,18 @@
                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;h;hpp;hxx;hm;inl;inc"\r
                        >\r
                        <File\r
+                               RelativePath="..\TGitCache\CacheInterface.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\LogFile.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\LogFile.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\ProjectProperties.cpp"\r
                                >\r
                        </File>\r
@@ -412,7 +422,11 @@
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath=".\Colors.cpp"\r
+                                       RelativePath=".\DeleteConflictDlg.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\DeleteConflictDlg.h"\r
                                        >\r
                                </File>\r
                        </Filter>\r
@@ -420,6 +434,10 @@
                                Name="UI"\r
                                >\r
                                <File\r
+                                       RelativePath=".\Colors.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
                                        RelativePath="..\Utils\MiscUI\SciEdit.cpp"\r
                                        >\r
                                </File>\r
@@ -440,6 +458,10 @@
                                Name="3rd Party"\r
                                >\r
                        </Filter>\r
+                       <Filter\r
+                               Name="Graph"\r
+                               >\r
+                       </Filter>\r
                </Filter>\r
                <Filter\r
                        Name="Resource Files"\r
@@ -1104,12 +1126,32 @@
                        <Filter\r
                                Name="Blame"\r
                                >\r
+                               <File\r
+                                       RelativePath=".\Commands\BlameCommand.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Commands\BlameCommand.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\BlameDlg.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\BlameDlg.h"\r
+                                       >\r
+                               </File>\r
                        </Filter>\r
                        <Filter\r
                                Name="Log"\r
                                >\r
                                <File\r
-                                       RelativePath=".\GitLogList.cpp"\r
+                                       RelativePath=".\GitLogCache.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\gitlogcache.h"\r
                                        >\r
                                </File>\r
                                <File\r
@@ -1117,6 +1159,18 @@
                                        >\r
                                </File>\r
                                <File\r
+                                       RelativePath=".\GitLogListAction.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\GitLogListBase.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\GitLogListBase.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
                                        RelativePath=".\lanes.cpp"\r
                                        >\r
                                </File>\r
@@ -1154,46 +1208,78 @@
                                </File>\r
                        </Filter>\r
                        <Filter\r
-                               Name="PrevDiff"\r
+                               Name="RefLog"\r
                                >\r
                                <File\r
-                                       RelativePath=".\Commands\PrevDiffCommand.cpp"\r
+                                       RelativePath=".\Commands\RefLogCommand.cpp"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath=".\Commands\PrevDiffCommand.h"\r
+                                       RelativePath=".\Commands\RefLogCommand.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\RefLogDlg.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\RefLogDlg.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\RefLoglist.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\RefLoglist.h"\r
                                        >\r
                                </File>\r
                        </Filter>\r
                        <Filter\r
-                               Name="Rename"\r
+                               Name="Submodule"\r
                                >\r
                                <File\r
-                                       RelativePath=".\Commands\RenameCommand.cpp"\r
+                                       RelativePath=".\SubmoduleAddDlg.cpp"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath=".\Commands\RenameCommand.h"\r
+                                       RelativePath=".\SubmoduleAddDlg.h"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath=".\RenameDlg.cpp"\r
+                                       RelativePath=".\Commands\SubmoduleCommand.cpp"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath=".\RenameDlg.h"\r
+                                       RelativePath=".\Commands\SubmoduleCommand.h"\r
                                        >\r
                                </File>\r
                        </Filter>\r
                        <Filter\r
-                               Name="ReposStatus"\r
+                               Name="Rename"\r
                                >\r
                                <File\r
-                                       RelativePath=".\Commands\RepoStatusCommand.cpp"\r
+                                       RelativePath=".\Commands\DropMoveCommand.cpp"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath=".\Commands\RepoStatusCommand.h"\r
+                                       RelativePath=".\Commands\DropMoveCommand.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Commands\RenameCommand.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Commands\RenameCommand.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\RenameDlg.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\RenameDlg.h"\r
                                        >\r
                                </File>\r
                        </Filter>\r
@@ -1230,34 +1316,26 @@
                                </File>\r
                        </Filter>\r
                        <Filter\r
-                               Name="Clean"\r
+                               Name="Stash"\r
                                >\r
                                <File\r
-                                       RelativePath=".\Commands\CleanupCommand.cpp"\r
+                                       RelativePath=".\Commands\StashCommand.cpp"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath=".\Commands\CleanupCommand.h"\r
+                                       RelativePath=".\Commands\StashCommand.h"\r
                                        >\r
                                </File>\r
                        </Filter>\r
                        <Filter\r
-                               Name="Switch"\r
+                               Name="Clean"\r
                                >\r
                                <File\r
-                                       RelativePath=".\GitSwitchDlg.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\GitSwitchDlg.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\SwitchCommand.cpp"\r
+                                       RelativePath=".\Commands\CleanupCommand.cpp"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath=".\Commands\SwitchCommand.h"\r
+                                       RelativePath=".\Commands\CleanupCommand.h"\r
                                        >\r
                                </File>\r
                        </Filter>\r
@@ -1358,28 +1436,16 @@
                                </File>\r
                        </Filter>\r
                        <Filter\r
-                               Name="merge"\r
+                               Name="Export"\r
                                >\r
                                <File\r
-                                       RelativePath=".\Commands\MergeCommand.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\MergeCommand.h"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\MergeDlg.cpp"\r
+                                       RelativePath=".\Commands\DropExportCommand.cpp"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath=".\MergeDlg.h"\r
+                                       RelativePath=".\Commands\DropExportCommand.h"\r
                                        >\r
                                </File>\r
-                       </Filter>\r
-                       <Filter\r
-                               Name="Export"\r
-                               >\r
                                <File\r
                                        RelativePath=".\Commands\ExportCommand.cpp"\r
                                        >\r
@@ -1465,6 +1531,370 @@
                                        >\r
                                </File>\r
                        </Filter>\r
+                       <Filter\r
+                               Name="cat"\r
+                               >\r
+                               <File\r
+                                       RelativePath=".\Commands\CatCommand.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Commands\CatCommand.h"\r
+                                       >\r
+                               </File>\r
+                       </Filter>\r
+                       <Filter\r
+                               Name="graph"\r
+                               >\r
+                       </Filter>\r
+                       <Filter\r
+                               Name="setting"\r
+                               >\r
+                               <File\r
+                                       RelativePath=".\Settings\SetBugTraq.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SetBugTraq.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SetBugTraqAdv.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SetBugTraqAdv.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SetDialogs.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SetDialogs.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SetLookAndFeelPage.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SetLookAndFeelPage.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SetMainPage.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SetMainPage.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SetMisc.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SetMisc.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SetOverlayIcons.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SetOverlayIcons.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SetOverlayPage.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SetOverlayPage.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SetProgsAdvDlg.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SetProgsAdvDlg.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SetProxyPage.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SetProxyPage.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SetSavedDataPage.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SetSavedDataPage.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SettingGitConfig.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SettingGitConfig.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SettingGitRemote.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SettingGitRemote.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\Settings.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\Settings.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SettingsColors.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SettingsColors.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SettingsColors2.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SettingsColors2.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SettingsColors3.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SettingsColors3.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Commands\SettingsCommand.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Commands\SettingsCommand.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SettingsProgsDiff.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SettingsProgsMerge.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SettingsProgsUniDiff.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SettingsPropPage.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SettingsPropPage.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SettingsRevisionGraph.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SettingsRevisionGraph.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SettingsTBlame.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\SettingsTBlame.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\ToolAssocDlg.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Settings\ToolAssocDlg.h"\r
+                                       >\r
+                               </File>\r
+                       </Filter>\r
+                       <Filter\r
+                               Name="Switch"\r
+                               >\r
+                               <File\r
+                                       RelativePath=".\GitSwitchDlg.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\GitSwitchDlg.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Commands\SwitchCommand.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Commands\SwitchCommand.h"\r
+                                       >\r
+                               </File>\r
+                       </Filter>\r
+                       <Filter\r
+                               Name="PrevDiff"\r
+                               >\r
+                               <File\r
+                                       RelativePath=".\Commands\PrevDiffCommand.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Commands\PrevDiffCommand.h"\r
+                                       >\r
+                               </File>\r
+                       </Filter>\r
+                       <Filter\r
+                               Name="Diff"\r
+                               >\r
+                               <File\r
+                                       RelativePath=".\Commands\DiffCommand.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Commands\DiffCommand.h"\r
+                                       >\r
+                               </File>\r
+                       </Filter>\r
+                       <Filter\r
+                               Name="Compare"\r
+                               >\r
+                               <File\r
+                                       RelativePath=".\Commands\ShowCompareCommand.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Commands\ShowCompareCommand.h"\r
+                                       >\r
+                               </File>\r
+                       </Filter>\r
+                       <Filter\r
+                               Name="Conflict"\r
+                               >\r
+                               <File\r
+                                       RelativePath=".\Commands\ConflictEditorCommand.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Commands\ConflictEditorCommand.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Commands\ResolveCommand.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Commands\ResolveCommand.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\ResolveDlg.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\ResolveDlg.h"\r
+                                       >\r
+                               </File>\r
+                       </Filter>\r
+                       <Filter\r
+                               Name="Rebase"\r
+                               >\r
+                               <File\r
+                                       RelativePath=".\Commands\RebaseCommand.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Commands\RebaseCommand.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\RebaseDlg.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\RebaseDlg.h"\r
+                                       >\r
+                               </File>\r
+                       </Filter>\r
+                       <Filter\r
+                               Name="merge"\r
+                               >\r
+                               <File\r
+                                       RelativePath=".\Commands\MergeCommand.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Commands\MergeCommand.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\MergeDlg.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\MergeDlg.h"\r
+                                       >\r
+                               </File>\r
+                       </Filter>\r
+                       <Filter\r
+                               Name="ReposStatus"\r
+                               >\r
+                               <File\r
+                                       RelativePath=".\Commands\RepoStatusCommand.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Commands\RepoStatusCommand.h"\r
+                                       >\r
+                               </File>\r
+                       </Filter>\r
+                       <Filter\r
+                               Name="Copy"\r
+                               >\r
+                               <File\r
+                                       RelativePath=".\Commands\DropCopyAddCommand.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Commands\DropCopyAddCommand.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Commands\DropCopyCommand.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Commands\DropCopyCommand.h"\r
+                                       >\r
+                               </File>\r
+                       </Filter>\r
                </Filter>\r
                <Filter\r
                        Name="Utility Dialogs"\r
@@ -1498,6 +1928,14 @@
                                >\r
                        </File>\r
                        <File\r
+                               RelativePath=".\ResetDlg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\ResetDlg.h"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\StatGraphDlg.cpp"\r
                                >\r
                        </File>\r
@@ -1505,6 +1943,14 @@
                                RelativePath=".\StatGraphDlg.h"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\SVNProgressDlg.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
+                               RelativePath=".\SVNProgressDlg.h"\r
+                               >\r
+                       </File>\r
                </Filter>\r
                <Filter\r
                        Name="Git"\r
@@ -1537,30 +1983,6 @@
                                RelativePath=".\SwitchDlg.h"\r
                                >\r
                        </File>\r
-                       <Filter\r
-                               Name="Compare"\r
-                               >\r
-                               <File\r
-                                       RelativePath=".\Commands\ShowCompareCommand.cpp"\r
-                                       >\r
-                               </File>\r
-                               <File\r
-                                       RelativePath=".\Commands\ShowCompareCommand.h"\r
-                                       >\r
-                               </File>\r
-                       </Filter>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Diff"\r
-                       >\r
-                       <File\r
-                               RelativePath=".\Commands\DiffCommand.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\Commands\DiffCommand.h"\r
-                               >\r
-                       </File>\r
                </Filter>\r
                <File\r
                        RelativePath="Resource.h"\r
@@ -1614,6 +2036,10 @@
                        RelativePath="TortoiseProc.h"\r
                        >\r
                </File>\r
+               <File\r
+                       RelativePath=".\TortoiseProcLang.vcproj"\r
+                       >\r
+               </File>\r
        </Files>\r
        <Globals>\r
                <Global\r
@@ -1622,7 +2048,7 @@
                />\r
                <Global\r
                        Name="RESOURCE_FILE"\r
-                       Value="\Profiles\b20596\tortoisegit\src\Resources\TortoiseProcENG.rc"\r
+                       Value="\build\x64\TortoiseGit\src\Resources\TortoiseProcENG.rc"\r
                />\r
        </Globals>\r
 </VisualStudioProject>\r
TortoiseGit日本語言語ファイル作成
About OSDN
Find Software
Develop Software
Help