1 files changed, 9 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 39f7d3ab393..60a25316cb1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * syntax.c (back_comment): Detect the case where a 1-char comment
+        starter is also the 2nd char of a 2-char comment ender.
+
+2010-09-23  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * gtkutil.c (xg_tool_bar_menu_proxy): Set gtk-menu-items to TRUE.
+
 2010-09-23  Eli Zaretskii  <eliz@gnu.org>
 
         * editfns.c (transpose_markers, update_buffer_properties)