summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Dower <steve.dower@microsoft.com>2016-07-15 12:01:07 -0700
committerSteve Dower <steve.dower@microsoft.com>2016-07-15 12:01:07 -0700
commit3823aabb72124b40c8d79f270d34f91fb394ab39 (patch)
treebb29f5d9ae4fb948aee7f3e94830f23f6d7cf661
parentb3e73b30ff5a87c81ef69f3b19a486877ed7f0c2 (diff)
parentb7567c587d110723e743e7b665f53e14daa3a818 (diff)
downloadcpython-git-3823aabb72124b40c8d79f270d34f91fb394ab39.tar.gz
Merge from 3.5
-rw-r--r--PCbuild/tcl.vcxproj2
-rw-r--r--PCbuild/tix.vcxproj2
-rw-r--r--PCbuild/tk.vcxproj2
3 files changed, 6 insertions, 0 deletions
diff --git a/PCbuild/tcl.vcxproj b/PCbuild/tcl.vcxproj
index 464c83ce80..3dfd155810 100644
--- a/PCbuild/tcl.vcxproj
+++ b/PCbuild/tcl.vcxproj
@@ -88,4 +88,6 @@ nmake -f makefile.vc MACHINE=$(TclMachine) OPTS=$(TclOpts) $(TclDirs) $(DebugFla
<Delete Files="$(TargetPath);$(BuildPath)$(tclDLLName)" />
<RemoveDir Directories="$(IntDir)" />
</Target>
+
+ <Target Name="ResolveAssemblyReferences" />
</Project> \ No newline at end of file
diff --git a/PCbuild/tix.vcxproj b/PCbuild/tix.vcxproj
index f857f9e67f..d1bc0aba30 100644
--- a/PCbuild/tix.vcxproj
+++ b/PCbuild/tix.vcxproj
@@ -89,4 +89,6 @@ nmake /nologo -f makefile.vc MACHINE=$(TclMachine) $(DebugFlags) $(TclShortVersi
<RemoveDir Directories="$(OutDir)" />
<RemoveDir Directories="$(IntDir)" />
</Target>
+
+ <Target Name="ResolveAssemblyReferences" />
</Project> \ No newline at end of file
diff --git a/PCbuild/tk.vcxproj b/PCbuild/tk.vcxproj
index 20749f719f..a26318bbe7 100644
--- a/PCbuild/tk.vcxproj
+++ b/PCbuild/tk.vcxproj
@@ -92,4 +92,6 @@ nmake /nologo -f makefile.vc RC=rc MACHINE=$(TclMachine) OPTS=$(TkOpts) $(TkDirs
<Delete Files="$(TargetPath);$(BuildPath)$(tkDLLName)" />
<RemoveDir Directories="$(IntDir)" />
</Target>
+
+ <Target Name="ResolveAssemblyReferences" />
</Project> \ No newline at end of file