X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=src%2FTortoiseProc%2FTortoiseProc.vcproj;h=5c94fe9c7c50073f1fdc63e809636907fb573087;hb=62078bcba706b66d18cdae5acf1016aed7d39ffc;hp=f24f0345f995c1440e7bb36b8b589f7ce997fd44;hpb=e1130385d0bec0c6fa5f5b7b99b32b6f70bf2a62;p=tortoisegit%2FTortoiseGitJp.git

diff --git a/src/TortoiseProc/TortoiseProc.vcproj b/src/TortoiseProc/TortoiseProc.vcproj
index f24f034..5c94fe9 100644
--- a/src/TortoiseProc/TortoiseProc.vcproj
+++ b/src/TortoiseProc/TortoiseProc.vcproj
@@ -21,8 +21,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="..\..\bin\Debug\bin"
-			IntermediateDirectory="..\..\obj\TortoiseProc\Debug"
+			OutputDirectory="..\..\bin\$(ConfigurationName)\bin"
+			IntermediateDirectory="..\..\obj\TortoiseProc\$(ConfigurationName)"
 			ConfigurationType="1"
 			UseOfMFC="2"
 			UseOfATL="1"
@@ -48,7 +48,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				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"
+				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"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;SVN_DEBUG;ENABLE_NLS;THESAURUS"
 				MinimalRebuild="true"
 				ExceptionHandling="2"
@@ -59,6 +59,7 @@
 				UsePrecompiledHeader="2"
 				WarningLevel="4"
 				DebugInformationFormat="4"
+				DisableSpecificWarnings="4996,4018"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -74,9 +75,10 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Crypt32.lib gdiplus.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib"
+				AdditionalDependencies="Crypt32.lib gdiplus.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib Dnsapi.lib"
 				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="libcd.lib;libc;shell32;LIBCMTD;"
+				AdditionalLibraryDirectories=""
+				IgnoreDefaultLibraryNames=""
 				DelayLoadDLLs="gdiplus.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -107,13 +109,13 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\bin\Release\bin"
-			IntermediateDirectory="..\..\obj\TortoiseProc\Release"
+			Name="Debug|x64"
+			OutputDirectory="..\..\bin\Debug64\bin"
+			IntermediateDirectory="..\..\obj\TortoiseProc\Debug64"
 			ConfigurationType="1"
 			UseOfMFC="2"
+			UseOfATL="0"
 			CharacterSet="1"
-			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -129,21 +131,18 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				MkTypLibCompatible="false"
+				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="1"
-				InlineFunctionExpansion="1"
-				FavorSizeOrSpeed="2"
-				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"
-				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;THESAURUS"
-				StringPooling="true"
-				MinimalRebuild="false"
+				Optimization="0"
+				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"
+				PreprocessorDefinitions="WIN64;_WINDOWS;_DEBUG;SVN_DEBUG;ENABLE_NLS;THESAURUS"
+				MinimalRebuild="true"
 				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
+				RuntimeLibrary="3"
 				TreatWChar_tAsBuiltInType="true"
 				ForceConformanceInForLoopScope="true"
 				RuntimeTypeInfo="true"
@@ -156,7 +155,7 @@
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
+				PreprocessorDefinitions="_DEBUG"
 				Culture="1033"
 				AdditionalIncludeDirectories="&quot;$(IntDir)&quot;;..\TortoiseShell"
 			/>
@@ -165,19 +164,15 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Crypt32.lib gdiplus.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libcd.lib;libc;shell32;"
+				AdditionalDependencies="Crypt32.lib gdiplus.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib Dnsapi.lib"
+				LinkIncremental="2"
+				IgnoreDefaultLibraryNames=""
 				DelayLoadDLLs="gdiplus.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="0"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
-				TargetMachine="1"
-				Profile="true"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -202,13 +197,13 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="..\..\bin\Debug64\bin"
-			IntermediateDirectory="..\..\obj\TortoiseProc\Debug64"
+			Name="Release|Win32"
+			OutputDirectory="..\..\bin\$(ConfigurationName)\bin"
+			IntermediateDirectory="..\..\obj\TortoiseProc\$(ConfigurationName)"
 			ConfigurationType="1"
 			UseOfMFC="2"
