From 3e56dbe0ed438ccbd168feb030e2e06203f446ed Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Fri, 5 Mar 2010 03:30:16 +0000 Subject: [PATCH] Merged revisions 78684 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r78684 | benjamin.peterson | 2010-03-04 21:27:12 -0600 (Thu, 04 Mar 2010) | 20 lines 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 ........ ................ ................ --- Lib/lib2to3/tests/test_fixers.py | 0 Lib/lib2to3/tests/test_pytree.py | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 Lib/lib2to3/tests/test_fixers.py mode change 100755 => 100644 Lib/lib2to3/tests/test_pytree.py diff --git a/Lib/lib2to3/tests/test_fixers.py b/Lib/lib2to3/tests/test_fixers.py old mode 100755 new mode 100644 diff --git a/Lib/lib2to3/tests/test_pytree.py b/Lib/lib2to3/tests/test_pytree.py old mode 100755 new mode 100644