summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_profile.py
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2010-03-05 03:33:11 (GMT)
committerBenjamin Peterson <benjamin@python.org>2010-03-05 03:33:11 (GMT)
commit5a53fdeee8241de751646b6a84947c25b7d01c28 (patch)
tree92c52682ef2ab2f9913ae295d336645259c8db85 /Lib/test/test_profile.py
parent20052814cdbde0d7160efdd4cbccbc2a91a715a0 (diff)
downloadcpython-5a53fdeee8241de751646b6a84947c25b7d01c28.zip
cpython-5a53fdeee8241de751646b6a84947c25b7d01c28.tar.gz
cpython-5a53fdeee8241de751646b6a84947c25b7d01c28.tar.bz2
Merged revisions 78678,78680,78682 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r78678 | benjamin.peterson | 2010-03-04 21:07:59 -0600 (Thu, 04 Mar 2010) | 1 line set svn:eol-style ........ r78680 | benjamin.peterson | 2010-03-04 21:15:07 -0600 (Thu, 04 Mar 2010) | 1 line set svn:eol-style on Lib files ........ r78682 | benjamin.peterson | 2010-03-04 21:20:06 -0600 (Thu, 04 Mar 2010) | 1 line remove the svn:executable property from files that don't have shebang lines ........
Diffstat (limited to 'Lib/test/test_profile.py')
-rw-r--r--[-rwxr-xr-x]Lib/test/test_profile.py0
1 files changed, 0 insertions, 0 deletions
diff --git a/Lib/test/test_profile.py b/Lib/test/test_profile.py
index 699fe4a..699fe4a 100755..100644
--- a/Lib/test/test_profile.py
+++ b/Lib/test/test_profile.py