summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLarry Hastings <larry@hastings.org>2017-01-03 02:40:11 (GMT)
committerLarry Hastings <larry@hastings.org>2017-01-03 02:40:11 (GMT)
commitef29a05f9851ca37a4b63cb2889bc6ec0f0f9bb0 (patch)
tree21e55cf983a99607b6c26b2a0ade5b77f5ea9895
parent865a0f621fae0a63f0db186d9b7f30d1cebfa1de (diff)
parentc70225c98cc449de4dce99a93532498ae44ba7de (diff)
downloadcpython-ef29a05f9851ca37a4b63cb2889bc6ec0f0f9bb0.zip
cpython-ef29a05f9851ca37a4b63cb2889bc6ec0f0f9bb0.tar.gz
cpython-ef29a05f9851ca37a4b63cb2889bc6ec0f0f9bb0.tar.bz2
Null-merge from 3.6. Last one--phew!
-rw-r--r--.hgtags2
1 files changed, 2 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 8df6239..bfab4a0 100644
--- a/.hgtags
+++ b/.hgtags
@@ -149,6 +149,7 @@ b4cbecbc0781e89a309d03b60a1f75f8499250e6 v3.4.3
3631bb4a2490292ebf81d3e947ae36da145da564 v3.4.5rc1
619b61e505d0e2ccc8516b366e4ddd1971b46a6f v3.4.5
3631bb4a2490292ebf81d3e947ae36da145da564 v3.4.5rc1
+e199a272ccdac5a8c073d4690f60c13e0b6d86b0 v3.4.6rc1
5d4b6a57d5fd7564bf73f3db0e46fe5eeb00bcd8 v3.5.0a1
0337bd7ebcb6559d69679bc7025059ad1ce4f432 v3.5.0a2
82656e28b5e5c4ae48d8dd8b5f0d7968908a82b6 v3.5.0a3
@@ -166,6 +167,7 @@ cc15d736d860303b9da90d43cd32db39bab048df v3.5.0rc2
37a07cee5969e6d3672583187a73cf636ff28e1b v3.5.1
68feec6488b26327a85a634605dd28eca4daa5f1 v3.5.2rc1
4def2a2901a5618ea45bcc8f2a1411ef33af18ad v3.5.2
+de530d7f21c0398bb2a2b67716e0638e5fadf727 v3.5.3rc1
5896da372fb044e38595fb74495de1e1e7c8fb3c v3.6.0a1
37889342355223e2fc1438de3dc7ffcd625c60f7 v3.6.0a2
f3edf13dc339b8942ae6b309771ab197dd8ce6fa v3.6.0a3