From ce0ffa18e5be86e521cdc865ad843f5303ae14d6 Mon Sep 17 00:00:00 2001
From: Stefan Behnel <stefan_ml@behnel.de>
Date: Wed, 12 Aug 2015 22:06:43 +0200
Subject: [PATCH] changelog

---
 CHANGES.rst | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index fd0259f65..b5bc30262 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -11,9 +11,19 @@ Features added
 * Parser was adapted to some minor syntax changes in Py3.6, e.g.
   https://bugs.python.org/issue9232
 
+* The embedded C code comments that show the original source code
+  can be discarded by setting ``Options.emit_code_comments = False``.
+
 Bugs fixed
 ----------
 
+* C string literals were previously always stored as non-const global
+  variables in the module.  They are now stored as global constants
+  when possible, and otherwise as non-const C string literals in the
+  generated code that uses them.  This improves compatibility with
+  strict C compiler options and prevents non-const strings literals
+  with the same content from being incorrectly merged.
+
 * ``isinf()`` declarations in ``libc/math.pxd`` and ``numpy/math.pxd`` now
   reflect the actual tristate ``int`` return value instead of using ``bint``.
 
-- 
2.30.9