summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLarry Hastings <larry@hastings.org>2016-06-13 19:55:11 (GMT)
committerLarry Hastings <larry@hastings.org>2016-06-13 19:55:11 (GMT)
commitf5b1af6df559f1c29211701f21bd181eab6a5b60 (patch)
tree29f116e3c0f5ff6016e2aec4600fb09a535d1826
parent29f963732166260420ffbdebe9eb8b98a009dc8c (diff)
parent393c75932463cc06c9fd9fa41bfe7369c1139f5f (diff)
downloadcpython-f5b1af6df559f1c29211701f21bd181eab6a5b60.zip
cpython-f5b1af6df559f1c29211701f21bd181eab6a5b60.tar.gz
cpython-f5b1af6df559f1c29211701f21bd181eab6a5b60.tar.bz2
Forward-merge from 3.4 to 3.5.
-rw-r--r--.hgtags1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 07233f7..48b5fc1 100644
--- a/.hgtags
+++ b/.hgtags
@@ -146,6 +146,7 @@ ab2c023a9432f16652e89c404bbc84aa91bf55af v3.4.2
b4cbecbc0781e89a309d03b60a1f75f8499250e6 v3.4.3
04f3f725896c6961212c3a12e8ac25be6958f4fa v3.4.4rc1
737efcadf5a678b184e0fa431aae11276bf06648 v3.4.4
+3631bb4a2490292ebf81d3e947ae36da145da564 v3.4.5rc1
5d4b6a57d5fd7564bf73f3db0e46fe5eeb00bcd8 v3.5.0a1
0337bd7ebcb6559d69679bc7025059ad1ce4f432 v3.5.0a2
82656e28b5e5c4ae48d8dd8b5f0d7968908a82b6 v3.5.0a3