# HG changeset patch
# User MattD <mattd@symbian.org>
# Date 1259089262 0
# Node ID 8d6f9692563d65ae104b63c05bd432a64b698a6e
# Parent  1bd525e7cb149b34e0a51eace9dcfeab5c0567aa# Parent  0e56b59e4580fbbf11fa310814b6419b7378deb8
Catchup merge

diff -r 0e56b59e4580 -r 8d6f9692563d fontsupport/fontutils/FontUtils/group/bld.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/fontsupport/fontutils/FontUtils/group/bld.inf	Tue Nov 24 19:01:02 2009 +0000
@@ -0,0 +1,22 @@
+/*
+* Copyright (c) 2002-2008 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Bldmake component description file for the FontUtils component
+*
+*/
+
+PRJ_MMPFILES
+#ifndef TOOLS
+  FontUtils.mmp
+#endif
+
diff -r 0e56b59e4580 -r 8d6f9692563d fontsupport/group/bld.inf
--- a/fontsupport/group/bld.inf	Tue Nov 24 18:56:35 2009 +0000
+++ b/fontsupport/group/bld.inf	Tue Nov 24 19:01:02 2009 +0000
@@ -17,4 +17,4 @@
 
 
 #include "../fontprovider/Group/bld.inf"
-#include "../fontutils/group/bld.inf"
+#include "../fontutils/FontUtils/group/bld.inf"
diff -r 0e56b59e4580 -r 8d6f9692563d skins/AknSkinContent/group/skingenerator.flm
diff -r 0e56b59e4580 -r 8d6f9692563d skins/AknSkinContent/group/skingenerator.xml