# HG changeset patch
# User timkelly
# Date 1270754261 18000
# Node ID bb47b3646d60e7865acccd314ed4fc4ed2c84c65
# Parent  a47f09a34a78e183d0333ffcdb0e7f8d8e67a63d# Parent  09a65e9def081d11da480cdbe65003bf508de744
merge commit

diff -r a47f09a34a78 -r bb47b3646d60 carbidesdk/com.nokia.carbide.cpp.sdk-feature/build.properties
--- a/carbidesdk/com.nokia.carbide.cpp.sdk-feature/build.properties	Thu Apr 08 14:16:56 2010 -0500
+++ b/carbidesdk/com.nokia.carbide.cpp.sdk-feature/build.properties	Thu Apr 08 14:17:41 2010 -0500
@@ -1,12 +1,3 @@
 bin.includes = feature.xml,\
                Carbide_Image.png,\
                license.txt
-generate.feature@com.nokia.carbide.bugreport.source=com.nokia.carbide.bugreport
-generate.feature@com.nokia.carbide.cpp.capabilityScanner.source=com.nokia.carbide.cpp.capabilityScanner
-generate.feature@com.nokia.carbide.cpp.codescanner.source=com.nokia.carbide.cpp.codescanner
-generate.feature@com.nokia.carbide.cpp.pi.source=com.nokia.carbide.cpp.pi
-generate.feature@com.nokia.carbide.cpp.uiq.ui.source=com.nokia.carbide.cpp.uiq.ui
-generate.feature@com.nokia.carbide.cpp.source=com.nokia.carbide.cpp
-generate.feature@com.nokia.carbide.search.system.source=com.nokia.carbide.search.system
-generate.feature@com.nokia.sdt.uidesigner.source=com.nokia.sdt.uidesigner
-generate.feature@com.nokia.carbide.cpp.edc.source=com.nokia.carbide.cpp.edc
diff -r a47f09a34a78 -r bb47b3646d60 carbidesdk/com.nokia.carbide.cpp.src-feature/build.properties
--- a/carbidesdk/com.nokia.carbide.cpp.src-feature/build.properties	Thu Apr 08 14:16:56 2010 -0500
+++ b/carbidesdk/com.nokia.carbide.cpp.src-feature/build.properties	Thu Apr 08 14:17:41 2010 -0500
@@ -2,11 +2,6 @@
                Carbide_Image.png,\
                license.txt
 generate.feature@com.nokia.carbide.bugreport.source=com.nokia.carbide.bugreport
-generate.feature@com.nokia.carbide.cpp.capabilityScanner.source=com.nokia.carbide.cpp.capabilityScanner
-generate.feature@com.nokia.carbide.cpp.codescanner.source=com.nokia.carbide.cpp.codescanner
-generate.feature@com.nokia.carbide.cpp.pi.source=com.nokia.carbide.cpp.pi
-generate.feature@com.nokia.carbide.cpp.uiq.ui.source=com.nokia.carbide.cpp.uiq.ui
-generate.feature@com.nokia.carbide.cpp.source=com.nokia.carbide.cpp
 generate.feature@com.nokia.carbide.search.system.source=com.nokia.carbide.search.system
-generate.feature@com.nokia.sdt.uidesigner.source=com.nokia.sdt.uidesigner
 generate.feature@com.nokia.carbide.cpp.edc.source=com.nokia.carbide.cpp.edc
+generate.feature@com.nokia.carbide.cpp.core.source=com.nokia.carbide.cpp.core