summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2013-06-19 00:09:00 (GMT)
committerChristian Heimes <christian@cheimes.de>2013-06-19 00:09:00 (GMT)
commitd9a52f2625b66b031e8e6045f7a923aa85d7d3e5 (patch)
treef1a38a3c428b54c21d0c57cf5dcb9a7d90758b05 /Misc
parentd2774c7d097bdc1929cb071b74f7b85ddb6ed789 (diff)
parent9a00e0a41c7bd51cfa9e24977fb81d4dd67e3973 (diff)
downloadcpython-d9a52f2625b66b031e8e6045f7a923aa85d7d3e5.zip
cpython-d9a52f2625b66b031e8e6045f7a923aa85d7d3e5.tar.gz
cpython-d9a52f2625b66b031e8e6045f7a923aa85d7d3e5.tar.bz2
merge heads
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index e8aac41..f3e427a 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -327,6 +327,7 @@ Maxim Dzumanenko
Walter Dörwald
Hans Eckardt
Rodolpho Eckhardt
+David Edelsohn
John Edmonds
Grant Edwards
John Ehresman
diff --git a/Misc/NEWS b/Misc/NEWS
index fa89eb3..916f96a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -143,6 +143,9 @@ Tools/Demos
Build
-----
+- Issue #18256: Compilation fix for recent AIX releases. Patch by
+ David Edelsohn.
+
- Issue #15172: Document NASM 2.10+ as requirement for building OpenSSL 1.0.1
on Windows.