diff options
author | Benjamin Peterson <benjamin@python.org> | 2010-03-05 03:27:12 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2010-03-05 03:27:12 (GMT) |
commit | 20052814cdbde0d7160efdd4cbccbc2a91a715a0 (patch) | |
tree | e662adbdd321a3df877d1e9408f226f4bb0c5390 /Lib | |
parent | b8f22b1498904016fda0566dcea3246b27fdcae6 (diff) | |
download | cpython-20052814cdbde0d7160efdd4cbccbc2a91a715a0.zip cpython-20052814cdbde0d7160efdd4cbccbc2a91a715a0.tar.gz cpython-20052814cdbde0d7160efdd4cbccbc2a91a715a0.tar.bz2 |
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
........
................
Diffstat (limited to 'Lib')
-rw-r--r--[-rwxr-xr-x] | Lib/lib2to3/tests/test_fixers.py | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | Lib/lib2to3/tests/test_pytree.py | 0 |
2 files changed, 0 insertions, 0 deletions
diff --git a/Lib/lib2to3/tests/test_fixers.py b/Lib/lib2to3/tests/test_fixers.py index a92f14a..a92f14a 100755..100644 --- a/Lib/lib2to3/tests/test_fixers.py +++ b/Lib/lib2to3/tests/test_fixers.py diff --git a/Lib/lib2to3/tests/test_pytree.py b/Lib/lib2to3/tests/test_pytree.py index 870970c..870970c 100755..100644 --- a/Lib/lib2to3/tests/test_pytree.py +++ b/Lib/lib2to3/tests/test_pytree.py |