[Python-checkins] cpython (merge 3.4 -> default): Issue #17846: Merge with 3.4

[zach.ware]

http://hg.python.org/cpython/rev/39f9cd7ad19a
changeset:   91593:39f9cd7ad19a
parent:      91591:1cd04dd9ecf1
parent:      91592:bb3f1afcd082
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Mon Jul 07 14:35:02 2014 -0500
summary:
  Issue #17846: Merge with 3.4

files:
  PCbuild/readme.txt |  7 +++++--
  1 files changed, 5 insertions(+), 2 deletions(-)


diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -19,8 +19,11 @@
 
 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
-    uses; this will not prevent building.
+    The Python build solution pcbuild.sln makes use of Solution Folders,
+    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

-- 
Repository URL: http://hg.python.org/cpython