From: Juanma Barranquero <lekktu@gmail.com>
Date: Sun, 8 Jun 2008 12:03:27 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-23.0.90~5007
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0181bf66199a4598374056bca721ce08a5559adf;p=emacs.git

*** empty log message ***
---

diff --git a/src/ChangeLog b/src/ChangeLog
index cdb979555a9..d52834fffed 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -7,9 +7,7 @@
 	* menu.c [HAVE_X_WINDOWS]: Include "xterm.h".
 	* Makefile.in (menu.o): Update dependencies.
 
-	* fontset.c (Ffontset_info): Fix typo.
-
-	* Makefile.in (obj): Always add menu.o
+	* Makefile.in (obj): Always add menu.o.
 	* emacs.c (main): Always call syms_of_menu.
 	* keyboard.h: Remove extra #ifdef HAVE_X_WINDOW.