summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLarry Hastings <larry@hastings.org>2015-11-23 07:46:02 (GMT)
committerLarry Hastings <larry@hastings.org>2015-11-23 07:46:02 (GMT)
commit21dbc50f115c0785bd433096ab31233acedefc7f (patch)
tree1e264fc9f844559a902b9caed442506cf718a27e
parent0cd3effacd43dbdce26039295331f59c14d1b956 (diff)
parent3715cab3cb6bc689c66e7aaaeb86fbf953fe0262 (diff)
downloadcpython-21dbc50f115c0785bd433096ab31233acedefc7f.zip
cpython-21dbc50f115c0785bd433096ab31233acedefc7f.tar.gz
cpython-21dbc50f115c0785bd433096ab31233acedefc7f.tar.bz2
Null merge from 3.5.
-rw-r--r--.hgtags1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 03ff73f..74ba64f 100644
--- a/.hgtags
+++ b/.hgtags
@@ -157,3 +157,4 @@ cc15d736d860303b9da90d43cd32db39bab048df v3.5.0rc2
66ed52375df802f9d0a34480daaa8ce79fc41313 v3.5.0rc3
2d033fedfa7f1e325fd14ccdaa9cb42155da206f v3.5.0rc4
374f501f4567b7595f2ad7798aa09afa2456bb28 v3.5.0
+948ef16a69513ba1ff15c9d7d0b012b949df4c80 v3.5.1rc1