Commit Graph

2 Commits

Author SHA1 Message Date
Benjamin Peterson 920fca3922 Merged revisions 64313 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r64313 | benjamin.peterson | 2008-06-16 15:18:18 -0500 (Mon, 16 Jun 2008) | 1 line

  fix Tools/scripts/2to3 as the result of a merge error
........
2008-06-16 20:23:03 +00:00
Martin v. Löwis 823725e93c Merged revisions 61846-61847 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r61846 | martin.v.loewis | 2008-03-24 13:57:53 +0100 (Mo, 24 Mär 2008) | 2 lines

  Install 2to3 script.
........
  r61847 | martin.v.loewis | 2008-03-24 14:31:16 +0100 (Mo, 24 Mär 2008) | 2 lines

  Patch #2240: Implement signal.setitimer and signal.getitimer.
........
2008-03-24 13:39:54 +00:00