# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1271832018 25200
# Node ID 1b88085c2df4b3e7317b64db2564d4a6d4da7b23
# Parent  b235d39e44574564dbabffdbf2d9d8551e51b520
* src/ChangeLog: Remove merged duplicate entry.

diff -r b235d39e4457 -r 1b88085c2df4 src/ChangeLog
--- a/src/ChangeLog	Tue Apr 20 23:35:35 2010 -0700
+++ b/src/ChangeLog	Tue Apr 20 23:40:18 2010 -0700
@@ -233,14 +233,6 @@
 
 	* frame.h (FRAME_LINE_TO_PIXEL_Y): Add missing parenthesis.
 
-2010-04-19  Jan Djärv  <jan.h.d@swipnet.se>
-
-	* 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.
-
 2010-04-19  Chong Yidong  <cyd@stupidchicken.com>
 
 	* xdisp.c (prepare_menu_bars): Don't call ns_set_doc_edited for