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.
catchup merge
authorMattD <mattd@symbian.org>
Fri, 28 Aug 2009 16:52:00 +0100
changeset 181 e9d0fc664f86
parent 180 e16a51b4d6f0 (diff)
parent 178 21a540a309b3 (current diff)
child 182 8d131aa9c532
catchup merge
--- a/symbian2/single/sources_fcl.csv	Fri Aug 28 16:21:01 2009 +0100
+++ b/symbian2/single/sources_fcl.csv	Fri Aug 28 16:52:00 2009 +0100
@@ -32,7 +32,7 @@
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/shortlinksrv/,/sf/os/shortlinksrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_development/sfl/FCL/sf/os/buildtools/,/sf/os/buildtools,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/unref/,/sf/os/unref,branch,default,
-//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/mw/appsupport/,/sf/mw/appsupport,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_development/sfl/FCL/sf/mw/appsupport/,/sf/mw/appsupport,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/securitysrv/,/sf/mw/securitysrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/drm/,/sf/mw/drm,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/accesssec/,/sf/mw/accesssec,branch,default,layers.sysdef.xml
--- a/symbian2/split/sources_fcl.csv	Fri Aug 28 16:21:01 2009 +0100
+++ b/symbian2/split/sources_fcl.csv	Fri Aug 28 16:52:00 2009 +0100
@@ -46,11 +46,11 @@
 //v800008/Builds01/mercurial_master_prod/oss/MCL/sf/app/webuis/,/sf/app/webuis,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/accesssec/,/sf/mw/accesssec,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/appinstall/,/sf/mw/appinstall,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/mw/appsupport/,/sf/mw/appsupport,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_development/sfl/FCL/sf/mw/appsupport/,/sf/mw/appsupport,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/camerasrv/,/sf/mw/camerasrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/mw/classicui/,/sf/mw/classicui,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/dlnasrv/,/sf/mw/dlnasrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_development/sfl/FCL/sf/mw/drm/,/sf/mw/drm,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/drm/,/sf/mw/drm,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/hapticsservices/,/sf/mw/hapticsservices,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/homescreensrv/,/sf/mw/homescreensrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/imghandling/,/sf/mw/imghandling,branch,default,layers.sysdef.xml
@@ -88,14 +88,14 @@
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/websrv/,/sf/mw/websrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/mw/wirelessacc/,/sf/mw/wirelessacc,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/boardsupport/,/sf/os/boardsupport,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/buildtools/,/sf/os/buildtools,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_development/sfl/FCL/sf/os/buildtools/,/sf/os/buildtools,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/cellularsrv/,/sf/os/cellularsrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/commsfw/,/sf/os/commsfw,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_development/sfl/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/devicesrv/,/sf/os/devicesrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/graphics/,/sf/os/graphics,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/imagingext/,/sf/os/imagingext,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,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_master_prod/sfl/MCL/sf/os/lbs/,/sf/os/lbs,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/mm/,/sf/os/mm,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/os/networkingsrv/,/sf/os/networkingsrv,branch,default,layers.sysdef.xml
@@ -109,7 +109,7 @@
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/xmlsrv/,/sf/os/xmlsrv,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/ostools/osrndtools/,/sf/ostools/osrndtools,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/build_s60/,/sf/tools/build_s60,branch,default,
-//v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,branch,default,
+//v800008/Builds01/mercurial_development/sfl/FCL/sf/tools/buildplatforms/,/sf/tools/buildplatforms,branch,default,
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/tools/homescreentools/,/sf/tools/homescreentools,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/tools/makefile_templates/,/sf/tools/makefile_templates,branch,default,
 //v800008/Builds01/mercurial_master_prod/sfl/FCL/sf/tools/platformtools/,/sf/tools/platformtools,branch,default,layers.sysdef.xml
FCL/sftools/fbf/projects/platforms