# HG changeset patch
# User MattD <mattd@symbian.org>
# Date 1254237253 -3600
# Node ID 9e7d192d548135d546cf1720de31b101c10e9790
# Parent  c12183d23974687c968adfe1e4bcbfbcf2d13c37# Parent  617875a9b8c8edede40699366a68ad84a4688e35
catchup merge. No files changed.

diff -r c12183d23974 -r 9e7d192d5481 symbian3/split/job_props.ant.xml
--- a/symbian3/split/job_props.ant.xml	Tue Sep 29 16:13:02 2009 +0100
+++ b/symbian3/split/job_props.ant.xml	Tue Sep 29 16:14:13 2009 +0100
@@ -15,6 +15,8 @@
     <property name="sf.spec.sbs.tools.config" value="tools_rel.whatlog,tools2_rel.whatlog"/>
 
     <property name="sf.spec.bldmefirst.gt.variant" value="sf/os/deviceplatformrelease/symbianosbld/cedarutils/Symbian_OS_v${sf.spec.sbs.variant}.cfg" />
+	<!-- Location of Symbian_OS.hrh changed for Symbian3 to an inc directory -->
+	<property name="sf.spec.bldmefirst.gt.hrh.os" value="sf/os/deviceplatformrelease/symbianosbld/cedarutils/inc/Symbian_OS_${sf.spec.sbs.variant}.hrh" />
     <property name="sf.spec.bldmefirst.gt.hrh" value="sf/os/deviceplatformrelease/symbianosbld/cedarutils/" />
     
     <property name="sf.spec.bldmefirst.s60.variant" value="western" /> <!-- western|apac|japan but only western is used at the moment -->
@@ -34,7 +36,7 @@
     
     <property name="sf.spec.toolsbaseline.getenv_options" value="-i emu"/>
     <property name="sf.spec.toolsbaseline.select"         value="location" />
-    <property name="sf.spec.toolsbaseline.location"       value="\\v800008\Builds01\PDT\PDT_b50" /> <!-- for TEF etc -->
+    <property name="sf.spec.toolsbaseline.location"       value="\\v800008\Builds01\PDT\PDT_1.1_patched" /> <!-- for TEF etc -->
     
     <!-- platform build specific properties -->
     <property name="sf.spec.s60.sysdef.clean.configurations.list"  value="S60_5_1_sf" />
diff -r c12183d23974 -r 9e7d192d5481 symbian3/split/sources_fcl.csv
--- a/symbian3/split/sources_fcl.csv	Tue Sep 29 16:13:02 2009 +0100
+++ b/symbian3/split/sources_fcl.csv	Tue Sep 29 16:14:13 2009 +0100
@@ -99,7 +99,7 @@
 http://v800050/master_stage/sfl/MCL/sf/os/commsfw/,/sf/os/commsfw,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_development_staging/sfl/FCL/sf/os/deviceplatformrelease/,/sf/os/deviceplatformrelease,branch,default,layers.sysdef.xml
 //v800008/Builds01/mercurial_development_staging/sfl/FCL/sf/os/devicesrv/,/sf/os/devicesrv,branch,default,layers.sysdef.xml
-//v800008/Builds01/mercurial_development_staging/sfl/FCL/sfl/MCL/sf/os/graphics/,/sf/os/graphics,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_development_staging/sfl/FCL/sf/os/graphics/,/sf/os/graphics,branch,default,layers.sysdef.xml
 http://v800050/master_stage/sfl/MCL/sf/os/imagingext/,/sf/os/imagingext,branch,default,layers.sysdef.xml
 http://v800050/master_stage/sfl/MCL/sf/os/kernelhwsrv/,/sf/os/kernelhwsrv,branch,default,layers.sysdef.xml
 http://v800050/master_stage/sfl/MCL/sf/os/lbs/,/sf/os/lbs,branch,default,layers.sysdef.xml