-			UseOfATL="0"
 			CharacterSet="1"
+			WholeProgramOptimization="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -224,31 +219,32 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				MkTypLibCompatible="false"
-				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
-				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"
-				PreprocessorDefinitions="WIN64;_WINDOWS;_DEBUG;SVN_DEBUG;ENABLE_NLS;THESAURUS"
-				MinimalRebuild="true"
+				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"
+				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;THESAURUS"
+				StringPooling="true"
+				MinimalRebuild="false"
 				ExceptionHandling="2"
-				RuntimeLibrary="3"
+				RuntimeLibrary="2"
+				BufferSecurityCheck="false"
 				TreatWChar_tAsBuiltInType="true"
 				ForceConformanceInForLoopScope="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="2"
 				WarningLevel="4"
 				DebugInformationFormat="3"
+				DisableSpecificWarnings="4996,4018"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
 			/>
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
+				PreprocessorDefinitions="NDEBUG"
 				Culture="1033"
 				AdditionalIncludeDirectories="&quot;$(IntDir)&quot;;..\TortoiseShell"
 			/>
@@ -257,15 +253,20 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				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"
-				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="shell32;msvcrt.lib"
+				AdditionalDependencies="Crypt32.lib gdiplus.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib Dnsapi.lib"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="../../ext/wingit"
+				IgnoreDefaultLibraryNames=""
 				DelayLoadDLLs="gdiplus.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				OptimizeForWindows98="0"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
-				TargetMachine="17"
+				TargetMachine="1"
+				Profile="true"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -318,10 +319,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="1"
-				InlineFunctionExpansion="1"
-				FavorSizeOrSpeed="2"
-				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"
+				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"
 				PreprocessorDefinitions="WIN64;_WINDOWS;NDEBUG;THESAURUS"
 				StringPooling="true"
 				MinimalRebuild="false"
@@ -349,9 +347,9 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				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"
+				AdditionalDependencies="Crypt32.lib gdiplus.lib shfolder.lib shell32.lib comctl32.lib ws2_32.lib rpcrt4.lib shlwapi.lib wininet.lib version.lib Dnsapi.lib"
 				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libcd.lib;libc;shell32;"
+				IgnoreDefaultLibraryNames=""
 				DelayLoadDLLs="gdiplus.dll"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -393,6 +391,26 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;h;hpp;hxx;hm;inl;inc"
 			>
 			<File
+				RelativePath="..\TGitCache\CacheInterface.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\LogFile.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\LogFile.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Patch.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Patch.h"
+				>
+			</File>
+			<File
 				RelativePath=".\ProjectProperties.cpp"
 				>
 			</File>
@@ -412,7 +430,11 @@
 					>
 				</File>
 				<File
-					RelativePath=".\Colors.cpp"
+					RelativePath=".\DeleteConflictDlg.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\DeleteConflictDlg.h"
 					>
 				</File>
 			</Filter>
@@ -420,6 +442,10 @@
 				Name="UI"
 				>
 				<File
+					RelativePath=".\Colors.cpp"
+					>
+				</File>
+				<File
 					RelativePath="..\Utils\MiscUI\SciEdit.cpp"
 					>
 				</File>
@@ -440,6 +466,10 @@
 				Name="3rd Party"
 				>
 			</Filter>
+			<Filter
+				Name="Graph"
+				>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Resource Files"
@@ -534,11 +564,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\copy.ico"
+				RelativePath="..\Resources\copy.ico"
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\copy.ico"
+				RelativePath=".\copy.ico"
 				>
 			</File>
 			<File
@@ -566,11 +596,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\explorer.ico"
+				RelativePath=".\explorer.ico"
 				>
 			</File>
 			<File
-				RelativePath=".\explorer.ico"
+				RelativePath="..\Resources\explorer.ico"
 				>
 			</File>
 			<File
@@ -594,6 +624,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\Resources\gitconfig.ico"
+				>
+			</File>
+			<File
+				RelativePath="..\Resources\gitremote.ico"
+				>
+			</File>
+			<File
 				RelativePath="..\Resources\graph-bar-stacked.ico"
 				>
 			</File>
