summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorPetri Lehtinen <petri@digip.org>2011-11-19 20:04:33 (GMT)
committerPetri Lehtinen <petri@digip.org>2011-11-19 20:04:33 (GMT)
commitaadc519ceb91124b3078bb409f2282ffc8ef8765 (patch)
tree5aea90ffb8657cc083113a5af8652a6a70e0ac99 /Misc
parentb96172e2cfbbd047959cb8b2a5b84b0b32388842 (diff)
parent8d40f16a6021dc7fbba1bdc1bbda27ea1e955777 (diff)
downloadcpython-aadc519ceb91124b3078bb409f2282ffc8ef8765.zip
cpython-aadc519ceb91124b3078bb409f2282ffc8ef8765.tar.gz
cpython-aadc519ceb91124b3078bb409f2282ffc8ef8765.tar.bz2
Merge branch 3.2 (closes #13338)
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS4
2 files changed, 5 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 986debd..acf2147 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -132,6 +132,7 @@ Titus Brown
Oleg Broytmann
Dave Brueck
Francisco Martín Brugué
+Floris Bruynooghe
Stan Bubrouski
Erik de Bueger
Jan-Hein Bührman
diff --git a/Misc/NEWS b/Misc/NEWS
index 183e4ed..90c0f3b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,10 @@ What's New in Python 3.3 Alpha 1?
Core and Builtins
-----------------
+- Issue #13338: Handle all enumerations in _Py_ANNOTATE_MEMORY_ORDER
+ to allow compiling extension modules with -Wswitch-enum on gcc.
+ Initial patch by Floris Bruynooghe.
+
- Issue #10227: Add an allocation cache for a single slice object. Patch by
Stefan Behnel.