summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNed Deily <nad@python.org>2016-10-11 00:56:44 (GMT)
committerNed Deily <nad@python.org>2016-10-11 00:56:44 (GMT)
commit96cbbdd8c7b7b980e21a68e694907335ec934df4 (patch)
tree54fdfd90f066922a5ea96125b096d5b892e1e304
parent66fe8febb1f96f31c90a3c11bfb36c596b021e52 (diff)
parent4d80a8a9165bea1acb542c49cc37d32551284f5b (diff)
downloadcpython-96cbbdd8c7b7b980e21a68e694907335ec934df4.zip
cpython-96cbbdd8c7b7b980e21a68e694907335ec934df4.tar.gz
cpython-96cbbdd8c7b7b980e21a68e694907335ec934df4.tar.bz2
merge 3.6
-rw-r--r--.hgtags1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 211c376..390e10d 100644
--- a/.hgtags
+++ b/.hgtags
@@ -171,3 +171,4 @@ cc15d736d860303b9da90d43cd32db39bab048df v3.5.0rc2
f3edf13dc339b8942ae6b309771ab197dd8ce6fa v3.6.0a3
017cf260936b444788c9b671d195b7bfd83dbd25 v3.6.0a4
5b0ca4ed5e2f0669d76ece7ef975c544580f12b4 v3.6.0b1
+b9fadc7d1c3f9c3c77f32f35afbe1a1cc38070e6 v3.6.0b2