OSDN Git Service

Merge remove x86 build
authorFrank Li <lznuaa@gmail.com>
Fri, 20 Feb 2009 05:19:38 +0000 (13:19 +0800)
committerFrank Li <lznuaa@gmail.com>
Fri, 20 Feb 2009 05:19:38 +0000 (13:19 +0800)
1  2 
Languages/TortoiseLang.vcproj
src/Git/GitStatusListCtrl.cpp
src/Git/GitStatusListCtrl.h
src/Resources/TortoiseProcENG.rc
src/TortoiseGitBlame/TortoiseGitBlame.vcproj
src/TortoiseProc/CommitDlg.cpp
src/TortoiseProc/resource.h

Simple merge
Simple merge
Simple merge
index 2d98442,3290da6..c68f02f
Binary files differ
                        <Tool\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="2"\r
-                               IgnoreDefaultLibraryNames="LIBCMTD"\r
+                               LinkIncremental="1"\r
+                               AdditionalLibraryDirectories=""\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
 -                              OptimizeReferences="2"\r
 -                              EnableCOMDATFolding="2"\r
 -                              TargetMachine="1"\r
 +                              TargetMachine="17"\r
                        />\r
                        <Tool\r
                                Name="VCALinkTool"\r
Simple merge
index 3dbd7b3,2a3327e..9fe6ebd
Binary files differ