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

[zach.ware]

http://hg.python.org/cpython/rev/b5b54073d495
changeset:   91155:b5b54073d495
parent:      91153:3af408ef0e1a
parent:      91154:10cca530d14c
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Fri Jun 13 09:39:24 2014 -0500
summary:
  Issue #21745: Merge with 3.4

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


diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -17,6 +17,9 @@
     Required for building Release configuration builds that make use of
     Profile Guided Optimization (PGO), on either platform.
 
+Installing Service Pack 1 for Visual Studio 2010 is highly recommended
+to avoid LNK1123 errors.
+
 The official Python releases are built with PGO using Visual Studio 2010
 Ultimate Edition.
 

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