--- a/boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp	Fri Jun 11 19:05:10 2010 +0530
+++ b/boardsupport_info/boardsupport_metadata/boardsupport_metadata.mrp	Thu Jun 17 17:47:10 2010 +0530
@@ -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: 
-#
-
 component           boardsupport_metadata
 source   \sf\os\boardsupport\boardsupport_info\boardsupport_metadata 
 source   \sf\os\boardsupport\package_definition.xml

--- a/emulator/emulatorbsp/hcr/hcrconfig.h	Fri Jun 11 19:05:10 2010 +0530
+++ b/emulator/emulatorbsp/hcr/hcrconfig.h	Thu Jun 17 17:47:10 2010 +0530
@@ -25,7 +25,7 @@
 changes in the hardware consumer component. 
 
 @publishedPartner
-@prototype
+@deprecated Emulator Deprecated
 */
 
 #ifndef HCR_CONFIG_H

--- a/emulator/emulatorbsp/inc/display_chan.h	Fri Jun 11 19:05:10 2010 +0530
+++ b/emulator/emulatorbsp/inc/display_chan.h	Thu Jun 17 17:47:10 2010 +0530
@@ -16,7 +16,7 @@
 /**
  @file
  @publishedPartner
- @prototype
+ @deprecated Emulator Deprecated
 */
 
 #ifndef __DISPLAY_CHAN_H__

--- a/emulator/emulatorbsp/inc/display_dev.h	Fri Jun 11 19:05:10 2010 +0530
+++ b/emulator/emulatorbsp/inc/display_dev.h	Thu Jun 17 17:47:10 2010 +0530
@@ -16,7 +16,7 @@
 /**
  @file
  @publishedPartner
- @prototype
+ @deprecated Emulator Deprecated
 */
 
 #ifndef __DISPLAY_DEV_H__

--- a/emulator/emulatorbsp/inc/displayhandler.h	Fri Jun 11 19:05:10 2010 +0530
+++ b/emulator/emulatorbsp/inc/displayhandler.h	Thu Jun 17 17:47:10 2010 +0530
@@ -16,7 +16,7 @@
 /**
  @file
  @publishedPartner
- @prototype
+ @deprecated Emulator Deprecated
 */
 
 #ifndef __DISPLAYHANDLER_H__

--- a/emulator/emulatorbsp/inc/nand_fbr_offset.h	Fri Jun 11 19:05:10 2010 +0530
+++ b/emulator/emulatorbsp/inc/nand_fbr_offset.h	Thu Jun 17 17:47:10 2010 +0530
@@ -24,6 +24,7 @@
 /**
 Defines the sector offset at which the FBR appears in the first block
 @publishedPartner
+@deprecated Emulator Deprecated
 */
 const TInt KNandFbrSectorOffset=0;
 

--- a/emulator/emulatorbsp/inc/nand_plat.h	Fri Jun 11 19:05:10 2010 +0530
+++ b/emulator/emulatorbsp/inc/nand_plat.h	Thu Jun 17 17:47:10 2010 +0530
@@ -45,6 +45,7 @@
 The following constants support relocation of the NAND FBR for this platform
 KNandFbrSectorOffset is the third of three constants required - it is defined in nand_fbr_offset.h
 @publishedPartner
+@deprecated Emulator Deprecated
 */
 const TInt KNandMinibootUsed		=	ETrue;
 const TInt KNandCoreldrRelocatable	=	ETrue;

--- a/emulator/emulatorbsp/inc/winsgui.h	Fri Jun 11 19:05:10 2010 +0530
+++ b/emulator/emulatorbsp/inc/winsgui.h	Thu Jun 17 17:47:10 2010 +0530
@@ -29,6 +29,7 @@
 	/**
 	Returns the current emulator GUI configuration
 	@publishedPartner
+	@deprecated Emulator Deprecated
 	*/
 	IMPORT_C static TInt CurrentConfiguration();
 	};

--- a/emulator/emulatorbsp/test/bld.inf	Fri Jun 11 19:05:10 2010 +0530
+++ b/emulator/emulatorbsp/test/bld.inf	Thu Jun 17 17:47:10 2010 +0530
@@ -30,9 +30,6 @@
 ../../../../kernelhwsrv/kerneltest/e32test/group/bm_pdd					support
 ../../../../kernelhwsrv/kerneltest/e32test/group/d_mstim					support
 
-// Tests
-../../../../kernelhwsrv/kerneltest/e32test/group/t_emul
-
 // Example RTOS personality
 ../../../../kernelhwsrv/kerneltest/e32test/personality/example/example_personality_test	support
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/release.txt	Thu Jun 17 17:47:10 2010 +0530
@@ -0,0 +1,22 @@
+
+1.	BhaskarReddy
+	1. DEFECT FIX: DEF142545: t_cputime fails on ST8500
+=======================
+
+2	BhaskarReddy
+	1. DEFECT FIX: DEF140626: Building graphics4 (wserv auto tests) ROM with -D_DEBUG results in KERN-EXEC4
+
+3	VyshnaviK
+	1. DEFECT FIX: DEF141815: Baseport bld.inf files should specify an alias for all extension makefiles 
+
+4 Prakash 
+  1.DEFECT FIX: DEF142298: ScreenDriver compile filed in MSF00209 TB101SF  
+  
+5 Prakash
+  1.DEFECT FIX: DEF144722: Bridge image is not booting because of kHS random generaton preq submissions 
+ 
+6 Vibhavari K
+  1. DEF142250 T_LDRTST Kernel crash
+
+7 Prakash b	
+  1. DEF144776: Trace Conflict between base_e32_drivers_media and base_montblanc