Re: Repeated entries in src/Changelog.

[Eli Zaretskii]

> Date: Mon, 19 Apr 2010 19:17:04 +0200
> From: Jan Djärv <address@hidden>
> 
> Why is this entry in src/Changelog:
> 
> 2010-04-19  Jan Djärv  <address@hidden>
> 
>          * frame.h (FRAME_TEXT_LINES_TO_PIXEL_HEIGHT): Don't use
>          FRAME_LINE_TO_PIXEL_Y.
> 
>          * xterm.c (x_set_window_size_1): Don't add border_width/height to
>          pixelwidth/height.
> 
> ?
> 
> That change was made in 2010-04-07 and the same entry appears on that date in 
> the same Changelog.  Did a merge go bad?

Did you make the change both on the trunk and on emacs-23 branch?