From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 5 Mar 2010 03:27:16 +0000 (+0000)
Subject: Merged revisions 78683 via svnmerge from
X-Git-Tag: v2.6.5rc2~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f580a5b9249b9a7983ff9358467479e151e08c05;p=python

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