summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2008-03-24 13:39:54 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2008-03-24 13:39:54 (GMT)
commit823725e93cdd85371eae53352dd83fc634e95694 (patch)
tree9c9a313f8f0859aaf6790aa4b4900adb6d1b3e60 /Misc
parent6cf49cf10689bf2ff23fff05928daa23ecdf6fc2 (diff)
downloadcpython-823725e93cdd85371eae53352dd83fc634e95694.zip
cpython-823725e93cdd85371eae53352dd83fc634e95694.tar.gz
cpython-823725e93cdd85371eae53352dd83fc634e95694.tar.bz2
Merged revisions 61846-61847 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r61846 | martin.v.loewis | 2008-03-24 13:57:53 +0100 (Mo, 24 Mär 2008) | 2 lines Install 2to3 script. ........ r61847 | martin.v.loewis | 2008-03-24 14:31:16 +0100 (Mo, 24 Mär 2008) | 2 lines Patch #2240: Implement signal.setitimer and signal.getitimer. ........
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
1 files changed, 1 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index dbc86df..7f6e3db 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -531,6 +531,7 @@ François Pinard
Zach Pincus
Michael Piotrowski
Antoine Pitrou
+Guilherme Polo
Michael Pomraning
Iustin Pop
John Popplewell