Issue #17846: Merge with 3.4

This commit is contained in:
Zachary Ware 2014-07-07 14:35:02 -05:00
commit 269e83fd02
1 changed files with 5 additions and 2 deletions

View File

@ -19,8 +19,11 @@ requirements are as follows:
Visual C++ 2010 Express Edition Visual C++ 2010 Express Edition
Required for building 32-bit Debug and Release configuration builds. Required for building 32-bit Debug and Release configuration builds.
This edition does not support "solution folders", which pcbuild.sln The Python build solution pcbuild.sln makes use of Solution Folders,
uses; this will not prevent building. which this edition does not support. Any time pcbuild.sln is opened
or reloaded by Visual C++, a warning about Solution Folders will be
displayed which can be safely dismissed with no impact on your
ability to build Python.
Visual Studio 2010 Professional Edition Visual Studio 2010 Professional Edition
Required for building 64-bit Debug and Release configuration builds Required for building 64-bit Debug and Release configuration builds
Visual Studio 2010 Premium Edition Visual Studio 2010 Premium Edition