summaryrefslogtreecommitdiffstats
path: root/Misc/ACKS
diff options
context:
space:
mode:
authorLarry Hastings <larry@hastings.org>2014-05-18 04:05:10 (GMT)
committerLarry Hastings <larry@hastings.org>2014-05-18 04:05:10 (GMT)
commit3a260d228b32b04a88d947b887bf81759e8e5f10 (patch)
treee4a34e9cbbf877cf021ffba743ddbf54e17526b7 /Misc/ACKS
parent2110603344316d927e6d639275c12f5da78601d5 (diff)
parentb1a1ec3151155a1ae65831793b4a5b7a87d9d09f (diff)
downloadcpython-3a260d228b32b04a88d947b887bf81759e8e5f10.zip
cpython-3a260d228b32b04a88d947b887bf81759e8e5f10.tar.gz
cpython-3a260d228b32b04a88d947b887bf81759e8e5f10.tar.bz2
Merge.
Diffstat (limited to 'Misc/ACKS')
-rw-r--r--Misc/ACKS2
1 files changed, 2 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 4068836..a323006 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -24,6 +24,7 @@ Jim Ahlstrom
Farhan Ahmad
Matthew Ahrens
Nir Aides
+Akira
Yaniv Aknin
Jyrki Alakuijala
Steve Alexander
@@ -672,6 +673,7 @@ Mads Kiilerich
Jason Killen
Jan Kim
Taek Joo Kim
+Sam Kimbrel
W. Trevor King
Paul Kippes
Steve Kirsch