# HG changeset patch
# User Shabe Razvi <shaber@symbian.org>
# Date 1254765427 -3600
# Node ID 5d2fed6f53ce95b4865e4c0ba116e7debda4483c
# Parent  50a2f8ccc1fa3f0ac40ee31cc786cf675ac169c0# Parent  4b28536b012b3500717af04af4f19a7aee0d91c9
Merge

diff -r 4b28536b012b -r 5d2fed6f53ce symbian3/split/sources_fcl.csv
--- a/symbian3/split/sources_fcl.csv	Mon Oct 05 17:58:10 2009 +0100
+++ b/symbian3/split/sources_fcl.csv	Mon Oct 05 18:57:07 2009 +0100
@@ -115,6 +115,7 @@
 //v800008/Builds01/mercurial_master_prod/sfl/MCL/sf/os/wlan/,/sf/os/wlan,branch,default,layers.sysdef.xml
 //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/os/osrndtools/,/sf/os/osrndtools,branch,default,layers.sysdef.xml
+//v800008/Builds01/mercurial_master_prod/oss/FCL/interim/QEMU/,/sf/os/QEMU,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_master_prod/sfl/MCL/sf/tools/homescreentools/,/sf/tools/homescreentools,branch,default,layers.sysdef.xml
diff -r 4b28536b012b -r 5d2fed6f53ce symbian3/split/sysdefs/system_model_os.xml
--- a/symbian3/split/sysdefs/system_model_os.xml	Mon Oct 05 17:58:10 2009 +0100
+++ b/symbian3/split/sysdefs/system_model_os.xml	Mon Oct 05 18:57:07 2009 +0100
@@ -128,6 +128,9 @@
 <component name="f32test" long-name="File Server Tests" purpose="development">
 <unit bldFile="os\kernelhwsrv\kerneltest\f32test\group" mrp="os\kernelhwsrv\kerneltest\f32test\group\base_f32test.mrp"/>
 </component>
+<component name="syborg" long-name="Syborg" purpose="development">
+<unit bldFile="os\QEMU\baseport\syborg" mrp=""/>
+</component>
 </collection>
 <collection name="ldds" long-name="Logical Device Drivers" level="adaptation">
 <component name="ethernetldd" long-name="Ethernet Drivers" purpose="optional">