diff src/ChangeLog @ 5240:fca0cf0971de

Merge.
author Mike Sperber <sperber@deinprogramm.de>
date Tue, 13 Jul 2010 10:20:22 +0200
parents 2cc24c69446c f19e6bc25969
children d579d76f3dcc
line wrap: on
line diff
--- a/src/ChangeLog	Mon Jul 05 18:17:39 2010 +0200
+++ b/src/ChangeLog	Tue Jul 13 10:20:22 2010 +0200
@@ -4,22 +4,6 @@
 	* mc-alloc.c:
 	Document the new allocator and the new garbage collector.
 
-2010-06-21  Jeff Sparkes  <jsparkes@gmail.com>
-
-	* console-x-impl.h (DEVICE_X_XFTDRAW): Define, instead of
-	FRAME_X_FTDRAW.
-	(struct x_device): Add XftDraw field.
-	(struct x_frame): Remove XftDraw field.
-	Move XftDraw from frame to device for improved caching.
-
-	* device-x.c (x_delete_device): Free XftDraw here.
-
-	* frame-x.c (x_delete_frame): Remove freeing of XftDraw.
-
-	* redisplay-xlike-inc.c (XLIKE_output_string): Use
-	DEVICE_X_XFTDRAW instead of FRAME_X_XFTDRAW when lazily creating
-	XftDraw structure.
-
 2010-06-13  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* elhash.c: