summaryrefslogtreecommitdiffstats
path: root/Misc/ACKS
diff options
context:
space:
mode:
authorXiang Zhang <angwerzx@126.com>2016-12-27 04:30:42 (GMT)
committerXiang Zhang <angwerzx@126.com>2016-12-27 04:30:42 (GMT)
commitb8a1aebb3d604924e42653feb536ef7e978ac59a (patch)
tree9a7041bc984141308b0b633a773f0cae1a93730e /Misc/ACKS
parenta8803d21e75d486e1c3a037906b01eb2de82f5a7 (diff)
parent6721c7c3b2b25a76b76c1660e8da5efdefd91122 (diff)
downloadcpython-b8a1aebb3d604924e42653feb536ef7e978ac59a.zip
cpython-b8a1aebb3d604924e42653feb536ef7e978ac59a.tar.gz
cpython-b8a1aebb3d604924e42653feb536ef7e978ac59a.tar.bz2
Issue #29078: Merge 3.5.
Diffstat (limited to 'Misc/ACKS')
-rw-r--r--Misc/ACKS2
1 files changed, 1 insertions, 1 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 73370ba..553b527 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1704,7 +1704,6 @@ Nickolai Zeldovich
Yuxiao Zeng
Uwe Zessin
Cheng Zhang
-Xiang Zhang
Kai Zhu
Tarek Ziadé
Jelle Zijlstra
@@ -1712,3 +1711,4 @@ Gennadiy Zlobin
Doug Zongker
Peter Ã…strand
evilzero
+Dhushyanth Ramasamy