Merge from emacs-23

[gnu-emacs] / oldXMenu / ChangeLog

diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog
index f05553a38b3b5aacacc1a248503d931895e005e6..329a4ac95653ccef4db9befed7354de384f7138b 100644 (file)
--- a/oldXMenu/ChangeLog
+++ b/oldXMenu/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-09  Elias Pipping  <pipping.elias@googlemail.com>  (tiny change)
+
+       Make Emacs compile with clang (bug#7309).
+       * XMakeAssoc.c (XMakeAssoc):
+       * XDelAssoc.c (XDeleteAssoc): Declare the return type.
+
 2010-07-12  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * XMenu.h: Include <stdlib.h>.