Merge X64 Build

diff --cc src/TortoiseGitBlame/TortoiseGitBlame.vcproj
index 8e8c0f9,24d96bb..ca91d9a
--- 1/src/TortoiseGitBlame/TortoiseGitBlame.vcproj
--- 2/src/TortoiseGitBlame/TortoiseGitBlame.vcproj
+++ b/src/TortoiseGitBlame/TortoiseGitBlame.vcproj
@@@ -429,9 -621,17 +621,17 @@@
                                                AdditionalIncludeDirectories="$(IntDir);..\TortoiseShell"\r
                                        />\r
                                </FileConfiguration>\r
+                               <FileConfiguration\r
+                                       Name="Release|x64"\r
+                                       >\r
+                                       <Tool\r
+                                               Name="VCResourceCompilerTool"\r
+                                               AdditionalIncludeDirectories="$(IntDir);..\TortoiseShell"\r
+                                       />\r
+                               </FileConfiguration>\r
                        </File>\r
                        <File\r
 -                              RelativePath="..\Resources\blameres\TortoiseGitBlameDoc.ico"\r
 +                              RelativePath=".\res\TortoiseGitBlameDoc.ico"\r
                                >\r
                        </File>\r
                        <File\r

diff --cc src/TortoiseGitBlame/TortoiseGitBlame.vcproj.FSL.B20596.user
Simple merge

diff --cc src/TortoiseProc/TortoiseProc.vcproj
Simple merge

diff --cc src/TortoiseProc/TortoiseProc.vcproj.FSL.B20596.user
Simple merge