diff options
| author | Tim Peters <tim@python.org> | 2013-08-21 18:55:56 -0500 |
|---|---|---|
| committer | Tim Peters <tim@python.org> | 2013-08-21 18:55:56 -0500 |
| commit | e0bb0c9c14cd0d29e62534afb9e3cd4ca41f21d7 (patch) | |
| tree | 891fbc711647d4979774ad97b2331e579cda4ce3 | |
| parent | 665ad902e9bb1ebb307d8e9f575485a30165acaa (diff) | |
| parent | 0b169125caf768b2dce97537d10470b3fdee9ec9 (diff) | |
| download | cpython-git-e0bb0c9c14cd0d29e62534afb9e3cd4ca41f21d7.tar.gz | |
Merge 3.3 into default.
The only file change is adding the v3.2.5 tag to the .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 |