# HG changeset patch # User Shabe Razvi # Date 1269858991 -3600 # Node ID c484c7841bb0dc7d32995a515ab83f2b8b53ac13 # Parent 4a76c5fd669b4bca970b49ebcd4bcbd2b8145db6# Parent c2412f4ab2b5a81a05f887b86e6e9ec012f7e9b1 Merge diff -r 4a76c5fd669b -r c484c7841bb0 Version/data/sw.txt Binary file Version/data/sw.txt has changed diff -r 4a76c5fd669b -r c484c7841bb0 layers.sysdef.xml --- a/layers.sysdef.xml Mon Mar 29 11:30:58 2010 +0100 +++ b/layers.sysdef.xml Mon Mar 29 11:36:31 2010 +0100 @@ -12,7 +12,20 @@ + + + + + + + + + + + + + @@ -36,6 +49,22 @@ + + + + + + + + + + + + + + + + diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/01.zip Binary file locfiles/data/01.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/02.zip Binary file locfiles/data/02.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/03.zip Binary file locfiles/data/03.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/04.zip Binary file locfiles/data/04.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/05.zip Binary file locfiles/data/05.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/06.zip Binary file locfiles/data/06.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/07.zip Binary file locfiles/data/07.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/08.zip Binary file locfiles/data/08.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/09.zip Binary file locfiles/data/09.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/10.zip Binary file locfiles/data/10.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/102.zip Binary file locfiles/data/102.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/103.zip Binary file locfiles/data/103.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/129.zip Binary file locfiles/data/129.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/13.zip Binary file locfiles/data/13.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/14.zip Binary file locfiles/data/14.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/14346.zip Binary file locfiles/data/14346.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/14387.zip Binary file locfiles/data/14387.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/14412.zip Binary file locfiles/data/14412.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/14419.zip Binary file locfiles/data/14419.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/15.zip Binary file locfiles/data/15.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/157.zip Binary file locfiles/data/157.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/158.zip Binary file locfiles/data/158.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/159.zip Binary file locfiles/data/159.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/16.zip Binary file locfiles/data/16.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/160.zip Binary file locfiles/data/160.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/161.zip Binary file locfiles/data/161.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/17.zip Binary file locfiles/data/17.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/18.zip Binary file locfiles/data/18.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/230.zip Binary file locfiles/data/230.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/25.zip Binary file locfiles/data/25.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/26.zip Binary file locfiles/data/26.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/27.zip Binary file locfiles/data/27.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/28.zip Binary file locfiles/data/28.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/29.zip Binary file locfiles/data/29.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/30.zip Binary file locfiles/data/30.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/31.zip Binary file locfiles/data/31.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/32.zip Binary file locfiles/data/32.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/326.zip Binary file locfiles/data/326.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/327.zip Binary file locfiles/data/327.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/33.zip Binary file locfiles/data/33.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/37.zip Binary file locfiles/data/37.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/39.zip Binary file locfiles/data/39.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/42.zip Binary file locfiles/data/42.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/44.zip Binary file locfiles/data/44.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/45.zip Binary file locfiles/data/45.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/49.zip Binary file locfiles/data/49.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/50.zip Binary file locfiles/data/50.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/51.zip Binary file locfiles/data/51.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/54.zip Binary file locfiles/data/54.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/57.zip Binary file locfiles/data/57.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/58.zip Binary file locfiles/data/58.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/59.zip Binary file locfiles/data/59.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/65.zip Binary file locfiles/data/65.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/67.zip Binary file locfiles/data/67.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/68.zip Binary file locfiles/data/68.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/70.zip Binary file locfiles/data/70.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/76.zip Binary file locfiles/data/76.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/78.zip Binary file locfiles/data/78.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/79.zip Binary file locfiles/data/79.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/83.zip Binary file locfiles/data/83.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/93.zip Binary file locfiles/data/93.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/94.zip Binary file locfiles/data/94.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/data/96.zip Binary file locfiles/data/96.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 locfiles/group/switch_loc.zip Binary file locfiles/group/switch_loc.zip has changed diff -r 4a76c5fd669b -r c484c7841bb0 sf_build/sf_prebuild/makefile --- a/sf_build/sf_prebuild/makefile Mon Mar 29 11:30:58 2010 +0100 +++ b/sf_build/sf_prebuild/makefile Mon Mar 29 11:36:31 2010 +0100 @@ -7,8 +7,8 @@ include /sf/os/devicesrv/devicesrv_pub/common_platform_security_definitions_api/makefile include /sf/os/devicesrv/devicesrv_pub/platform_path_definitions_api/makefile -include /sf/tools/buildplatforms/build/makefile -include /sf/mw/qt/group/cmaker/makefile +include /sf/mw/qt/src/s60installs/deviceconfiguration/cmaker/makefile + ifeq (S60,$(BUILD)) include /sf/mw/uiresources/uigraphics/icons/makefile include /sf/mw/uiresources/uigraphics/bitmaps2/makefile @@ -17,7 +17,7 @@ endif # Place the first target as the default target which is executed from this level -s60_prebuild :: commonengine_all platform_path_all common_platform_security_all buildpreparation_all export_template_files icons_all bitmaps_all dtdinstaller_all -os_prebuild :: commonengine_all platform_path_all common_platform_security_all buildpreparation_all +s60_prebuild :: commonengine_all platform_path_all common_platform_security_all export_template_files icons_all bitmaps_all dtdinstaller_all +os_prebuild :: commonengine_all platform_path_all common_platform_security_all # include include_template.mk \ No newline at end of file diff -r 4a76c5fd669b -r c484c7841bb0 symbianosbld/cedarutils/Symbian_OS_vFuture_Schedule12.xml --- a/symbianosbld/cedarutils/Symbian_OS_vFuture_Schedule12.xml Mon Mar 29 11:30:58 2010 +0100 +++ b/symbianosbld/cedarutils/Symbian_OS_vFuture_Schedule12.xml Mon Mar 29 11:36:31 2010 +0100 @@ -4,7 +4,7 @@ + DocVersion="$Change: 1764305 $ $DateTime: 2010/03/01 17:32:46 $ $Id: //SSS/release/sf/tb92/os/deviceplatformrelease/symbianosbld/cedarutils/Symbian_OS_vFuture_Schedule12.xml#63 $" > Maintains a queue of all system-wide alarms and provides APIs to manage alarms diff -r 4a76c5fd669b -r c484c7841bb0 symbianosbld/cedarutils/Symbian_OS_vtb101sf_Schedule12.xml --- a/symbianosbld/cedarutils/Symbian_OS_vtb101sf_Schedule12.xml Mon Mar 29 11:30:58 2010 +0100 +++ b/symbianosbld/cedarutils/Symbian_OS_vtb101sf_Schedule12.xml Mon Mar 29 11:36:31 2010 +0100 @@ -4,7 +4,7 @@ + DocVersion="$Change: 1764305 $ $DateTime: 2010/03/01 17:32:46 $ $Id: //SSS/release/sf/tb92/os/deviceplatformrelease/symbianosbld/cedarutils/Symbian_OS_vtb101sf_Schedule12.xml#63 $" > Maintains a queue of all system-wide alarms and provides APIs to manage alarms diff -r 4a76c5fd669b -r c484c7841bb0 symbianosbld/cedarutils/Symbian_OS_vtb92sf.xml --- a/symbianosbld/cedarutils/Symbian_OS_vtb92sf.xml Mon Mar 29 11:30:58 2010 +0100 +++ b/symbianosbld/cedarutils/Symbian_OS_vtb92sf.xml Mon Mar 29 11:36:31 2010 +0100 @@ -40,9 +40,10 @@ - + + - + @@ -64,14 +65,14 @@ - + - - + + @@ -240,23 +241,23 @@ - - + + - - + + - - + + - - + + - - + + - - + + @@ -395,7 +396,7 @@ - + @@ -442,7 +443,7 @@ - + @@ -460,7 +461,7 @@ - +