Merge with 3.4

This commit is contained in:
Zachary Ware 2014-06-13 09:43:32 -05:00
commit a4d1e461a7

View file

@ -20,9 +20,6 @@ Visual Studio 2010 Premium Edition
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.
All you need to do to build is open the solution "pcbuild.sln" in Visual
Studio, select the desired combination of configuration and platform,
then build with "Build Solution" or the F7 keyboard shortcut. You can