@@ -814,11 +852,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\open.ico"
+				RelativePath=".\open.ico"
 				>
 			</File>
 			<File
-				RelativePath=".\open.ico"
+				RelativePath="..\Resources\open.ico"
 				>
 			</File>
 			<File
@@ -922,19 +960,19 @@
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\save.ico"
+				RelativePath=".\save.ico"
 				>
 			</File>
 			<File
-				RelativePath=".\save.ico"
+				RelativePath="..\Resources\save.ico"
 				>
 			</File>
 			<File
-				RelativePath="..\Resources\saveas.ico"
+				RelativePath=".\saveas.ico"
 				>
 			</File>
 			<File
-				RelativePath=".\saveas.ico"
+				RelativePath="..\Resources\saveas.ico"
 				>
 			</File>
 			<File
@@ -1104,11 +1142,59 @@
 			<Filter
 				Name="Blame"
 				>
+				<File
+					RelativePath=".\Commands\BlameCommand.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Commands\BlameCommand.h"
+					>
+				</File>
+				<File
+					RelativePath=".\BlameDlg.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\BlameDlg.h"
+					>
+				</File>
 			</Filter>
 			<Filter
 				Name="Log"
 				>
 				<File
+					RelativePath=".\GitLogCache.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\gitlogcache.h"
+					>
+				</File>
+				<File
+					RelativePath=".\GitLogList.h"
+					>
+				</File>
+				<File
+					RelativePath=".\GitLogListAction.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\GitLogListBase.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\GitLogListBase.h"
+					>
+				</File>
+				<File
+					RelativePath=".\lanes.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\lanes.h"
+					>
+				</File>
+				<File
 					RelativePath=".\Commands\LogCommand.cpp"
 					>
 				</File>
@@ -1117,6 +1203,10 @@
 					>
 				</File>
 				<File
+					RelativePath=".\LogDataVector.cpp"
+					>
+				</File>
+				<File
 					RelativePath=".\LogDlg.cpp"
 					>
 				</File>
@@ -1134,38 +1224,78 @@
 				</File>
 			</Filter>
 			<Filter
-				Name="PrevDiff"
+				Name="RefLog"
 				>
 				<File
-					RelativePath=".\Commands\PrevDiffCommand.cpp"
+					RelativePath=".\Commands\RefLogCommand.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\Commands\PrevDiffCommand.h"
+					RelativePath=".\Commands\RefLogCommand.h"
+					>
+				</File>
+				<File
+					RelativePath=".\RefLogDlg.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\RefLogDlg.h"
+					>
+				</File>
+				<File
+					RelativePath=".\RefLoglist.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\RefLoglist.h"
 					>
 				</File>
 			</Filter>
 			<Filter
-				Name="Rename"
+				Name="Submodule"
 				>
 				<File
-					RelativePath=".\Commands\RenameCommand.cpp"
+					RelativePath=".\SubmoduleAddDlg.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\Commands\RenameCommand.h"
+					RelativePath=".\SubmoduleAddDlg.h"
+					>
+				</File>
+				<File
+					RelativePath=".\Commands\SubmoduleCommand.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Commands\SubmoduleCommand.h"
 					>
 				</File>
 			</Filter>
 			<Filter
-				Name="ReposStatus"
+				Name="Rename"
 				>
 				<File
-					RelativePath=".\Commands\RepoStatusCommand.cpp"
+					RelativePath=".\Commands\DropMoveCommand.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\Commands\RepoStatusCommand.h"
+					RelativePath=".\Commands\DropMoveCommand.h"
+					>
+				</File>
+				<File
+					RelativePath=".\Commands\RenameCommand.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Commands\RenameCommand.h"
+					>
+				</File>
+				<File
+					RelativePath=".\RenameDlg.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\RenameDlg.h"
 					>
 				</File>
 			</Filter>
@@ -1192,28 +1322,36 @@
 					RelativePath=".\Commands\RevertCommand.h"
 					>
 				</File>
