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

[zach.ware]

http://hg.python.org/cpython/rev/60b7bc5ec885
changeset:   90019:60b7bc5ec885
parent:      90017:ae5169297eb9
parent:      90018:3036985cf895
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Fri Mar 28 23:31:53 2014 -0500
summary:
  Merge with 3.4

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


diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -266,8 +266,7 @@
 you just have to set x64 as platform. In addition, the HOST_PYTHON
 environment variable must point to a Python interpreter (at least 2.4),
 to support cross-compilation from Win32.  Note that Visual Studio
-requires either Standard Edition or better, or Express Edition with the
-Windows SDK 64-bit compilers to be available in order to build 64-bit
+requires Professional Edition or better in order to build 64-bit
 binaries.
 
 

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