summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-10-10 08:15:08 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-10-10 08:15:08 (GMT)
commitc15835437d23bfa8b6665dafeeb64123df0a1625 (patch)
tree54a5faf85417120271cb8210bdc36a4791344afa /Misc
parente6788dbfdc7f745cfb6a0122a0c301e5f7d4914c (diff)
downloadcpython-c15835437d23bfa8b6665dafeeb64123df0a1625.zip
cpython-c15835437d23bfa8b6665dafeeb64123df0a1625.tar.gz
cpython-c15835437d23bfa8b6665dafeeb64123df0a1625.tar.bz2
Merged revisions 85349 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r85349 | antoine.pitrou | 2010-10-10 10:10:16 +0200 (dim., 10 oct. 2010) | 4 lines Some platforms provide uintptr_t in inttypes.h. Patch by Akira Kitada. ........
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 0c48237..95dbb9e 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -411,6 +411,7 @@ Randall Kern
Magnus Kessler
Lawrence Kesteloot
Vivek Khera
+Akira Kitada
Mads Kiilerich
Taek Joo Kim
Paul Kippes
diff --git a/Misc/NEWS b/Misc/NEWS
index a76b995..3b76452 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -600,6 +600,9 @@ Extension Modules
Build
-----
+- Issue #10054: Some platforms provide uintptr_t in inttypes.h. Patch by
+ Akira Kitada.
+
- Issue #10055: Make json C89-compliant in UCS4 mode.
- Issue #6244: Allow detect_tkinter to look for Tcl/Tk 8.6.