Merge branch 'bugs'

Conflicts: CHANGES.rst Cython/__init__.py

Merge branch 'bugs'
Conflicts: CHANGES.rst Cython/__init__.py
72d3b07c · Robert Bradshaw · 6815414b · 53db1cdd · 72d3b07c · 72d3b07c
Commit 72d3b07c authored Jan 03, 2013 by Robert Bradshaw
Show whitespace changes
Inline Side-by-side

Showing with 13 additions and 0 deletions

CHANGES.rst CHANGES.rst +9 -0

Cython/__init__.py Cython/__init__.py +4 -0

No files found.
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -21,6 +21,15 @@ Other changes
 -------------
+0.17.4 (2013-01-03)
+===================
+Bugs fixed
+----------
+* Garbage collection triggered during deallocation of container classes could lead to a double-deallocation.
 0.17.3 (2012-12-14)
 ===================

--- a/Cython/__init__.py
+++ b/Cython/__init__.py
+<<<<<<< HEAD
 from Cython.Shadow import __version__
+=======
+__version__ = "0.17.4"
+>>>>>>> bugs
 # Void cython.* directives (for case insensitive operating systems).
 from Cython.Shadow import *