Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Null merge from 3.5.

This commit is contained in:
Larry Hastings 2015-12-06 22:14:58 -08:00
parent 9ec5e25f26 f78d851804
commit ef3a67682b
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.hgtags
View File

@ -144,6 +144,7 @@ c0e311e010fcb5bae8d87ca22051cd0845ea0ca0 v3.4.1
ab2c023a9432f16652e89c404bbc84aa91bf55af v3.4.2 ab2c023a9432f16652e89c404bbc84aa91bf55af v3.4.2
69dd528ca6255a66c37cc5cf680e8357d108b036 v3.4.3rc1 69dd528ca6255a66c37cc5cf680e8357d108b036 v3.4.3rc1
b4cbecbc0781e89a309d03b60a1f75f8499250e6 v3.4.3 b4cbecbc0781e89a309d03b60a1f75f8499250e6 v3.4.3
04f3f725896c6961212c3a12e8ac25be6958f4fa v3.4.4rc1
5d4b6a57d5fd7564bf73f3db0e46fe5eeb00bcd8 v3.5.0a1 5d4b6a57d5fd7564bf73f3db0e46fe5eeb00bcd8 v3.5.0a1
0337bd7ebcb6559d69679bc7025059ad1ce4f432 v3.5.0a2 0337bd7ebcb6559d69679bc7025059ad1ce4f432 v3.5.0a2
82656e28b5e5c4ae48d8dd8b5f0d7968908a82b6 v3.5.0a3 82656e28b5e5c4ae48d8dd8b5f0d7968908a82b6 v3.5.0a3
@ -158,3 +159,4 @@ cc15d736d860303b9da90d43cd32db39bab048df v3.5.0rc2
2d033fedfa7f1e325fd14ccdaa9cb42155da206f v3.5.0rc4 2d033fedfa7f1e325fd14ccdaa9cb42155da206f v3.5.0rc4
374f501f4567b7595f2ad7798aa09afa2456bb28 v3.5.0 374f501f4567b7595f2ad7798aa09afa2456bb28 v3.5.0
948ef16a69513ba1ff15c9d7d0b012b949df4c80 v3.5.1rc1 948ef16a69513ba1ff15c9d7d0b012b949df4c80 v3.5.1rc1
37a07cee5969e6d3672583187a73cf636ff28e1b v3.5.1

7
Misc/NEWS
View File

@ -5,7 +5,7 @@ Python News
What's New in Python 3.6.0 alpha 1? What's New in Python 3.6.0 alpha 1?
=================================== ===================================
Release date: XXXX-XX-XX Release date: tba
Core and Builtins Core and Builtins
----------------- -----------------
@ -514,8 +514,8 @@ Release date: 2015-12-06
Core and Builtins Core and Builtins
----------------- -----------------
Library - Issue #25709: Fixed problem with in-place string concatenation and
------- utf-8 cache.
Windows Windows
------- -------
@ -523,6 +523,7 @@ Windows
- Issue #25715: Python 3.5.1 installer shows wrong upgrade path and incorrect - Issue #25715: Python 3.5.1 installer shows wrong upgrade path and incorrect
logic for launcher detection. logic for launcher detection.
What's New in Python 3.5.1 release candidate 1? What's New in Python 3.5.1 release candidate 1?
=============================================== ===============================================