merge 0.18.x branch into master

b675cd67 · Stefan Behnel · 2dadb472 · afbd83a1 · b675cd67 · b675cd67
Commit b675cd67 authored Jan 28, 2013 by Stefan Behnel
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

CHANGES.rst CHANGES.rst +2 -2

Cython/Shadow.py Cython/Shadow.py +1 -1

No files found.
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,8 +2,8 @@
 Cython Changelog
 ================

-0.18 (??)
-===================
+0.18 (2013-01-28)
+=================

 Features added
 --------------

--- a/Cython/Shadow.py
+++ b/Cython/Shadow.py
 # cython.* namespace for pure mode.
-__version__ = "0.18rc1"
+__version__ = "0.18"


 # BEGIN shameless copy from Cython/minivect/minitypes.py