From: Glenn Morris <rgm@gnu.org>
Date: Wed, 21 Apr 2010 06:40:18 +0000 (-0700)
Subject: * src/ChangeLog: Remove merged duplicate entry.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~451
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0dce7acd731a8e2b806f623543346983ef166095;p=emacs.git

* src/ChangeLog: Remove merged duplicate entry.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 8bed2e609d0..05d1f550a55 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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