diff options
| author | Tim Peters <tim@python.org> | 2013-08-21 23:52:57 (GMT) |
|---|---|---|
| committer | Tim Peters <tim@python.org> | 2013-08-21 23:52:57 (GMT) |
| commit | 0b169125caf768b2dce97537d10470b3fdee9ec9 (patch) | |
| tree | 60c4aaf61ad02cc95149ef18de7ccb656da5b008 | |
| parent | 1e440cf5a267ce1787aa048525d45eb56fc06135 (diff) | |
| parent | 86d53caddad11808ca332ab93ec35508b602a0dd (diff) | |
| download | cpython-0b169125caf768b2dce97537d10470b3fdee9ec9.zip cpython-0b169125caf768b2dce97537d10470b3fdee9ec9.tar.gz cpython-0b169125caf768b2dce97537d10470b3fdee9ec9.tar.bz2 | |
Merge 3.2 into 3.3.
The only file change is adding the v3.2.5 tag to 3.3's .hgtags file.
| -rw-r--r-- | .hgtags | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -101,6 +101,7 @@ c860feaa348d663e598986894ee4680480577e15 v3.2.2rc1 3d0686d90f55a78f96d9403da2c52dc2411419d0 v3.2.3 b2cb7bc1edb8493c0a78f9331eae3e8fba6a881d v3.2.4rc1 1e10bdeabe3de02f038a63c001911561ac1d13a7 v3.2.4 +cef745775b6583446572cffad704100983db2bea v3.2.5 f1a9a6505731714f0e157453ff850e3b71615c45 v3.3.0a1 2f69db52d6de306cdaef0a0cc00cc823fb350b01 v3.3.0a2 0b53b70a40a00013505eb35e3660057b62be77be v3.3.0a3 |