aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2011-02-22 20:21:48 -0800
committerGlenn Morris2011-02-22 20:21:48 -0800
commit6230011fdd200dfaf5cde4db57ac5573315a9f5d (patch)
tree9d9f63b0bf9ed8b06d70f66900a4176a4cc3ee01 /src
parent51a13bdd9324860db6381e6da121411467087bec (diff)
downloademacs-6230011fdd200dfaf5cde4db57ac5573315a9f5d.tar.gz
emacs-6230011fdd200dfaf5cde4db57ac5573315a9f5d.zip
Remove bogus duplicate ChangeLog entry from 2010-06-01T13:47:14Z!lekktu@gmail.com.
No need to merge this to trunk.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index addaab34572..f9c15811547 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -8,12 +8,6 @@
8 8
9 * Makefile.in (prefix-args${EXEEXT}): Compile with ALL_CFLAGS. 9 * Makefile.in (prefix-args${EXEEXT}): Compile with ALL_CFLAGS.
10 10
112011-02-17 Kenichi Handa <handa@m17n.org>
12
13 * font.c (font_open_entity): Be sure to set scaled_pixel_size.
14 (font_find_for_lface): Check if attrs[LFACE_HEIGHT_INDEX] is
15 integer.
16
172011-02-13 Eli Zaretskii <eliz@gnu.org> 112011-02-13 Eli Zaretskii <eliz@gnu.org>
18 12
19 * xdisp.c (redisplay_internal): Resynchronize `w' if the selected 13 * xdisp.c (redisplay_internal): Resynchronize `w' if the selected