summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2016-03-13 07:40:55 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2016-03-13 07:40:55 (GMT)
commit0ce835fc7e68c8768948bdc201b2f955d0b34d5a (patch)
tree8cce7b517365bc3f55cd5c9870393e2360d3a3a4 /Misc
parent7dc830e988b80fcdb4a3f67c4d86d4a5c70aaf85 (diff)
parent8dea74f12aab7d0690d98037824c4a6d5d5cd1f7 (diff)
downloadcpython-0ce835fc7e68c8768948bdc201b2f955d0b34d5a.zip
cpython-0ce835fc7e68c8768948bdc201b2f955d0b34d5a.tar.gz
cpython-0ce835fc7e68c8768948bdc201b2f955d0b34d5a.tar.bz2
#25687: merge with 3.5.
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 a19e113..033f02b 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1092,6 +1092,7 @@ M. Papillon
Peter Parente
Alexandre Parenteau
Dan Parisien
+HyeSoo Park
William Park
Claude Paroz
Heikki Partanen