summaryrefslogtreecommitdiffstats
path: root/Misc/ACKS
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2016-09-30 19:39:22 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2016-09-30 19:39:22 (GMT)
commit36925001e6d9290b000722ad2a6ea86dbc27ea09 (patch)
tree5aee84cb2946110ddaa50a48c21c90a263f28e56 /Misc/ACKS
parent1c3e75fea70bdd40113b56ae6706aa90f4e15397 (diff)
parentb4b55eb582e5a7c71bac90030ab3c46b5cd6d429 (diff)
downloadcpython-36925001e6d9290b000722ad2a6ea86dbc27ea09.zip
cpython-36925001e6d9290b000722ad2a6ea86dbc27ea09.tar.gz
cpython-36925001e6d9290b000722ad2a6ea86dbc27ea09.tar.bz2
Merge with 3.6
Diffstat (limited to 'Misc/ACKS')
-rw-r--r--Misc/ACKS1
1 files changed, 1 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 2dcdc9c..a5465a2 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1622,6 +1622,7 @@ Truida Wiedijk
Felix Wiemann
Gerry Wiener
Frank Wierzbicki
+Mariatta Wijaya
Santoso Wijaya
Chris Wilcox
Bryce "Zooko" Wilcox-O'Hearn