summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2015-03-23 20:21:00 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2015-03-23 20:21:00 (GMT)
commitd1f3a002c3752bf75e394bf05230798d7f87b624 (patch)
tree0de048bf50d7b6d666d26c3dbc4e2b81a93a35fd /Misc
parent4dc2c221caf251f181b7a4136db9b39a1caed78b (diff)
parent19276f184f00829ce55ce0e98f8db06d93b7d665 (diff)
downloadcpython-d1f3a002c3752bf75e394bf05230798d7f87b624.zip
cpython-d1f3a002c3752bf75e394bf05230798d7f87b624.tar.gz
cpython-d1f3a002c3752bf75e394bf05230798d7f87b624.tar.bz2
Merge 3.4 (faulthandler ICC)
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 ec48e59..5dc91de 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -440,6 +440,7 @@ Doug Fort
Chris Foster
John Fouhy
Andrew Francis
+Matt Frank
Stefan Franke
Martin Franklin
Kent Frazier