summaryrefslogtreecommitdiffstats
path: root/Misc/ACKS
diff options
context:
space:
mode:
authorXiang Zhang <angwerzx@126.com>2016-12-27 04:32:33 (GMT)
committerXiang Zhang <angwerzx@126.com>2016-12-27 04:32:33 (GMT)
commitb3b01c3248825fa510a9b69ecb062c8ebc3422f2 (patch)
tree98c3387d77b16e8e08322107a752ba133ea4c6cc /Misc/ACKS
parentefda8a4f36a5c226765b0603d14c230d2e21a17e (diff)
parentb8a1aebb3d604924e42653feb536ef7e978ac59a (diff)
downloadcpython-b3b01c3248825fa510a9b69ecb062c8ebc3422f2.zip
cpython-b3b01c3248825fa510a9b69ecb062c8ebc3422f2.tar.gz
cpython-b3b01c3248825fa510a9b69ecb062c8ebc3422f2.tar.bz2
Issue #29078: Merge 3.6.
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 3f591a0..247c333 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1707,7 +1707,6 @@ Nickolai Zeldovich
Yuxiao Zeng
Uwe Zessin
Cheng Zhang
-Xiang Zhang
Kai Zhu
Tarek Ziadé
Jelle Zijlstra
@@ -1715,3 +1714,4 @@ Gennadiy Zlobin
Doug Zongker
Peter Ã…strand
evilzero
+Dhushyanth Ramasamy