# HG changeset patch
# User hgs
# Date 1277204615 -28800
# Node ID e21deeeacad2db797a4b5aa7841bd94cdf776426
# Parent  eb091c0ad3c1da6fb5be112fd0d5676f35aa19f5
201025

diff -r eb091c0ad3c1 -r e21deeeacad2 aknlayoutcompiler/src/MLCompCdl2InstO.cpp
--- a/aknlayoutcompiler/src/MLCompCdl2InstO.cpp	Wed May 26 01:28:17 2010 +0300
+++ b/aknlayoutcompiler/src/MLCompCdl2InstO.cpp	Tue Jun 22 19:03:35 2010 +0800
@@ -1889,7 +1889,7 @@
 	}
 
 void MLCompDataCdlInstanceOpt::WriteInstances()
-	{	bool found = false;
+	{
	bool found = false;
 	for(CCompDataZoomLevelDatas::iterator pZoomLevel = iZoomLevelDatas.begin(); pZoomLevel != iZoomLevelDatas.end(); ++pZoomLevel)
 		{
 		CCompDatas& compDatas = pZoomLevel->second;
diff -r eb091c0ad3c1 -r e21deeeacad2 gfxtools/Color/group/Color.mmp
--- a/gfxtools/Color/group/Color.mmp	Wed May 26 01:28:17 2010 +0300
+++ b/gfxtools/Color/group/Color.mmp	Tue Jun 22 19:03:35 2010 +0800
@@ -51,7 +51,7 @@
 source                  Palette11.cpp
 source                  Palette12.cpp
 source                  Palette13.cpp
-source                  Strings.cpp
-source                  Rgb.cpp
+source                  strings.cpp
+source                  RGB.CPP
 
 // End of File
diff -r eb091c0ad3c1 -r e21deeeacad2 uitools_plat/cdl_api/inc/CdlCompilerToolkit/CdlCompat.h
--- a/uitools_plat/cdl_api/inc/CdlCompilerToolkit/CdlCompat.h	Wed May 26 01:28:17 2010 +0300
+++ b/uitools_plat/cdl_api/inc/CdlCompilerToolkit/CdlCompat.h	Tue Jun 22 19:03:35 2010 +0800
@@ -1,19 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "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: 
-*
-*/
 // Cdlcompat.h
 
 #ifndef CDLCOMPAT_H