+				<File
+					RelativePath=".\RevertDlg.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\RevertDlg.h"
+					>
+				</File>
 			</Filter>
 			<Filter
-				Name="Clean"
+				Name="Stash"
 				>
 				<File
-					RelativePath=".\Commands\CleanupCommand.cpp"
+					RelativePath=".\Commands\StashCommand.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\Commands\CleanupCommand.h"
+					RelativePath=".\Commands\StashCommand.h"
 					>
 				</File>
 			</Filter>
 			<Filter
-				Name="Switch"
+				Name="Clean"
 				>
 				<File
-					RelativePath=".\Commands\SwitchCommand.cpp"
+					RelativePath=".\Commands\CleanupCommand.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\Commands\SwitchCommand.h"
+					RelativePath=".\Commands\CleanupCommand.h"
 					>
 				</File>
 			</Filter>
@@ -1228,6 +1366,14 @@
 					RelativePath=".\Commands\CloneCommand.h"
 					>
 				</File>
+				<File
+					RelativePath=".\CloneDlg.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\CloneDlg.h"
+					>
+				</File>
 			</Filter>
 			<Filter
 				Name="PullFetch"
@@ -1248,6 +1394,14 @@
 					RelativePath=".\Commands\PullCommand.h"
 					>
 				</File>
+				<File
+					RelativePath=".\PullFetchDlg.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\PullFetchDlg.h"
+					>
+				</File>
 			</Filter>
 			<Filter
 				Name="push"
@@ -1260,6 +1414,14 @@
 					RelativePath=".\Commands\PushCommand.h"
 					>
 				</File>
+				<File
+					RelativePath=".\PushDlg.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\PushDlg.h"
+					>
+				</File>
 			</Filter>
 			<Filter
 				Name="branch\tag"
@@ -1273,6 +1435,14 @@
 					>
 				</File>
 				<File
+					RelativePath=".\CreateBranchTagDlg.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\CreateBranchTagDlg.h"
+					>
+				</File>
+				<File
 					RelativePath=".\Commands\TagCommand.cpp"
 					>
 				</File>
@@ -1282,20 +1452,16 @@
 				</File>
 			</Filter>
 			<Filter
-				Name="merge"
+				Name="Export"
 				>
 				<File
-					RelativePath=".\Commands\MergeCommand.cpp"
+					RelativePath=".\Commands\DropExportCommand.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\Commands\MergeCommand.h"
+					RelativePath=".\Commands\DropExportCommand.h"
 					>
 				</File>
-			</Filter>
-			<Filter
-				Name="Export"
-				>
 				<File
 					RelativePath=".\Commands\ExportCommand.cpp"
 					>
@@ -1304,6 +1470,14 @@
 					RelativePath=".\Commands\ExportCommand.h"
 					>
 				</File>
+				<File
+					RelativePath=".\ExportDlg.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\ExportDlg.h"
+					>
+				</File>
 			</Filter>
 			<Filter
 				Name="Add"
@@ -1316,6 +1490,14 @@
 					RelativePath=".\Commands\AddCommand.h"
 					>
 				</File>
+				<File
+					RelativePath=".\AddDlg.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\AddDlg.h"
+					>
+				</File>
 			</Filter>
 			<Filter
 				Name="Ignore"
@@ -1341,6 +1523,14 @@
 					>
 				</File>
 				<File
+					RelativePath=".\FormatPatchDlg.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\FormatPatchDlg.h"
+					>
+				</File>
+				<File
 					RelativePath=".\Commands\ImportPatchCommand.cpp"
 					>
 				</File>
@@ -1348,93 +1538,429 @@
 					RelativePath=".\Commands\ImportPatchCommand.h"
 					>
 				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Utility Dialogs"
-			>
-			<File
-				RelativePath=".\AddDlg.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\AddDlg.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ChangedDlg.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\ChangedDlg.h"
+				<File
+					RelativePath=".\ImportPatchDlg.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\ImportPatchDlg.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="cat"
 				>
-			</File>
-			<File
-				RelativePath=".\ChooseVersion.h"
+				<File
+					RelativePath=".\Commands\CatCommand.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Commands\CatCommand.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="graph"
 				>
