# HG changeset patch # User MattD # Date 1255355680 -3600 # Node ID 6d71f1d37a51e06f081f65e3e9edba94ad3c9cbd # Parent 51f8cbfb54604a00a451349ee48801f59a27b6ef# Parent 152e5846f421530072a18ae345db8ea03bdfb1c7 catchup merge. diff -r 51f8cbfb5460 -r 6d71f1d37a51 symbian2/micro/sources.csv --- a/symbian2/micro/sources.csv Mon Oct 12 14:53:39 2009 +0100 +++ b/symbian2/micro/sources.csv Mon Oct 12 14:54:40 2009 +0100 @@ -1,6 +1,9 @@ source,dst,type,pattern,sysdef //v800008/Builds01/mercurial_development/oss/MCL/utilities/,/utilities,branch,default, +//v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,RCL_1, //v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default, +//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_development/sfl/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,branch,RCL_1,layers.sysdef.xml //v800008/Builds01/mercurial_development/sfl/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,RCL_1,layers.sysdef.xml //v800008/Builds01/mercurial_development/sfl/FCL/sf/os/buildtools/,/sf/os/buildtools,branch,RCL_1,layers.sysdef.xml diff -r 51f8cbfb5460 -r 6d71f1d37a51 symbian3/micro/job_props.ant.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/symbian3/micro/job_props.ant.xml Mon Oct 12 14:54:40 2009 +0100 @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 51f8cbfb5460 -r 6d71f1d37a51 symbian3/micro/job_refs.ant.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/symbian3/micro/job_refs.ant.xml Mon Oct 12 14:54:40 2009 +0100 @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -r 51f8cbfb5460 -r 6d71f1d37a51 symbian3/micro/sources.csv --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/symbian3/micro/sources.csv Mon Oct 12 14:54:40 2009 +0100 @@ -0,0 +1,9 @@ +source,dst,type,pattern,sysdef +//v800008/Builds01/mercurial_development/oss/MCL/utilities/,/utilities,branch,default, +//v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,default, +//v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default, +//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_development/sfl/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,branch,default,layers.sysdef.xml +//v800008/Builds01/mercurial_development/sfl/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,default,layers.sysdef.xml +//v800008/Builds01/mercurial_development/sfl/FCL/sf/os/buildtools/,/sf/os/buildtools,branch,default,layers.sysdef.xml diff -r 51f8cbfb5460 -r 6d71f1d37a51 symbian3/micro/sysdefs/system_model.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/symbian3/micro/sysdefs/system_model.xml Mon Oct 12 14:54:40 2009 +0100 @@ -0,0 +1,547 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 51f8cbfb5460 -r 6d71f1d37a51 symbian3/micro/sysdefs/system_model_os.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/symbian3/micro/sysdefs/system_model_os.xml Mon Oct 12 14:54:40 2009 +0100 @@ -0,0 +1,547 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 51f8cbfb5460 -r 6d71f1d37a51 symbian3/micro/sysdefs/system_model_s60.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/symbian3/micro/sysdefs/system_model_s60.xml Mon Oct 12 14:54:40 2009 +0100 @@ -0,0 +1,547 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +