summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2011-03-05 19:31:42 (GMT)
committerGeorg Brandl <georg@python.org>2011-03-05 19:31:42 (GMT)
commit53b13e9873a7503a29d295d9451b44d5d636ce27 (patch)
treeb7a740764003d108a62dcd226106dd55c8546437
parent533c79dc67824d95b0aff5a252f9415d3bc80716 (diff)
parent776e2d4d226d91db0e607353ded5358b36c51c1b (diff)
downloadcpython-53b13e9873a7503a29d295d9451b44d5d636ce27.zip
cpython-53b13e9873a7503a29d295d9451b44d5d636ce27.tar.gz
cpython-53b13e9873a7503a29d295d9451b44d5d636ce27.tar.bz2
Merge tags from 3.2.
-rw-r--r--.hgtags7
1 files changed, 7 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index a859cd7..6427e41 100644
--- a/.hgtags
+++ b/.hgtags
@@ -69,6 +69,12 @@ b63020797f9678adaf4d2c3e26574a9eef2ef028 v3.1b1
4353fd0843cb31b356adc50f93d220e2e7255ef2 v3.1rc1
0b87e438e1b53e3f812cad963a7fdb65d198ba2f v3.1rc2
a69a031ac1402dede8b1ef80096436bca6d371f3 v3.1
+35efb1054ec6ceca72017a587263cb6a9257340b v3.1.1rc1
+8b9c0f573ab29c41c6c5fdcca82a1fe0ff5355af v3.1.1
+149b8b87514d10416b598884db5f74651f625b38 v3.1.2rc1
+960efa327c5d9c18df995437b0ac550cb89c9f85 v3.1.2
+d18e9d71f369d8211f6ac87252c6d3211f9bd09f v3.1.3rc1
+a4f75773c0060cee38b0bb651a7aba6f56b0e996 v3.1.3
b37b7834757492d009b99cf0ca4d42d2153d7fac v3.2a1
56d4373cecb73c8b45126ba7b045b3c7b3f94b0b v3.2a2
da012d9a2c23d144e399d2e01a55b8a83ad94573 v3.2a3
@@ -78,3 +84,4 @@ e3af5f3a7904c0d5343ec9633ea66e7acfd23a66 v3.2b2
865d5b24bf28ca41b536befc326407c03e74a4d5 v3.2rc1
acf3e24dd0d0dfd1e20c907d696d3da965a8f56f v3.2rc2
18c1f52896501c7ee13b038454a39acb45a87979 v3.2rc3
+a222a015e28d8ae9af3899258dc6c15c3d40add0 v3.2