From: Glenn Morris <rgm@gnu.org>
Date: Wed, 23 Feb 2011 04:21:48 +0000 (-0800)
Subject: Remove bogus duplicate ChangeLog entry from 2010-06-01T13:47:14Z!lekktu@gmail.com.
X-Git-Tag: emacs-23.3~14
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6230011fdd200dfaf5cde4db57ac5573315a9f5d;p=emacs.git

Remove bogus duplicate ChangeLog entry from 2010-06-01T13:47:14Z!lekktu@gmail.com.
No need to merge this to trunk.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index addaab34572..f9c15811547 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -8,12 +8,6 @@
 
 	* Makefile.in (prefix-args${EXEEXT}): Compile with ALL_CFLAGS.
 
-2011-02-17  Kenichi Handa  <handa@m17n.org>
-
-	* font.c (font_open_entity): Be sure to set scaled_pixel_size.
-	(font_find_for_lface): Check if attrs[LFACE_HEIGHT_INDEX] is
-	integer.
-
 2011-02-13  Eli Zaretskii  <eliz@gnu.org>
 
 	* xdisp.c (redisplay_internal): Resynchronize `w' if the selected