summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLarry Hastings <larry@hastings.org>2015-12-06 22:11:21 -0800
committerLarry Hastings <larry@hastings.org>2015-12-06 22:11:21 -0800
commitf78d851804c6b64c9397613442668be9e6cbf885 (patch)
tree2cd63d24dc09361b3501bd7359e9c31c9018574e
parentd785da8fbbeec75c797e0e924d4d685f10638a12 (diff)
parentf9c88ec3c711a61a5cea98ab3b80d4ba7d7cb877 (diff)
downloadcpython-git-f78d851804c6b64c9397613442668be9e6cbf885.tar.gz
Mostly-null merge from 3.4. (Only added the tag for 3.4.4rc1.)
-rw-r--r--.hgtags1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index 8d5f662afd..e2a9eb0715 100644
--- a/.hgtags
+++ b/.hgtags
@@ -144,6 +144,7 @@ c0e311e010fcb5bae8d87ca22051cd0845ea0ca0 v3.4.1
ab2c023a9432f16652e89c404bbc84aa91bf55af v3.4.2
69dd528ca6255a66c37cc5cf680e8357d108b036 v3.4.3rc1
b4cbecbc0781e89a309d03b60a1f75f8499250e6 v3.4.3
+04f3f725896c6961212c3a12e8ac25be6958f4fa v3.4.4rc1
5d4b6a57d5fd7564bf73f3db0e46fe5eeb00bcd8 v3.5.0a1
0337bd7ebcb6559d69679bc7025059ad1ce4f432 v3.5.0a2
82656e28b5e5c4ae48d8dd8b5f0d7968908a82b6 v3.5.0a3