Merge from emacs-23.

[gnu-emacs] / lwlib / ChangeLog

diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index a0ec95ca3a49d4b866aa1280681b69373347d494..5c5b4fcb97559eb5c1622ebd8666400c48bd26e4 100644 (file)
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-25  Werner Meisner  <weme24@gmx.net>
+
+       * lwlib-Xm.c (xm_update_menu): Avoid a NULL pointer dereference
+       (Bug#7690).
+
 2010-09-26  Dan Nicolaescu  <dann@ics.uci.edu>
 
        Use const for some pointer arguments.