# HG changeset patch # User Pat Downey # Date 1279116619 -3600 # Node ID 78daab3f0ff9cbb3b4476ea47edd8653da9a92b5 # Parent 8a39060cd6ea3ebaeb6a3f98f9929da55441585b# Parent 31d8ec1cbd4d52a574b6371f024ab352c2a9e5ea Merge in addition of Immersion rnd binaries. diff -r 31d8ec1cbd4d -r 78daab3f0ff9 symbian3/single/sources.csv --- a/symbian3/single/sources.csv Wed Jul 14 11:41:47 2010 +0100 +++ b/symbian3/single/sources.csv Wed Jul 14 15:10:19 2010 +0100 @@ -52,7 +52,7 @@ http://developer.symbian.org/oss/MCL/sf/mw/gsprofilesrv/,/sf/mw/gsprofilesrv,branch,RCL_3,layers.sysdef.xml http://developer.symbian.org/oss/MCL/sf/mw/hapticsservices/,/sf/mw/hapticsservices,branch,RCL_3,layers.sysdef.xml http://developer.symbian.org/oss/MCL/sf/mw/helix/,/sf/mw/helix,branch,RCL_3,layers.sysdef.xml -http://developer.symbian.org/oss/FCL/sf/mw/homescreensrv/,/sf/mw/homescreensrv,branch,RCL_3,layers.sysdef.xml +http://developer.symbian.org/oss/MCL/sf/mw/homescreensrv/,/sf/mw/homescreensrv,branch,RCL_3,layers.sysdef.xml http://developer.symbian.org/oss/MCL/sf/mw/imghandling/,/sf/mw/imghandling,branch,RCL_3,layers.sysdef.xml http://developer.symbian.org/oss/MCL/sf/mw/imsrv/,/sf/mw/imsrv,branch,RCL_3,layers.sysdef.xml http://developer.symbian.org/oss/MCL/sf/mw/inputmethods/,/sf/mw/inputmethods,branch,RCL_3,layers.sysdef.xml @@ -64,7 +64,7 @@ http://developer.symbian.org/oss/MCL/sf/mw/mds/,/sf/mw/mds,branch,RCL_3,layers.sysdef.xml http://developer.symbian.org/oss/MCL/sf/mw/messagingmw/,/sf/mw/messagingmw,branch,RCL_3,layers.sysdef.xml http://developer.symbian.org/oss/MCL/sf/mw/metadatasrv/,/sf/mw/metadatasrv,branch,RCL_3,layers.sysdef.xml -http://developer.symbian.org/oss/FCL/sf/mw/mmappfw/,/sf/mw/mmappfw,branch,RCL_3,layers.sysdef.xml +http://developer.symbian.org/oss/MCL/sf/mw/mmappfw/,/sf/mw/mmappfw,branch,RCL_3,layers.sysdef.xml http://developer.symbian.org/oss/MCL/sf/mw/mmmw/,/sf/mw/mmmw,branch,RCL_3,layers.sysdef.xml http://developer.symbian.org/oss/MCL/sf/mw/mmuifw/,/sf/mw/mmuifw,branch,RCL_3,layers.sysdef.xml http://developer.symbian.org/oss/MCL/sf/mw/netprotocols/,/sf/mw/netprotocols,branch,RCL_3,layers.sysdef.xml @@ -72,7 +72,7 @@ http://developer.symbian.org/oss/FCL/sf/mw/platformtools/,/sf/mw/platformtools,branch,RCL_3,layers.sysdef.xml http://developer.symbian.org/oss/MCL/sf/mw/qt/,/sf/mw/qt,branch,RCL_3,layers.sysdef.xml http://developer.symbian.org/oss/MCL/sf/mw/remoteconn/,/sf/mw/remoteconn,branch,RCL_3,layers.sysdef.xml -http://developer.symbian.org/oss/FCL/sf/mw/remotemgmt/,/sf/mw/remotemgmt,branch,RCL_3,layers.sysdef.xml +http://developer.symbian.org/oss/MCL/sf/mw/remotemgmt/,/sf/mw/remotemgmt,branch,RCL_3,layers.sysdef.xml http://developer.symbian.org/oss/MCL/sf/mw/remotestorage/,/sf/mw/remotestorage,branch,RCL_3,layers.sysdef.xml http://developer.symbian.org/oss/MCL/sf/mw/securitysrv/,/sf/mw/securitysrv,branch,RCL_3,layers.sysdef.xml http://developer.symbian.org/oss/MCL/sf/mw/serviceapi/,/sf/mw/serviceapi,branch,RCL_3,layers.sysdef.xml @@ -110,4 +110,4 @@ http://developer.symbian.org/oss/MCL/sf/os/wlan/,/sf/os/wlan,branch,RCL_3,layers.sysdef.xml http://developer.symbian.org/oss/MCL/sf/os/xmlsrv/,/sf/os/xmlsrv,branch,RCL_3,layers.sysdef.xml http://developer.symbian.org/oss/MCL/sf/os/osrndtools/,/sf/os/osrndtools,branch,RCL_3,layers.sysdef.xml -http://developer.symbian.org/oss/MCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,branch,RCL_3,layers.sysdef.xml +http://developer.symbian.org/oss/MCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,changeset,e541da0d3b0d,layers.sysdef.xml diff -r 31d8ec1cbd4d -r 78daab3f0ff9 symbian4/single/sources.csv --- a/symbian4/single/sources.csv Wed Jul 14 11:41:47 2010 +0100 +++ b/symbian4/single/sources.csv Wed Jul 14 15:10:19 2010 +0100 @@ -66,6 +66,7 @@ http://developer.symbian.org/oss/FCL/sf/mw/phonesrv/,/sf/mw/phonesrv,branch,default,layers.sysdef.xml http://developer.symbian.org/oss/FCL/sf/mw/qt/,/sf/mw/qt,branch,default,layers.sysdef.xml http://developer.symbian.org/oss/FCL/sf/mw/qtextensions/,/sf/mw/qtextensions,branch,default,layers.sysdef.xml +http://developer.symbian.org/oss/FCL/sf/mw/qttranslations/,/sf/mw/qttranslations,branch,default,layers.sysdef.xml http://developer.symbian.org/oss/FCL/sf/mw/remoteconn/,/sf/mw/remoteconn,branch,default,layers.sysdef.xml http://developer.symbian.org/oss/FCL/sf/mw/remotemgmt/,/sf/mw/remotemgmt,branch,default,layers.sysdef.xml http://developer.symbian.org/oss/FCL/sf/mw/searchsrv/,/sf/mw/searchsrv,branch,default,layers.sysdef.xml diff -r 31d8ec1cbd4d -r 78daab3f0ff9 symbian4/single/sources_staging.csv --- a/symbian4/single/sources_staging.csv Wed Jul 14 11:41:47 2010 +0100 +++ b/symbian4/single/sources_staging.csv Wed Jul 14 15:10:19 2010 +0100 @@ -7,6 +7,7 @@ //v800008/Builds01/mercurial_internal/rnd/rndonly/samsung/,/rnd/rndonly/samsung,branch,default, //v800008/Builds01/mercurial_internal/rnd/redist/objective_systems/,/rnd/redist/objective_systems,branch,default, //v800008/Builds01/mercurial_master_stage/oss/MCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,default,layers.sysdef.xml +//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/app/browserui/,/sf/app/browserui,branch,default,layers.sysdef.xml //v800008/Builds01/mercurial_master_stage/oss/MCL/sf/app/camera/,/sf/app/camera,branch,default,layers.sysdef.xml //v800008/Builds01/mercurial_master_stage/oss/MCL/sf/app/commonemail/,/sf/app/commonemail,branch,default,layers.sysdef.xml //v800008/Builds01/mercurial_master_stage/oss/MCL/sf/app/conntools/,/sf/app/conntools,branch,default,layers.sysdef.xml @@ -28,6 +29,7 @@ //v800008/Builds01/mercurial_master_stage/oss/MCL/sf/app/photos/,/sf/app/photos,branch,default,layers.sysdef.xml //v800008/Builds01/mercurial_master_stage/oss/MCL/sf/app/printing/,/sf/app/printing,branch,default,layers.sysdef.xml //v800008/Builds01/mercurial_master_stage/oss/MCL/sf/app/radio/,/sf/app/radio,branch,default,layers.sysdef.xml +//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/app/recents/,/sf/app/recents,branch,default,layers.sysdef.xml //v800008/Builds01/mercurial_master_stage/oss/MCL/sf/app/settingsuis/,/sf/app/settingsuis,branch,default,layers.sysdef.xml //v800008/Builds01/mercurial_master_stage/oss/MCL/sf/app/search/,/sf/app/search,branch,default,layers.sysdef.xml //v800008/Builds01/mercurial_master_stage/oss/MCL/sf/app/techview/,/sf/app/techview,branch,default,layers.sysdef.xml @@ -38,6 +40,7 @@ //v800008/Builds01/mercurial_master_stage/oss/MCL/sf/mw/accesssec/,/sf/mw/accesssec,branch,default,layers.sysdef.xml http://developer.symbian.org/oss/FCL/sf/mw/appinstall/,/sf/mw/appinstall,branch,default,modified-FCL //v800008/Builds01/mercurial_master_stage/oss/MCL/sf/mw/appsupport/,/sf/mw/appsupport,branch,default,layers.sysdef.xml +//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/mw/browser/,/sf/mw/browser,branch,default,layers.sysdef.xml //v800008/Builds01/mercurial_master_stage/oss/MCL/sf/mw/btservices/,/sf/mw/btservices,branch,default,layers.sysdef.xml //v800008/Builds01/mercurial_master_stage/oss/MCL/sf/mw/camerasrv/,/sf/mw/camerasrv,branch,default,layers.sysdef.xml //v800008/Builds01/mercurial_master_stage/oss/MCL/sf/mw/classicui/,/sf/mw/classicui,branch,default,layers.sysdef.xml @@ -70,6 +73,7 @@ //v800008/Builds01/mercurial_master_stage/oss/MCL/sf/mw/phonesrv/,/sf/mw/phonesrv,branch,default,layers.sysdef.xml //v800008/Builds01/mercurial_master_stage/oss/MCL/sf/mw/qt/,/sf/mw/qt,branch,default,layers.sysdef.xml //v800008/Builds01/mercurial_master_stage/oss/MCL/sf/mw/qtextensions/,/sf/mw/qtextensions,branch,default,layers.sysdef.xml +//v800008/Builds01/mercurial_master_stage/oss/MCL/sf/mw/qttranslations/,/sf/mw/qttranslations,branch,default,layers.sysdef.xml //v800008/Builds01/mercurial_master_stage/oss/MCL/sf/mw/remoteconn/,/sf/mw/remoteconn,branch,default,layers.sysdef.xml //v800008/Builds01/mercurial_master_stage/oss/MCL/sf/mw/remotemgmt/,/sf/mw/remotemgmt,branch,default,layers.sysdef.xml //v800008/Builds01/mercurial_master_stage/oss/MCL/sf/mw/searchsrv/,/sf/mw/searchsrv,branch,default,layers.sysdef.xml