Catchup Merge
authorChetan Kapoor<chetank@symbian.org>
Fri, 15 Oct 2010 14:34:15 +0100
changeset 895 a9b10571503a
parent 894 cd43afbd6191 (current diff)
parent 891 45d7dd8e8e2e (diff)
child 896 ba76cab9ae36
Catchup Merge
--- a/symbian3/single/job_props.ant.xml	Fri Oct 15 14:33:14 2010 +0100
+++ b/symbian3/single/job_props.ant.xml	Fri Oct 15 14:34:15 2010 +0100
@@ -33,7 +33,7 @@
     <!-- and set sf.spec.baseline.enable to 'true'                                                          -->        
 
     <!-- get full source env and binaries from pdk -->
-    <property name="sf.spec.baseline.location"       value="\\v800020\PDT\prebuilt_default.41_patched" /> <!-- prebuilt stuff etc. -->
+    <property name="sf.spec.baseline.location"       value="\\v800020\PDT\prebuilt_default.41_patchedv2" /> <!-- prebuilt stuff etc. -->
     <property name="sf.spec.toolsbaseline.location"       value="\\v800020\Releases\${sf.previous.pdk.tag}_custom" /> <!-- tools baseline location e.g. tools_epoc.zip -->
     
     <!-- platform build specific properties -->
--- a/symbian3/single/sources_3.0.3_candidate.csv	Fri Oct 15 14:33:14 2010 +0100
+++ b/symbian3/single/sources_3.0.3_candidate.csv	Fri Oct 15 14:34:15 2010 +0100
@@ -105,7 +105,7 @@
 http://developer.symbian.org/oss/FCL/sf/os/networkingsrv/,/sf/os/networkingsrv,changeset,61fa4f7b5dd1,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/os/ossrv/,/sf/os/ossrv,changeset,b670675990af,layers.sysdef.xml
 http://developer.symbian.org/oss/MCL/sf/os/persistentdata/,/sf/os/persistentdata,changeset,047f208ea78f,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/os/security/,/sf/os/security,changeset,94225563cd41,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/os/security/,/sf/os/security,changeset,e1f6ec9fb9b4,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/os/textandloc/,/sf/os/textandloc,changeset,c14349048220,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/os/usb/,/sf/os/usb,changeset,ee9b31ff95f7,
 http://developer.symbian.org/oss/MCL/sf/os/wlan/,/sf/os/wlan,changeset,d3d7683d16f5,layers.sysdef.xml