# HG changeset patch # User Simon Howkins # Date 1274966150 -3600 # Node ID 515194ff9f1578a3418ed48e8ff01045d03058ab # Parent 7be2816dbabda49e15619ec9b67b586f81fec4db# Parent 45cc9ca502a97ef82ba637e3e37081fc53b5799b Merge RCL_3 heads diff -r 7be2816dbabd -r 515194ff9f15 idlehomescreen/xmluirendering/uiengine/src/xnnodeimpl.cpp diff -r 7be2816dbabd -r 515194ff9f15 menufw/menusuites/foldersuite/group/foldersuite.mmp --- a/menufw/menusuites/foldersuite/group/foldersuite.mmp Tue May 11 16:02:39 2010 +0300 +++ b/menufw/menusuites/foldersuite/group/foldersuite.mmp Thu May 27 14:15:50 2010 +0100 @@ -10,6 +10,7 @@ * Nokia Corporation - initial contribution. * * Contributors: +* Juha Ristolainen, Futurice Oy – Removed dummy dll compilation * * Description: Project definition file for project folder suite. *