[Python-checkins] r78684 - in python/branches/py3k: Lib/lib2to3/tests/test_fixers.py Lib/lib2to3/tests/test_main.py Lib/lib2to3/tests/test_pytree.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Fri Mar  5 04:27:12 2010
New Revision: 78684

Log:
Merged revisions 78683 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

................
  r78683 | benjamin.peterson | 2010-03-04 21:24:17 -0600 (Thu, 04 Mar 2010) | 13 lines
  
  Merged revisions 78679,78681 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
  
  ........
    r78679 | benjamin.peterson | 2010-03-04 21:10:46 -0600 (Thu, 04 Mar 2010) | 1 line
    
    set svn:eol-style
  ........
    r78681 | benjamin.peterson | 2010-03-04 21:19:06 -0600 (Thu, 04 Mar 2010) | 1 line
    
    remove svn:executable property
  ........
................


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/lib2to3/tests/test_fixers.py   (props changed)
   python/branches/py3k/Lib/lib2to3/tests/test_main.py   (props changed)
   python/branches/py3k/Lib/lib2to3/tests/test_pytree.py   (props changed)