-			</File>
-			<File
-				RelativePath=".\CloneDlg.cpp"
+			</Filter>
+			<Filter
+				Name="setting"
 				>
-			</File>
-			<File
-				RelativePath=".\CloneDlg.h"
+				<File
+					RelativePath=".\Settings\SetBugTraq.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\SetBugTraq.h"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\SetBugTraqAdv.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\SetBugTraqAdv.h"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\SetDialogs.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\SetDialogs.h"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\SetLookAndFeelPage.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\SetLookAndFeelPage.h"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\SetMainPage.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\SetMainPage.h"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\SetMisc.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\SetMisc.h"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\SetOverlayIcons.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\SetOverlayIcons.h"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\SetOverlayPage.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\SetOverlayPage.h"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\SetProgsAdvDlg.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\SetProgsAdvDlg.h"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\SetProxyPage.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\SetProxyPage.h"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\SetSavedDataPage.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\SetSavedDataPage.h"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\SettingGitConfig.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\SettingGitConfig.h"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\SettingGitRemote.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\SettingGitRemote.h"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\Settings.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\Settings.h"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\SettingsColors.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\SettingsColors.h"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\SettingsColors2.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\SettingsColors2.h"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\SettingsColors3.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\SettingsColors3.h"
+					>
+				</File>
+				<File
+					RelativePath=".\Commands\SettingsCommand.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Commands\SettingsCommand.h"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\SettingSMTP.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\SettingSMTP.h"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\SettingsProgsDiff.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\SettingsProgsMerge.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\SettingsProgsUniDiff.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\SettingsPropPage.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\SettingsPropPage.h"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\SettingsRevisionGraph.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\SettingsRevisionGraph.h"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\SettingsTBlame.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\SettingsTBlame.h"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\ToolAssocDlg.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Settings\ToolAssocDlg.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Switch"
 				>
-			</File>
-			<File
-				RelativePath=".\CreateBranchTagDlg.cpp"
+				<File
+					RelativePath=".\GitSwitchDlg.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\GitSwitchDlg.h"
+					>
+				</File>
+				<File
+					RelativePath=".\Commands\SwitchCommand.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Commands\SwitchCommand.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="PrevDiff"
 				>
-			</File>
-			<File
-				RelativePath=".\CreateBranchTagDlg.h"
+				<File
+					RelativePath=".\Commands\PrevDiffCommand.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Commands\PrevDiffCommand.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Diff"
 				>
-			</File>
-			<File
-				RelativePath=".\ExportDlg.cpp"
+				<File
+					RelativePath=".\Commands\DiffCommand.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Commands\DiffCommand.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Compare"
 				>
-			</File>
-			<File
-				RelativePath=".\ExportDlg.h"
+				<File
+					RelativePath=".\Commands\ShowCompareCommand.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Commands\ShowCompareCommand.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Conflict"
 				>
-			</File>
-			<File
-				RelativePath=".\FileDiffDlg.cpp"
+				<File
+					RelativePath=".\Commands\ConflictEditorCommand.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Commands\ConflictEditorCommand.h"
+					>
+				</File>
+				<File
+					RelativePath=".\Commands\ResolveCommand.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Commands\ResolveCommand.h"
+					>
+				</File>
+				<File
+					RelativePath=".\ResolveDlg.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\ResolveDlg.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Rebase"
 				>
-			</File>
-			<File
-				RelativePath=".\FileDiffDlg.h"
+				<File
+					RelativePath=".\Commands\RebaseCommand.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Commands\RebaseCommand.h"
+					>
+				</File>
+				<File
+					RelativePath=".\RebaseDlg.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\RebaseDlg.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="merge"
 				>
-			</File>
-			<File
-				RelativePath=".\FormatPatchDlg.cpp"
+				<File
+					RelativePath=".\Commands\MergeCommand.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Commands\MergeCommand.h"
+					>
+				</File>
+				<File
+					RelativePath=".\MergeDlg.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\MergeDlg.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="ReposStatus"
 				>
