OSDN Git Service

Add Reset Command
[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / TortoiseProc.vcproj
index da79e05..bb50e5e 100644 (file)
@@ -21,8 +21,8 @@
        <Configurations>\r
                <Configuration\r
                        Name="Debug|Win32"\r
-                       OutputDirectory="..\..\bin\Debug\bin"\r
-                       IntermediateDirectory="..\..\obj\TortoiseProc\Debug"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+                       IntermediateDirectory="..\..\obj\TortoiseProc\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        UseOfMFC="2"\r
                        UseOfATL="1"\r
@@ -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
                </Configuration>\r
                <Configuration\r
                        Name="Release|Win32"\r
-                       OutputDirectory="..\..\bin\Release\bin"\r
-                       IntermediateDirectory="..\..\obj\TortoiseProc\Release"\r
+                       OutputDirectory="..\..\bin\$(ConfigurationName)\bin"\r
+                       IntermediateDirectory="..\..\obj\TortoiseProc\$(ConfigurationName)"\r
                        ConfigurationType="1"\r
                        UseOfMFC="2"\r
                        CharacterSet="1"\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
                                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;"\r
+                               IgnoreDefaultLibraryNames="libcd.lib;libc;shell32;LIBCMT"\r
                                DelayLoadDLLs="gdiplus.dll"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                        <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
                        />\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="libcd.lib;libc;shell32;LIBCMT"\r
                                DelayLoadDLLs="gdiplus.dll"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\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
                        />\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="libcd.lib;libc;shell32;LIBCMT"\r
                                DelayLoadDLLs="gdiplus.dll"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                        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=".\ProjectProperties.cpp"\r
                                >\r
                        </File>\r
                                        RelativePath=".\AppUtils.cpp"\r
                                        >\r
                                </File>\r
-                               <File\r
-                                       RelativePath=".\Colors.cpp"\r
-                                       >\r
-                               </File>\r
                        </Filter>\r
                        <Filter\r
                                Name="UI"\r
                                >\r
                                <File\r
+                                       RelativePath=".\Colors.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
                                        RelativePath="..\Utils\MiscUI\SciEdit.cpp"\r
                                        >\r
                                </File>\r
                                Name="3rd Party"\r
                                >\r
                        </Filter>\r
+                       <Filter\r
+                               Name="Graph"\r
+                               >\r
+                       </Filter>\r
                </Filter>\r
                <Filter\r
                        Name="Resource Files"\r
                        <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.h"\r
+                                       >\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
+                               <File\r
+                                       RelativePath=".\lanes.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
                                        RelativePath=".\Commands\LogCommand.cpp"\r
                                        >\r
                                </File>\r
                                        >\r
                                </File>\r
                                <File\r
+                                       RelativePath=".\LogDataVector.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
                                        RelativePath=".\LogDlg.cpp"\r
                                        >\r
                                </File>\r
                                </File>\r
                        </Filter>\r
                        <Filter\r
-                               Name="PrevDiff"\r
+                               Name="Rename"\r
                                >\r
                                <File\r
-                                       RelativePath=".\Commands\PrevDiffCommand.cpp"\r
+                                       RelativePath=".\Commands\RenameCommand.cpp"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath=".\Commands\PrevDiffCommand.h"\r
+                                       RelativePath=".\Commands\RenameCommand.h"\r
                                        >\r
                                </File>\r
-                       </Filter>\r
-                       <Filter\r
-                               Name="Rename"\r
-                               >\r
                                <File\r
-                                       RelativePath=".\Commands\RenameCommand.cpp"\r
+                                       RelativePath=".\RenameDlg.cpp"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath=".\Commands\RenameCommand.h"\r
+                                       RelativePath=".\RenameDlg.h"\r
                                        >\r
                                </File>\r
                        </Filter>\r
                                        RelativePath=".\Commands\RevertCommand.h"\r
                                        >\r
                                </File>\r
-                       </Filter>\r
-                       <Filter\r
-                               Name="Clean"\r
-                               >\r
                                <File\r
-                                       RelativePath=".\Commands\CleanupCommand.cpp"\r
+                                       RelativePath=".\RevertDlg.cpp"\r
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath=".\Commands\CleanupCommand.h"\r
+                                       RelativePath=".\RevertDlg.h"\r
                                        >\r
                                </File>\r
                        </Filter>\r
                        <Filter\r
-                               Name="Switch"\r
+                               Name="Clean"\r
                                >\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
                                        RelativePath=".\Commands\CloneCommand.h"\r
                                        >\r
                                </File>\r
+                               <File\r
+                                       RelativePath=".\CloneDlg.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\CloneDlg.h"\r
+                                       >\r
+                               </File>\r
                        </Filter>\r
                        <Filter\r
                                Name="PullFetch"\r
                                        RelativePath=".\Commands\PullCommand.h"\r
                                        >\r
                                </File>\r
+                               <File\r
+                                       RelativePath=".\PullFetchDlg.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\PullFetchDlg.h"\r
+                                       >\r
+                               </File>\r
                        </Filter>\r
                        <Filter\r
                                Name="push"\r
                                        RelativePath=".\Commands\PushCommand.h"\r
                                        >\r
                                </File>\r
+                               <File\r
+                                       RelativePath=".\PushDlg.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\PushDlg.h"\r
+                                       >\r
+                               </File>\r
                        </Filter>\r
                        <Filter\r
-                               Name="branch"\r
+                               Name="branch\tag"\r
                                >\r
+                               <File\r
+                                       RelativePath=".\Commands\BranchCommand.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Commands\BranchCommand.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\CreateBranchTagDlg.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\CreateBranchTagDlg.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Commands\TagCommand.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Commands\TagCommand.h"\r
+                                       >\r
+                               </File>\r
                        </Filter>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Utility Dialogs"\r
-                       >\r
-                       <File\r
-                               RelativePath=".\ChangedDlg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\ChangedDlg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\CloneDlg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\CloneDlg.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\CreateBranchTagDlg.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\CreateBranchTagDlg.h"\r
+                       <Filter\r
+                               Name="merge"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\FileDiffDlg.cpp"\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="Export"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\FileDiffDlg.h"\r
+                               <File\r
+                                       RelativePath=".\Commands\ExportCommand.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Commands\ExportCommand.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\ExportDlg.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\ExportDlg.h"\r
+                                       >\r
+                               </File>\r
+                       </Filter>\r
+                       <Filter\r
+                               Name="Add"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\GitSwitch.cpp"\r
+                               <File\r
+                                       RelativePath=".\Commands\AddCommand.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Commands\AddCommand.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\AddDlg.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\AddDlg.h"\r
+                                       >\r
+                               </File>\r
+                       </Filter>\r
+                       <Filter\r
+                               Name="Ignore"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\GitSwitch.h"\r
+                               <File\r
+                                       RelativePath=".\Commands\IgnoreCommand.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Commands\IgnoreCommand.h"\r
+                                       >\r
+                               </File>\r
+                       </Filter>\r
+                       <Filter\r
+                               Name="Patch"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\ProgressDlg.cpp"\r
+                               <File\r
+                                       RelativePath=".\Commands\FormatPatchCommand.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Commands\FormatPatchCommand.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\FormatPatchDlg.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\FormatPatchDlg.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Commands\ImportPatchCommand.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Commands\ImportPatchCommand.h"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\ImportPatchDlg.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\ImportPatchDlg.h"\r
+                                       >\r
+                               </File>\r
+                       </Filter>\r
+                       <Filter\r
+                               Name="cat"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\ProgressDlg.h"\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
-                       </File>\r
-                       <File\r
-                               RelativePath=".\PullFetchDlg.cpp"\r
+                       </Filter>\r
+                       <Filter\r
+                               Name="setting"\r
                                >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\PullFetchDlg.h"\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\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\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
-                       <File\r
-                               RelativePath=".\PushDlg.cpp"\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
-                       <File\r
-                               RelativePath=".\PushDlg.h"\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
-                       <File\r
-                               RelativePath=".\RenameDlg.cpp"\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
-                       <File\r
-                               RelativePath=".\RenameDlg.h"\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
+                               <File\r
+                                       RelativePath=".\Commands\ConflictEditorCommand.cpp"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath=".\Commands\ConflictEditorCommand.h"\r
+                                       >\r
+                               </File>\r
+                       </Filter>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Utility Dialogs"\r
+                       >\r
                        <File\r
-                               RelativePath=".\RevertDlg.cpp"\r
+                               RelativePath=".\ChangedDlg.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\RevertDlg.h"\r
+                               RelativePath=".\ChangedDlg.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\SVNProgressDlg.h"\r
+                               RelativePath=".\ChooseVersion.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\SwitchLocalBranchPage.cpp"\r
+                               RelativePath=".\FileDiffDlg.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\SwitchLocalBranchPage.h"\r
+                               RelativePath=".\FileDiffDlg.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\SwitchTagPage.cpp"\r
+                               RelativePath=".\ProgressDlg.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\SwitchTagPage.h"\r
+                               RelativePath=".\ProgressDlg.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\SwitchVersionPage.cpp"\r
+                               RelativePath=".\ResetDlg.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\SwitchVersionPage.h"\r
+                               RelativePath=".\ResetDlg.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\SwtichRemoteBranchPage.cpp"\r
+                               RelativePath=".\StatGraphDlg.cpp"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\SwtichRemoteBranchPage.h"\r
+                               RelativePath=".\StatGraphDlg.h"\r
                                >\r
                        </File>\r
                </Filter>\r
                                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="..\..\..\..\tortoisegit\src\TortoiseProc\CloneDlg.htm"\r
-                       DeploymentContent="true"\r
-                       >\r
-               </File>\r
-               <File\r
                        RelativePath="Resource.h"\r
                        >\r
                </File>\r