Mercurial Mercurial > oss > FCL > sftools > fbf > projects > platforms / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorShabe Razvi <shaber@symbian.org>
Wed, 31 Mar 2010 11:11:06 +0100
changeset 461 13a65aba4213
parent 460 0df7e5ced6ce (current diff)
parent 458 57c6fb7e503c (diff)
child 462 2e35c138d3b0
Merge
--- a/symbian2/single/sources.csv	Tue Mar 30 10:17:48 2010 +0100
+++ b/symbian2/single/sources.csv	Wed Mar 31 11:11:06 2010 +0100
@@ -1,5 +1,5 @@
 source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/MCL/utilities/oss/MCL/utilities/,/utilities,branch,default,
+http://developer.symbian.org/oss/MCL/sftools/fbf/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/aricent/,/rnd/rndonly/aricent,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,
--- a/symbian2/single/sources_fcl.csv	Tue Mar 30 10:17:48 2010 +0100
+++ b/symbian2/single/sources_fcl.csv	Wed Mar 31 11:11:06 2010 +0100
@@ -1,5 +1,5 @@
 source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/MCL/utilities/oss/MCL/utilities/,/utilities,branch,default,
+http://developer.symbian.org/oss/MCL/sftools/fbf/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/aricent/,/rnd/rndonly/aricent,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,
--- a/symbian2/split/sources.csv	Tue Mar 30 10:17:48 2010 +0100
+++ b/symbian2/split/sources.csv	Wed Mar 31 11:11:06 2010 +0100
@@ -1,5 +1,5 @@
 source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/MCL/utilities/oss/MCL/utilities/,/utilities,branch,default,
+http://developer.symbian.org/oss/MCL/sftools/fbf/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/aricent/,/rnd/rndonly/aricent,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,
--- a/symbian2/split/sources_fcl.csv	Tue Mar 30 10:17:48 2010 +0100
+++ b/symbian2/split/sources_fcl.csv	Wed Mar 31 11:11:06 2010 +0100
@@ -1,5 +1,5 @@
 source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/MCL/utilities/oss/MCL/utilities/,/utilities,branch,default,
+http://developer.symbian.org/oss/MCL/sftools/fbf/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/aricent/,/rnd/rndonly/aricent,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,
--- a/symbian3/micro/sources.csv	Tue Mar 30 10:17:48 2010 +0100
+++ b/symbian3/micro/sources.csv	Wed Mar 31 11:11:06 2010 +0100
@@ -1,11 +1,6 @@
 source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/MCL/utilities/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/aricent/,/rnd/rndonly/aricent,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/rndonly/realnetworks/,/rnd/rndonly/realnetworks,branch,default,
-//v800008/Builds01/mercurial_internal/rnd/redist/objective_systems/,/rnd/redist/objective_systems,branch,default,
-http://developer.symbian.org/oss/MCL/utilities/oss/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/utilities/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,default,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/utilities/oss/FCL/sf/os/buildtools/,/sf/os/buildtools,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sftools/fbf/utilities/,/utilities,branch,default,
+//v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,RCL_3,
+http://developer.symbian.org/oss/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,branch,S3_LATESTGOOD,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,S3_LATESTGOOD,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/buildtools/,/sf/os/buildtools,branch,S3_LATESTGOOD,layers.sysdef.xml
--- a/symbian3/single/sources.csv	Tue Mar 30 10:17:48 2010 +0100
+++ b/symbian3/single/sources.csv	Wed Mar 31 11:11:06 2010 +0100
@@ -1,6 +1,6 @@
 source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/MCL/utilities/,/utilities,branch,default,
-//v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,default,
+http://developer.symbian.org/oss/MCL/sftools/fbf/utilities/,/utilities,branch,default,
+//v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,RCL_3,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/aricent/,/rnd/rndonly/aricent,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,
--- a/symbian3/single/sources_compiler_compatibility.csv	Tue Mar 30 10:17:48 2010 +0100
+++ b/symbian3/single/sources_compiler_compatibility.csv	Wed Mar 31 11:11:06 2010 +0100
@@ -1,6 +1,6 @@
 source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/MCL/utilities/,/utilities,branch,default,
-//v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,default,
+http://developer.symbian.org/oss/MCL/sftools/fbf/utilities/,/utilities,branch,default,
+//v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,RCL_3,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/aricent/,/rnd/rndonly/aricent,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/realnetworks/,/rnd/rndonly/realnetworks,branch,default,
--- a/symbian3/single/sources_fcl.csv	Tue Mar 30 10:17:48 2010 +0100
+++ b/symbian3/single/sources_fcl.csv	Wed Mar 31 11:11:06 2010 +0100
@@ -1,6 +1,6 @@
 source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/MCL/utilities/,/utilities,branch,default,
-//v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,default,
+http://developer.symbian.org/oss/FCL/sftools/fbf/utilities/,/utilities,branch,default,
+//v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,RCL_3,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/aricent/,/rnd/rndonly/aricent,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/realnetworks/,/rnd/rndonly/realnetworks,branch,default,
--- a/symbian3/split/sources.csv	Tue Mar 30 10:17:48 2010 +0100
+++ b/symbian3/split/sources.csv	Wed Mar 31 11:11:06 2010 +0100
@@ -1,6 +1,6 @@
 source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/MCL/utilities/,/utilities,branch,default,
-//v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,default,
+http://developer.symbian.org/oss/MCL/sftools/fbf/utilities/,/utilities,branch,default,
+//v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,RCL_3,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/aricent/,/rnd/rndonly/aricent,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,
--- a/symbian3/split/sources_fcl.csv	Tue Mar 30 10:17:48 2010 +0100
+++ b/symbian3/split/sources_fcl.csv	Wed Mar 31 11:11:06 2010 +0100
@@ -1,6 +1,6 @@
 source,dst,type,pattern,sysdef
-http://developer.symbian.org/oss/MCL/utilities/,/utilities,branch,default,
-//v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,default,
+http://developer.symbian.org/oss/MCL/sftools/fbf/utilities/,/utilities,branch,default,
+//v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,branch,RCL_3,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/aricent/,/rnd/rndonly/aricent,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/realnetworks/,/rnd/rndonly/realnetworks,branch,default,
FCL/sftools/fbf/projects/platforms