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

[steve.dower]

https://hg.python.org/cpython/rev/f771a847b748
changeset:   101376:f771a847b748
parent:      101374:0fe913de4702
parent:      101375:6c433a669e67
user:        Steve Dower <steve.dower at microsoft.com>
date:        Mon May 16 11:05:00 2016 -0700
summary:
  Merge with 3.5

files:
  PC/launcher.c |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/PC/launcher.c b/PC/launcher.c
--- a/PC/launcher.c
+++ b/PC/launcher.c
@@ -1082,7 +1082,7 @@
     { 3190, 3230, L"3.3" },
     { 3250, 3310, L"3.4" },
     { 3320, 3350, L"3.5" },
-    { 3350, 3350, L"3.6" },
+    { 3360, 3361, L"3.6" },
     { 0 }
 };
 

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