# HG changeset patch
# User Shabe Razvi <shaber@symbian.org>
# Date 1274980121 -3600
# Node ID 67c245c8a00e7b06b8a26190664f112a830b0e2a
# Parent  a2b7733bca082d74a480f6d84b307486464270fa# Parent  6f4a4cbb178111e84d546561ee89f7a2bea216c5
Merge

diff -r 6f4a4cbb1781 -r 67c245c8a00e symbian4/single/sources.csv
--- a/symbian4/single/sources.csv	Thu May 27 11:27:23 2010 +0100
+++ b/symbian4/single/sources.csv	Thu May 27 18:08:41 2010 +0100
@@ -6,6 +6,7 @@
 //v800008/Builds01/mercurial_internal/rnd/rndonly/samsung/,/rnd/rndonly/samsung,branch,default,
 //v800008/Builds01/mercurial_internal/rnd/redist/objective_systems/,/rnd/redist/objective_systems,branch,default,
 http://developer.symbian.org/oss/FCL/sf/adaptation/stubs/,/sf/adaptation/stubs,branch,default,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/app/browserui/,/sf/app/browserui,branch,default,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/camera/,/sf/app/camera,branch,default,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/commonemail/,/sf/app/commonemail,branch,default,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/app/conntools/,/sf/app/conntools,branch,default,layers.sysdef.xml
diff -r 6f4a4cbb1781 -r 67c245c8a00e symbian4/single/sysdefs/system_model.xml
--- a/symbian4/single/sysdefs/system_model.xml	Thu May 27 11:27:23 2010 +0100
+++ b/symbian4/single/sysdefs/system_model.xml	Thu May 27 18:08:41 2010 +0100
@@ -2707,11 +2707,16 @@
 <!-- will should give the id/path something more unique than cenrep -->
 <unit bldFile="os/deviceplatformrelease/foundation_system/sf_config/cenrep/group"/>
 </component>
-<component name="rombuild_syborg" filter="sf_build" long-name="Syborg iMaker Config" purpose="development" introduced="^3" class="config">
+<!-- comment out until rom configs are added -->
+<!-- component name="rombuild_syborg" filter="sf_build" long-name="Syborg iMaker Config" purpose="development" introduced="^3" class="config">
 <unit bldFile="os/deviceplatformrelease/foundation_system/sf_config/rombuild/syborg/group"/>
 </component>
 <component name="rombuild_zoom2" filter="sf_build" long-name="Zoom2 iMaker Config" purpose="development" introduced="^3" class="config">
 <unit bldFile="os/deviceplatformrelease/foundation_system/sf_config/rombuild/zoom2/group"/>
+</component -->
+<component name="sbs" filter="sf_build" long-name="Foundation SBS config" purpose="development" class="config">
+<!-- will should give the id/path something more unique than sbs -->
+<unit bldFile="os/deviceplatformrelease/foundation_system/sf_config/sbs/group"/>
 </component>
 </collection>
 <collection name="deviceplatformrelease_info" long-name="Device Platform Release Info" level="top">
@@ -8362,7 +8367,7 @@
 <component name="mms_client_mtm_api" long-name="MMS Client MTM API" filter="s60" class="api"/>
 <component name="msg_smil_dtd_api" long-name="Messaging SMIL DTD API" filter="s60" introduced="^4" class="api"/>
 <component name="msg_pub_build" long-name="Messaging Apps Public APIs Build" filter="s60" introduced="^4" class="api">
-<!-- break this up into the above units and replace their base attributes with bldFile, etc -->
+<unit bldFile="app/messaging/msg_pub" proFile="msg_pub.pro" qmakeArgs="-r"/>
 </component>
 </collection>
 <collection name="mobilemessaging" long-name="Mobile Messaging" level="plugin">