merge commit
authortimkelly
Mon, 05 Apr 2010 13:51:33 -0500
changeset 1159 f8750e5751c4
parent 1157 d52280eea0a4 (diff)
parent 1158 0164ba7da078 (current diff)
child 1161 b028057ccaf8
merge commit
--- 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"/>