From: Benjamin Peterson Date: Fri, 5 Mar 2010 03:30:16 +0000 (+0000) Subject: Merged revisions 78684 via svnmerge from X-Git-Tag: v3.1.2rc1~6 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3e56dbe0ed438ccbd168feb030e2e06203f446ed;p=thirdparty%2FPython%2Fcpython.git 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 ........ ................ ................ --- 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