1 files changed, 11 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 2298c21a7fa..f306aefbd1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2013-01-12  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Enable conservative stack scanning for all architectures.
+        Suggested by Stefan Monnier in
+        <http://lists.gnu.org/archive/html/emacs-devel/2013-01/msg00183.html>.
+        * configure.ac (GC_MARK_STACK): Remove.
+
+2013-01-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * lib/getopt_.h: Remove trailing CRs that crept in.
+
 2013-01-11  Eli Zaretskii  <eliz@gnu.org>
 
         * lib/getopt_.h: Regenerate.