From 2ae68b8b152f7fcc987c9efd0eacf6b768703b71 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 3 Oct 2014 09:05:12 -0700 Subject: [PATCH] ChangeLog merge fix Yet another unlabelled backport. --- src/ChangeLog | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index ab5621b9664..3260af49d11 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,9 +1,3 @@ -2014-10-03 Dmitry Antipov - - * font.c (font_list_entities): Do not add empty vector to font cache. - (font_matching_entity): Likewise. If matching entity is found, insert - 1-item vector with this entity instead of an entity itself (Bug#17125). - 2014-10-03 Eli Zaretskii * xdisp.c (move_it_by_lines): Call reseat_1 after moving the -- 2.39.5