-			</File>
-			<File
-				RelativePath=".\FormatPatchDlg.h"
+				<File
+					RelativePath=".\Commands\RepoStatusCommand.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Commands\RepoStatusCommand.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Copy"
 				>
-			</File>
-			<File
-				RelativePath=".\GitSwitchDlg.cpp"
+				<File
+					RelativePath=".\Commands\DropCopyAddCommand.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Commands\DropCopyAddCommand.h"
+					>
+				</File>
+				<File
+					RelativePath=".\Commands\DropCopyCommand.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Commands\DropCopyCommand.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="SendMail"
 				>
-			</File>
+				<File
+					RelativePath=".\Commands\SendMailCommand.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\Commands\SendMailCommand.h"
+					>
+				</File>
+				<File
+					RelativePath=".\SendMailDlg.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\SendMailDlg.h"
+					>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="Utility Dialogs"
+			>
 			<File
-				RelativePath=".\GitSwitchDlg.h"
+				RelativePath=".\ChangedDlg.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\ImportPatchDlg.cpp"
+				RelativePath=".\ChangedDlg.h"
 				>
 			</File>
 			<File
-				RelativePath=".\ImportPatchDlg.h"
+				RelativePath=".\ChooseVersion.h"
 				>
 			</File>
 			<File
-				RelativePath=".\MergeDlg.cpp"
+				RelativePath=".\FileDiffDlg.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\MergeDlg.h"
+				RelativePath=".\FileDiffDlg.h"
 				>
 			</File>
 			<File
@@ -1446,53 +1972,29 @@
 				>
 			</File>
 			<File
-				RelativePath=".\PullFetchDlg.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\PullFetchDlg.h"
-				>
-			</File>
-			<File
-				RelativePath=".\PushDlg.cpp"
+				RelativePath=".\ResetDlg.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\PushDlg.h"
+				RelativePath=".\ResetDlg.h"
 				>
 			</File>
 			<File
-				RelativePath=".\RenameDlg.cpp"
+				RelativePath=".\StatGraphDlg.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\RenameDlg.h"
+				RelativePath=".\StatGraphDlg.h"
 				>
 			</File>
 			<File
-				RelativePath=".\RevertDlg.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\RevertDlg.h"
+				RelativePath=".\SVNProgressDlg.cpp"
 				>
 			</File>
 			<File
 				RelativePath=".\SVNProgressDlg.h"
 				>
 			</File>
-			<File
-				RelativePath=".\SwitchLocalBranchPage.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\SwitchTagPage.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\SwitchTagPage.h"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Git"
@@ -1525,37 +2027,8 @@
 				RelativePath=".\SwitchDlg.h"
 				>
 			</File>
-			<Filter
-				Name="Compare"
-				>
-				<File
-					RelativePath=".\Commands\ShowCompareCommand.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\Commands\ShowCompareCommand.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Diff"
-			>
-			<File
-				RelativePath=".\Commands\DiffCommand.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\Commands\DiffCommand.h"
-				>
-			</File>
 		</Filter>
 		<File
-			RelativePath="..\..\..\..\tortoisegit\src\TortoiseProc\CloneDlg.htm"
-			DeploymentContent="true"
-			>
-		</File>
-		<File
 			RelativePath="Resource.h"
 			>
 		</File>
@@ -1571,7 +2044,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Release|Win32"
+				Name="Debug|x64"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
@@ -1579,7 +2052,7 @@
 				/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="Debug|x64"
+				Name="Release|Win32"
 				>
 				<Tool
 					Name="VCCLCompilerTool"
@@ -1607,6 +2080,10 @@
 			RelativePath="TortoiseProc.h"
 			>
 		</File>
+		<File
+			RelativePath=".\TortoiseProcLang.vcproj"
+			>
+		</File>
 	</Files>
 	<Globals>
 		<Global
@@ -1615,7 +2092,7 @@
 		/>
 		<Global
 			Name="RESOURCE_FILE"
-			Value="\Profiles\b20596\tortoisegit\src\Resources\TortoiseProcENG.rc"
+			Value="\TortoiseGit\src\Resources\TortoiseProcENG.rc"
 		/>
 	</Globals>
 </VisualStudioProject>