# HG changeset patch
# User timkelly
# Date 1270493493 18000
# Node ID f8750e5751c43a4a74c0c464407aa3e2b2e78a89
# Parent  d52280eea0a42ce599ba5bb1a312456ce439bab8# Parent  0164ba7da078cb0a91b503aa9a1b9c5de39a8b77
merge commit

diff -r 0164ba7da078 -r f8750e5751c4 carbidesdk/com.nokia.carbide.cpp.src-feature/feature.xml
--- a/carbidesdk/com.nokia.carbide.cpp.src-feature/feature.xml	Mon Apr 05 13:49:38 2010 -0500
+++ b/carbidesdk/com.nokia.carbide.cpp.src-feature/feature.xml	Mon Apr 05 13:51:33 2010 -0500
@@ -324,7 +324,7 @@
  	<!-- <includes id="com.nokia.carbide.cpp.pi.source" version="0.0.0"/> -->
  	<!-- <includes id="com.nokia.carbide.cpp.uiq.ui.source" version="0.0.0"/> -->
     <!-- <includes id="com.nokia.sdt.uidesigner.source" version="0.0.0"/> -->
-   <!--  <includes id="com.nokia.carbide.cpp.core.source" version="0.0.0"/> -->
+    <includes id="com.nokia.carbide.cpp.core.source" version="0.0.0"/>
     <includes id="com.nokia.carbide.search.system.source" version="0.0.0"/>
     <includes id="com.nokia.carbide.bugreport.source" version="0.0.0"/>
     <includes id="com.nokia.carbide.cpp.edc.source" version="0.0.0"/>