summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLarry Hastings <larry@hastings.org>2017-01-17 09:01:19 (GMT)
committerLarry Hastings <larry@hastings.org>2017-01-17 09:01:19 (GMT)
commite741e4f88e2d65dad1a4ba5dc5a1e3848e909db5 (patch)
treeb44f5ce8fdc72eb8dda52b745143808f1f977148
parent09e4ce5a951d19c96eb078d22e5eacb17d55b8de (diff)
parenta52b0a474e3794276c5f776e056c46a0e06aae27 (diff)
downloadcpython-e741e4f88e2d65dad1a4ba5dc5a1e3848e909db5.zip
cpython-e741e4f88e2d65dad1a4ba5dc5a1e3848e909db5.tar.gz
cpython-e741e4f88e2d65dad1a4ba5dc5a1e3848e909db5.tar.bz2
Merge from 3.4.
-rw-r--r--.hgtags1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 0a8f185..b7ef041 100644
--- a/.hgtags
+++ b/.hgtags
@@ -149,6 +149,7 @@ b4cbecbc0781e89a309d03b60a1f75f8499250e6 v3.4.3
3631bb4a2490292ebf81d3e947ae36da145da564 v3.4.5rc1
619b61e505d0e2ccc8516b366e4ddd1971b46a6f v3.4.5
e199a272ccdac5a8c073d4690f60c13e0b6d86b0 v3.4.6rc1
+b662f47769213f23325144b80782c05764d0f053 v3.4.6
5d4b6a57d5fd7564bf73f3db0e46fe5eeb00bcd8 v3.5.0a1
0337bd7ebcb6559d69679bc7025059ad1ce4f432 v3.5.0a2
82656e28b5e5c4ae48d8dd8b5f0d7968908a82b6 v3.5.0a3