From 6fd593199d1cb308754ed97be1caa18062040785 Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Wed, 13 Dec 2006 13:39:06 +0000 Subject: INTEGRATION: CWS presfixes09 (1.2.4); FILE MERGED 2006/04/20 15:13:25 thb 1.2.4.1: #i10000# Fixed merge problems --- canvas/source/cairo/cairo_canvasfont.hxx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'canvas/source') diff --git a/canvas/source/cairo/cairo_canvasfont.hxx b/canvas/source/cairo/cairo_canvasfont.hxx index e91ff37d40b8..d79b6b44eed2 100644 --- a/canvas/source/cairo/cairo_canvasfont.hxx +++ b/canvas/source/cairo/cairo_canvasfont.hxx @@ -4,9 +4,9 @@ * * $RCSfile: cairo_canvasfont.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: kz $ $Date: 2006-02-28 10:34:35 $ + * last change: $Author: kz $ $Date: 2006-12-13 14:39:06 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -51,7 +51,6 @@ #include #include "cairo_spritecanvas.hxx" -#include "cairo_impltools.hxx" #include -- cgit