Issue #17846: Merge with 3.4

269e83fd · Zachary Ware · 345511a4 · ef035655 · 269e83fd
Commit 269e83fd authored Jul 07, 2014 by Zachary Ware
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

PCbuild/readme.txt PCbuild/readme.txt +5 -2

No files found.
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -19,8 +19,11 @@ requirements are as follows:
 Visual C++ 2010 Express Edition
    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
    Required for building 64-bit Debug and Release configuration builds
 Visual Studio 2010 Premium Edition